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

feat(deployment/daemonset): Remove imagePullPolicy from charts #72

Merged
merged 1 commit into from
Sep 10, 2024
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
4 changes: 2 additions & 2 deletions charts/rancher-vsphere-csi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ annotations:
catalog.cattle.io/rancher-version: '>= 2.9.0-0'
catalog.cattle.io/release-name: vsphere-csi
apiVersion: v1
appVersion: 3.3.1-rancher1
appVersion: 3.3.1-rancher3
description: vSphere Cloud Storage Interface (CSI)
icon: https://charts.rancher.io/assets/logos/vsphere-csi.svg
keywords:
Expand All @@ -21,4 +21,4 @@ maintainers:
name: rancher-vsphere-csi
sources:
- https://github.com/kubernetes-sigs/vsphere-csi-driver
version: 3.3.1-rancher2
version: 3.3.1-rancher3
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ spec:
containers:
- name: csi-attacher
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiAttacher.repository }}:{{ .Values.csiController.image.csiAttacher.tag }}"
imagePullPolicy: {{ .Values.csiController.image.csiAttacher.imagePullPolicy | quote }}
args:
- "--v=4"
- "--timeout=300s"
Expand All @@ -101,6 +102,7 @@ spec:
{{- if .Values.csiController.csiResizer.enabled }}
- name: csi-resizer
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiResizer.repository }}:{{ .Values.csiController.image.csiResizer.tag }}"
imagePullPolicy: {{ .Values.csiController.image.csiResizer.imagePullPolicy | quote }}
args:
- "--v=4"
- "--timeout=300s"
Expand All @@ -119,6 +121,7 @@ spec:
{{- if .Values.blockVolumeSnapshot.enabled }}
- name: csi-snapshotter
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiSnapshotter.repository }}:{{ .Values.csiController.image.csiSnapshotter.tag }}"
imagePullPolicy: {{ .Values.csiController.image.csiSnapshotter.imagePullPolicy | quote }}
args:
- "--v=4"
- "--kube-api-qps=100"
Expand All @@ -138,13 +141,13 @@ spec:
{{- end }}
- name: vsphere-csi-controller
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.repository }}:{{ .Values.csiController.image.tag }}"
imagePullPolicy: {{ .Values.csiController.image.imagePullPolicy | quote }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)"
{{- if semverCompare "< 1.24" $.Capabilities.KubeVersion.Version }}
- "--use-gocsi=false"
{{- end }}
imagePullPolicy: "Always"
env:
- name: CSI_ENDPOINT
value: unix:///csi/csi.sock
Expand Down Expand Up @@ -189,6 +192,7 @@ spec:
failureThreshold: 3
- name: liveness-probe
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.livenessProbe.repository }}:{{ .Values.csiController.image.livenessProbe.tag }}"
imagePullPolicy: {{ .Values.csiController.image.livenessProbe.imagePullPolicy | quote }}
args:
- "--v=4"
- "--csi-address=/csi/csi.sock"
Expand All @@ -197,11 +201,11 @@ spec:
mountPath: /csi
- name: vsphere-syncer
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.vsphereSyncer.repository }}:{{ .Values.csiController.image.vsphereSyncer.tag }}"
imagePullPolicy: {{ .Values.csiController.image.vsphereSyncer.imagePullPolicy | quote }}
args:
- "--leader-election"
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)"
imagePullPolicy: "Always"
ports:
- containerPort: 2113
name: prometheus
Expand All @@ -227,6 +231,7 @@ spec:
readOnly: true
- name: csi-provisioner
image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiProvisioner.repository }}:{{ .Values.csiController.image.csiProvisioner.tag }}"
imagePullPolicy: {{ .Values.csiController.image.csiProvisioner.imagePullPolicy | quote }}
args:
- "--v=4"
- "--timeout=300s"
Expand Down
4 changes: 3 additions & 1 deletion charts/rancher-vsphere-csi/templates/node/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ spec:
containers:
- name: node-driver-registrar
image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.nodeDriverRegistrar.repository }}:{{ .Values.csiNode.image.nodeDriverRegistrar.tag }}"
imagePullPolicy: {{ .Values.csiNode.image.nodeDriverRegistrar.imagePullPolicy | quote }}
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand All @@ -91,13 +92,13 @@ spec:
initialDelaySeconds: 3
- name: vsphere-csi-node
image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.repository }}:{{ .Values.csiNode.image.tag }}"
imagePullPolicy: {{ .Values.csiNode.image.imagePullPolicy | quote }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)"
{{- if semverCompare "< 1.24" $.Capabilities.KubeVersion.Version }}
- "--use-gocsi=false"
{{- end }}
imagePullPolicy: "Always"
env:
- name: NODE_NAME
valueFrom:
Expand Down Expand Up @@ -154,6 +155,7 @@ spec:
failureThreshold: 3
- name: liveness-probe
image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.livenessProbe.repository }}:{{ .Values.csiNode.image.livenessProbe.tag }}"
imagePullPolicy: {{ .Values.csiNode.image.livenessProbe.imagePullPolicy | quote }}
args:
- "--v=4"
- "--csi-address=/csi/csi.sock"
Expand Down
10 changes: 10 additions & 0 deletions charts/rancher-vsphere-csi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,31 @@ csiController:
image:
repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
tag: latest
imagePullPolicy: ""
csiAttacher:
repository: rancher/mirrored-sig-storage-csi-attacher
tag: latest
imagePullPolicy: ""
csiResizer:
repository: rancher/mirrored-sig-storage-csi-resizer
tag: latest
imagePullPolicy: ""
livenessProbe:
repository: rancher/mirrored-sig-storage-livenessprobe
tag: latest
imagePullPolicy: ""
vsphereSyncer:
repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
tag: latest
imagePullPolicy: ""
csiProvisioner:
repository: rancher/mirrored-sig-storage-csi-provisioner
tag: latest
imagePullPolicy: ""
csiSnapshotter:
repository: rancher/mirrored-sig-storage-csi-snapshotter
tag: latest
imagePullPolicy: ""
## Node labels for pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/
##
Expand Down Expand Up @@ -113,12 +120,15 @@ csiNode:
image:
repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
tag: latest
imagePullPolicy: ""
nodeDriverRegistrar:
repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
tag: latest
imagePullPolicy: ""
livenessProbe:
repository: rancher/mirrored-sig-storage-livenessprobe
tag: latest
imagePullPolicy: ""

storageClass:
enabled: true
Expand Down