chore: fix csi-hostpath-driver enable error (#5512)

(cherry picked from commit de65181)
apecloud · Oct 18, 2023 · 51cc305 · 51cc305
1 parent cd3d0bc
commit 51cc305
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/deploy/csi-hostpath-driver/templates/statefulset.yaml b/deploy/csi-hostpath-driver/templates/statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       containers:
         - name: hostpath
           #image: registry.k8s.io/sig-storage/hostpathplugin:v1.9.0
-          image: "{{ .Values.image.registry }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "--drivername=hostpath.csi.k8s.io"
@@ -74,7 +74,7 @@ spec:
 
         - name: csi-external-health-monitor-controller
           #image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.7.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.healthmonitor.image.repository }}:{{ .Values.sidecars.healthmonitor.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.healthmonitor.image.repository }}:{{ .Values.sidecars.healthmonitor.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "--v=5"
@@ -90,7 +90,7 @@ spec:
 
         - name: node-driver-registrar
           #image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.registrar.image.repository }}:{{ .Values.sidecars.registrar.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.registrar.image.repository }}:{{ .Values.sidecars.registrar.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --v=5
@@ -120,15 +120,15 @@ spec:
             - mountPath: /csi
               name: socket-dir
           #image: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.livenessprobe.image.repository }}:{{ .Values.sidecars.livenessprobe.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.livenessprobe.image.repository }}:{{ .Values.sidecars.livenessprobe.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9898
 
         - name: csi-attacher
           #image: registry.k8s.io/sig-storage/csi-attacher:v4.0.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.attacher.image.repository }}:{{ .Values.sidecars.attacher.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.attacher.image.repository }}:{{ .Values.sidecars.attacher.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --v=5
@@ -144,7 +144,7 @@ spec:
 
         - name: csi-provisioner
           #image: registry.k8s.io/sig-storage/csi-provisioner:v3.3.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.provisioner.image.repository }}:{{ .Values.sidecars.provisioner.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.provisioner.image.repository }}:{{ .Values.sidecars.provisioner.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - -v=5
@@ -162,7 +162,7 @@ spec:
 
         - name: csi-resizer
           #image: registry.k8s.io/sig-storage/csi-resizer:v1.6.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.resizer.image.repository }}:{{ .Values.sidecars.resizer.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.resizer.image.repository }}:{{ .Values.sidecars.resizer.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - -v=5
@@ -178,7 +178,7 @@ spec:
 
         - name: csi-snapshotter
           #image: registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0
-          image: "{{ .Values.image.registry }}{{ .Values.sidecars.snapshotter.image.repository }}:{{ .Values.sidecars.snapshotter.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.snapshotter.image.repository }}:{{ .Values.sidecars.snapshotter.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - -v=5

diff --git a/deploy/csi-hostpath-driver/values.yaml b/deploy/csi-hostpath-driver/values.yaml
@@ -5,8 +5,8 @@
 replicaCount: 1
 
 image:
-  registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/google_containers/
-  repository: hostpathplugin
+  registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
+  repository: apecloud/hostpathplugin
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -71,31 +71,31 @@ affinity:
 sidecars:
   healthmonitor:
     image:
-      repository: csi-external-health-monitor-controller
+      repository: apecloud/csi-external-health-monitor-controller
       tag: v0.7.0
   registrar:
     image:
-      repository: csi-node-driver-registrar
+      repository: apecloud/csi-node-driver-registrar
       tag: v2.6.0
   livenessprobe:
     image:
-      repository: livenessprobe
+      repository: apecloud/livenessprobe
       tag: v2.8.0
   attacher:
     image:
-      repository: csi-attacher
+      repository: apecloud/csi-attacher
       tag: v4.0.0
   provisioner:
     image:
-      repository: csi-provisioner
+      repository: apecloud/csi-provisioner
       tag: v3.3.0
   resizer:
     image:
-      repository: csi-resizer
+      repository: apecloud/csi-resizer
       tag: v1.6.0
   snapshotter:
     image:
-      repository: csi-snapshotter
+      repository: apecloud/csi-snapshotter
       tag: v6.1.0
 
 storageClass: