Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding k8 28 support for powermax #253

Merged
merged 3 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/container-storage-modules/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies:
condition: csi-powerstore.enabled

- name: csi-powermax
version: 2.7.0
version: 2.8.0
repository: https://dell.github.io/helm-charts
condition: csi-powermax.enabled

Expand Down
2 changes: 1 addition & 1 deletion charts/container-storage-modules/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ csi-powermax:
enabled: false
nodeSelector:
csireverseproxy:
image: dellemc/csipowermax-reverseproxy:v2.6.0
image: dellemc/csipowermax-reverseproxy:v2.7.0
deployAsSidecar: true
replication:
enabled: false
Expand Down
10 changes: 5 additions & 5 deletions charts/csi-powermax/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
apiVersion: v2
appVersion: "2.7.0"
appVersion: "2.8.0"
name: csi-powermax
version: 2.7.0
version: 2.8.0
description: |
PowerMax CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
well as a PowerMax StorageClass.
type: application
kubeVersion: ">= 1.23.0 < 1.28.0"
kubeVersion: ">= 1.23.0 < 1.29.0"
# If you are using a complex K8s version like "v1.23.3-mirantis-1", use this kubeVersion check instead
# WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
# kubeVersion: ">= 1.23.0-0 < 1.28.0-0"
# kubeVersion: ">= 1.23.0-0 < 1.29.0-0"
keywords:
- csi
- storage
dependencies:
- name: csireverseproxy
version: 2.6.0
version: 2.7.0
condition: required
home: https://github.com/dell/csi-powermax
icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-powermax/charts/csireverseproxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy

type: application

version: 2.6.0
version: 2.7.0

appVersion: 2.6.0
appVersion: 2.7.0
2 changes: 1 addition & 1 deletion charts/csi-powermax/charts/csireverseproxy/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: dellemc/csipowermax-reverseproxy:v2.6.0
image: dellemc/csipowermax-reverseproxy:v2.7.0
port: 2222

# TLS secret which is used for setting up the proxy HTTPS server
Expand Down
12 changes: 6 additions & 6 deletions charts/csi-powermax/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,47 @@ Return the appropriate sidecar images based on k8s version
*/}}
{{- define "csi-powermax.attacherImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powermax.provisionerImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powermax.snapshotterImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powermax.resizerImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powermax.registrarImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powermax.healthmonitorImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
{{- end -}}
{{- end -}}
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-powermax/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ enableCHAP: false
csireverseproxy:
# image: Define the container images used for the reverse proxy
# Default value: None
# Example: "csipowermax-reverseproxy:v2.6.0"
image: dellemc/csipowermax-reverseproxy:v2.6.0
# Example: "csipowermax-reverseproxy:v2.7.0"
image: dellemc/csipowermax-reverseproxy:v2.7.0
# "tlsSecret" defines the TLS secret that is created with certificate
# and its associated key
# Default value: None
Expand Down
Loading