Skip to content

Commit 1f626a4

Browse files
andyzhangxandyzhangx
authored
Merge pull request #637 from andyzhangx/add-baserepo
feat: add baseRepo field in helm charts
2 parents 4482988 + fadfc73 commit 1f626a4

File tree

10 files changed

+66
-0
lines changed

10 files changed

+66
-0
lines changed

‎charts/latest/csi-driver-nfs-v0.0.0.tgz‎

114 Bytes
Binary file not shown.

‎charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ spec:
4949
{{- end }}
5050
containers:
5151
- name: csi-provisioner
52+
{{- if hasPrefix "/" .Values.image.csiProvisioner.repository }}
53+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
54+
{{- else }}
5255
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
56+
{{- end }}
5357
args:
5458
- "-v=2"
5559
- "--csi-address=$(ADDRESS)"
@@ -68,7 +72,11 @@ spec:
6872
securityContext:
6973
readOnlyRootFilesystem: true
7074
- name: csi-snapshotter
75+
{{- if hasPrefix "/" .Values.image.csiSnapshotter.repository }}
76+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
77+
{{- else }}
7178
image: "{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
79+
{{- end }}
7280
args:
7381
- "--v=2"
7482
- "--csi-address=$(ADDRESS)"
@@ -84,7 +92,11 @@ spec:
8492
- name: socket-dir
8593
mountPath: /csi
8694
- name: liveness-probe
95+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
96+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
97+
{{- else }}
8798
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
99+
{{- end }}
88100
args:
89101
- --csi-address=/csi/csi.sock
90102
- --probe-timeout=3s
@@ -98,7 +110,11 @@ spec:
98110
securityContext:
99111
readOnlyRootFilesystem: true
100112
- name: nfs
113+
{{- if hasPrefix "/" .Values.image.nfs.repository }}
114+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
115+
{{- else }}
101116
image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
117+
{{- end }}
102118
securityContext:
103119
privileged: true
104120
capabilities:

‎charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ spec:
4444
{{- end }}
4545
containers:
4646
- name: liveness-probe
47+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
48+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
49+
{{- else }}
4750
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
51+
{{- end }}
4852
args:
4953
- --csi-address=/csi/csi.sock
5054
- --probe-timeout=3s
@@ -58,7 +62,11 @@ spec:
5862
securityContext:
5963
readOnlyRootFilesystem: true
6064
- name: node-driver-registrar
65+
{{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
66+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
67+
{{- else }}
6168
image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
69+
{{- end }}
6270
livenessProbe:
6371
exec:
6472
command:
@@ -92,7 +100,11 @@ spec:
92100
add: ["SYS_ADMIN"]
93101
allowPrivilegeEscalation: true
94102
readOnlyRootFilesystem: true
103+
{{- if hasPrefix "/" .Values.image.nfs.repository }}
104+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
105+
{{- else }}
95106
image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
107+
{{- end }}
96108
args :
97109
- "--v={{ .Values.node.logLevel }}"
98110
- "--nodeid=$(NODE_ID)"

‎charts/latest/csi-driver-nfs/templates/csi-snapshot-controller.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ spec:
5656
{{- end }}
5757
containers:
5858
- name: {{ .Values.externalSnapshotter.name }}
59+
{{- if hasPrefix "/" .Values.image.externalSnapshotter.repository }}
60+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.externalSnapshotter.repository }}:{{ .Values.image.externalSnapshotter.tag }}"
61+
{{- else }}
5962
image: {{ .Values.image.externalSnapshotter.repository }}:{{ .Values.image.externalSnapshotter.tag }}
63+
{{- end }}
6064
args:
6165
- "--v=2"
6266
- "--leader-election=true"

‎charts/latest/csi-driver-nfs/values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
customLabels: {}
22
image:
3+
baseRepo: registry.k8s.io
34
nfs:
45
repository: gcr.io/k8s-staging-sig-storage/nfsplugin
56
tag: canary

‎charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz‎

112 Bytes
Binary file not shown.

‎charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ spec:
4949
{{- end }}
5050
containers:
5151
- name: csi-provisioner
52+
{{- if hasPrefix "/" .Values.image.csiProvisioner.repository }}
53+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
54+
{{- else }}
5255
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
56+
{{- end }}
5357
args:
5458
- "-v=2"
5559
- "--csi-address=$(ADDRESS)"
@@ -68,7 +72,11 @@ spec:
6872
securityContext:
6973
readOnlyRootFilesystem: true
7074
- name: csi-snapshotter
75+
{{- if hasPrefix "/" .Values.image.csiSnapshotter.repository }}
76+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
77+
{{- else }}
7178
image: "{{ .Values.image.csiSnapshotter.repository }}:{{ .Values.image.csiSnapshotter.tag }}"
79+
{{- end }}
7280
args:
7381
- "--v=2"
7482
- "--csi-address=$(ADDRESS)"
@@ -84,7 +92,11 @@ spec:
8492
- name: socket-dir
8593
mountPath: /csi
8694
- name: liveness-probe
95+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
96+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
97+
{{- else }}
8798
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
99+
{{- end }}
88100
args:
89101
- --csi-address=/csi/csi.sock
90102
- --probe-timeout=3s
@@ -98,7 +110,11 @@ spec:
98110
securityContext:
99111
readOnlyRootFilesystem: true
100112
- name: nfs
113+
{{- if hasPrefix "/" .Values.image.nfs.repository }}
114+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
115+
{{- else }}
101116
image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
117+
{{- end }}
102118
securityContext:
103119
privileged: true
104120
capabilities:

‎charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ spec:
4444
{{- end }}
4545
containers:
4646
- name: liveness-probe
47+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
48+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
49+
{{- else }}
4750
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
51+
{{- end }}
4852
args:
4953
- --csi-address=/csi/csi.sock
5054
- --probe-timeout=3s
@@ -58,7 +62,11 @@ spec:
5862
securityContext:
5963
readOnlyRootFilesystem: true
6064
- name: node-driver-registrar
65+
{{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
66+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
67+
{{- else }}
6168
image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
69+
{{- end }}
6270
livenessProbe:
6371
exec:
6472
command:
@@ -92,7 +100,11 @@ spec:
92100
add: ["SYS_ADMIN"]
93101
allowPrivilegeEscalation: true
94102
readOnlyRootFilesystem: true
103+
{{- if hasPrefix "/" .Values.image.nfs.repository }}
104+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
105+
{{- else }}
95106
image: "{{ .Values.image.nfs.repository }}:{{ .Values.image.nfs.tag }}"
107+
{{- end }}
96108
args :
97109
- "--v={{ .Values.node.logLevel }}"
98110
- "--nodeid=$(NODE_ID)"

‎charts/v4.6.0/csi-driver-nfs/templates/csi-snapshot-controller.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ spec:
5656
{{- end }}
5757
containers:
5858
- name: {{ .Values.externalSnapshotter.name }}
59+
{{- if hasPrefix "/" .Values.image.externalSnapshotter.repository }}
60+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.externalSnapshotter.repository }}:{{ .Values.image.externalSnapshotter.tag }}"
61+
{{- else }}
5962
image: {{ .Values.image.externalSnapshotter.repository }}:{{ .Values.image.externalSnapshotter.tag }}
63+
{{- end }}
6064
args:
6165
- "--v=2"
6266
- "--leader-election=true"

‎charts/v4.6.0/csi-driver-nfs/values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
customLabels: {}
22
image:
3+
baseRepo: registry.k8s.io
34
nfs:
45
repository: registry.k8s.io/sig-storage/nfsplugin
56
tag: v4.6.0

0 commit comments

Comments
 (0)