Merge pull request #86 from peng9808/main

update helm
hwameistor · Aug 29, 2024 · c3c4409 · c3c4409
2 parents 0577118 + fa0df5d
commit c3c4409
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
@@ -285,7 +285,6 @@ if [ -n "$drbd_rpm" ]; then
 else
     matchvar="${var1}.deb"
     drbd_deb=$(find "$DEBDIR" -type f -name "*${matchvar}" -print -quit)
-    utils_deb=$(find "$DEBDIR" -type f -name "drbd-utils*" -print -quit)
     if [[ -n "$drbd_deb" ]]; then
       cp $drbd_deb /pkgs_root/drbd.deb
       cp $DEBDIR/install_deb.sh /pkgs_root/install_deb.sh
@@ -310,7 +309,7 @@ else
       else
         debug "apt install err_code: $exit_code"
       fi
-    else debug "There is no corresponding kernel version deb package or drbd-utils deb package"
+    else debug "There is no corresponding kernel version deb package"
     fi
 fi
 

diff --git a/helm/drbd-adapter/templates/daemonset.yaml b/helm/drbd-adapter/templates/daemonset.yaml
@@ -53,7 +53,7 @@ spec:
         {{- $tag = "v9.1.11" }}
       {{- end }}
       - name: {{ $dist }}
-        image: {{ $.Values.registry }}/drbd9-{{ $dist }}:{{ $tag }}
+        image: {{ $.Values.registry }}/drbd9-{{ $dist }}:{{ $tag }}_{{ $.Chart.Version }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}
         command: 
 	       - /pkgs/entrypoint.adapter.sh

diff --git a/helm/drbd-adapter/templates/job.yaml b/helm/drbd-adapter/templates/job.yaml
@@ -55,7 +55,7 @@ spec:
           mountPath: /pkgs
       {{ if ne $distro "unsupported" }}
       - name: {{ $distro }}
-        image: {{ $.Values.registry }}/drbd9-{{ $distro }}:{{ $tag }}
+        image: {{ $.Values.registry }}/drbd9-{{ $distro }}:{{ $tag }}_{{ $.Chart.Version }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}
         command:
           - /pkgs/entrypoint.adapter.sh