Skip to content

Commit

Permalink
changes for powerstore 2.7 (#213)
Browse files Browse the repository at this point in the history
  • Loading branch information
rishabhatdell authored May 31, 2023
1 parent b99e0b0 commit 43272c4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion charts/container-storage-modules/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ appVersion: "1.0.0"

dependencies:
- name: csi-powerstore
version: 2.6.0
version: 2.7.0
repository: file://../csi-powerstore
condition: csi-powerstore.enabled

Expand Down
4 changes: 2 additions & 2 deletions charts/container-storage-modules/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
########################
csi-powerstore:
enabled: false
version: "v2.6.0"
version: "v2.7.0"
images:
driverRepository: dellemc
## Controller ATTRIBUTES
Expand Down Expand Up @@ -75,7 +75,7 @@ csi-powerstore:
# Enable this feature only after contact support for additional information
podmon:
enabled: false
image: dellemc/podmon:v1.5.0
image: dellemc/podmon:v1.6.0
controller:
args:
- "--csisock=unix:/var/run/csi/csi.sock"
Expand Down
8 changes: 4 additions & 4 deletions charts/csi-powerstore/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
#
#
apiVersion: v2
appVersion: "2.6.0"
appVersion: "2.7.0"
name: csi-powerstore
version: 2.6.0
version: 2.7.0
description: |
PowerStore CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
well as a PowerStore StorageClass.
type: application
kubeVersion: ">= 1.23.0 < 1.28.0"
kubeVersion: ">= 1.22.0 < 1.28.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.22.0-0 < 1.28.0-0"
keywords:
- csi
- storage
Expand Down
12 changes: 6 additions & 6 deletions charts/csi-powerstore/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-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-attacher:v4.2.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-resizer:v1.7.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.3" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "csi-powerstore.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) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0" -}}
{{- end -}}
{{- end -}}
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-powerstore/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
driverName: "csi-powerstore.dellemc.com"

# Driver version required to pull the latest driver image
version: "v2.6.0"
version: "v2.7.0"

# Specify kubelet config dir path.
# Ensure that the config.yaml file is present at this path.
Expand Down Expand Up @@ -311,7 +311,7 @@ storageCapacity:
# Enable this feature only after contact support for additional information
podmon:
enabled: false
image: dellemc/podmon:v1.5.0
image: dellemc/podmon:v1.6.0
controller:
args:
- "--csisock=unix:/var/run/csi/csi.sock"
Expand Down

0 comments on commit 43272c4

Please sign in to comment.