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.

Sign up for GitHub

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

update sidecars #75

Merged
merged 1 commit into from
Feb 24, 2022
Merged

update sidecars #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions helm/csi-vxflexos/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Return the appropriate sidecar images based on k8s version
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}}
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" -}}
{{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}}
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0" -}}
{{- else -}}
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0" -}}
{{- end -}}
Expand All @@ -21,8 +21,8 @@ Return the appropriate sidecar images based on k8s version
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}}
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.1" -}}
{{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}}
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0" -}}
{{- else -}}
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0" -}}
{{- end -}}
Expand All @@ -35,8 +35,8 @@ Return the appropriate sidecar images based on k8s version
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3" -}}
{{- else if or (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}}
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.0" -}}
{{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}}
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1" -}}
{{- else -}}
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3" -}}
{{- end -}}
Expand All @@ -49,8 +49,8 @@ Return the appropriate sidecar images based on k8s version
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.1.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "19") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}}
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" -}}
{{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}}
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.3.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0" -}}
{{- else -}}
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.1.0" -}}
{{- end -}}
Expand All @@ -63,8 +63,8 @@ Return the appropriate sidecar images based on k8s version
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}}
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0" -}}
{{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}}
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0" -}}
{{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0" -}}
{{- else -}}
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}}
{{- end -}}
Expand Down
4 changes: 2 additions & 2 deletions helm/csi-vxflexos/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ rules:
verbs: ["get", "list", "watch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents"]
verbs: ["create", "get", "list", "watch", "update", "delete"]
verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshots"]
{{- if hasKey .Values "vgsnapshotter" }}
Expand All @@ -91,7 +91,7 @@ rules:
{{- end }}
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshots/status","volumesnapshotcontents/status"]
verbs: ["get", "list", "watch", "update"]
verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["apiextensions.k8s.io"]
resources: ["customresourcedefinitions"]
verbs: ["create", "list", "watch", "delete", "update"]
Expand Down