Merge pull request #89 from peng9808/main

update chart v0.4.3
hwameistor · Oct 29, 2024 · b159a40 · b159a40
2 parents 5733df9 + 3e42983
commit b159a40
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml
@@ -6,6 +6,7 @@ on:
       - main
     paths:
       - "helm/drbd-adapter/Chart.yaml"
+    workflow_dispatch:
 
 jobs:
   release-chart:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
-CHART_VER ?= 0.4.2
+CHART_VER ?= 0.4.3
 DRBD_VER ?= 9.0.32-1# another tested value is: 9.1.11
 DRBD_UTILS_VER ?= 9.12.1# another tested value is: 9.21.4
 

diff --git a/docker-drbd9/build.sh b/docker-drbd9/build.sh
@@ -3,7 +3,7 @@
 DRBD_VER=${1:-9.0.32-1}
 ARCH=${2:-linux/amd64}
 REG=${3:-daocloud.io/daocloud}
-CHART_VER=${4:-0.4.2}
+CHART_VER=${4:-0.4.3}
 
 [ -z "$DRBD_VER" ] && echo "Need a DRBD version !" && exit 1
 

diff --git a/helm/drbd-adapter/Chart.yaml b/helm/drbd-adapter/Chart.yaml
@@ -4,7 +4,7 @@ description: A DRBD kernel loader that auto-adapts OS distros
 
 type: application
 
-version: v0.4.2
+version: v0.4.3
 
 appVersion: v9.0.32
 

diff --git a/helm/drbd-adapter/templates/daemonset.yaml b/helm/drbd-adapter/templates/daemonset.yaml
@@ -49,9 +49,6 @@ spec:
       {{- range $index, $dist := $distros | uniq }}
       {{- if regexMatch "^(rhel[78]|bionic|focal|jammy)$" $dist }}
       {{- $tag := $.Values.drbdVersion  }}
-      {{- if eq $dist "jammy" }}
-        {{- $tag = "v9.1.11" }}
-      {{- end }}
       - name: {{ $dist }}
         image: {{ $.Values.registry }}/drbd9-{{ $dist }}:{{ $tag }}_{{ $.Chart.Version }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}

diff --git a/helm/drbd-adapter/templates/job.yaml b/helm/drbd-adapter/templates/job.yaml
@@ -17,7 +17,6 @@
   {{ $distro = "focal" }}
 {{ else if regexMatch "ubuntu .*22([\\s\\-\\.]|$)" $osImage }}
   {{ $distro = "jammy" }}
-  {{ $tag = "v9.1.11" }}
 {{ else if regexMatch "kylin .*v10([\\s\\-\\.]|$)" $osImage }}
   {{ $distro = "kylin10" }}
 {{ end }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
           - main
         paths:
           - "helm/drbd-adapter/Chart.yaml"
+        workflow_dispatch:
     jobs:
       release-chart:
@@ Expand Down @@