Merge pull request #71 from peng9808/main

update chart v0.4.1
hwameistor · Apr 7, 2024 · b838b75 · b838b75
2 parents adc6dcc + 7532f43
commit b838b75
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 142 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
-CHART_VER ?= 0.4.0
+CHART_VER ?= 0.4.1
 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/Dockerfile.bionic b/docker-drbd9/Dockerfile.bionic
@@ -11,8 +11,6 @@ RUN apt-get update && apt-get install -y kmod gnupg wget make gcc patch curl &&
 COPY /drbd.tar.gz /
 
 COPY /pkgs /pkgs
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 COPY /entry.sh /
 RUN chmod +x /entry.sh
 

diff --git a/docker-drbd9/Dockerfile.flatcar b/docker-drbd9/Dockerfile.flatcar
@@ -2,8 +2,6 @@ FROM gentoo/stage3
 MAINTAINER Roland Kammerer <[email protected]>
 
 COPY /drbd.tar.gz /
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 COPY /entry.sh /
 RUN chmod +x /entry.sh
 ENTRYPOINT /entry.sh

diff --git a/docker-drbd9/Dockerfile.focal b/docker-drbd9/Dockerfile.focal
@@ -11,8 +11,6 @@ RUN apt-get update && apt-get install -y kmod gnupg wget make gcc patch curl &&
 COPY /drbd.tar.gz /
 
 COPY /pkgs /pkgs
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 
 COPY /entry.sh /
 RUN chmod +x /entry.sh

diff --git a/docker-drbd9/Dockerfile.jammy b/docker-drbd9/Dockerfile.jammy
@@ -10,8 +10,6 @@ RUN apt-get update && apt-get install -y kmod gnupg wget make gcc patch elfutils
 COPY /drbd.tar.gz /
 
 COPY /pkgs /pkgs
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 
 COPY /entry.sh /
 RUN chmod +x /entry.sh

diff --git a/docker-drbd9/Dockerfile.kylin10 b/docker-drbd9/Dockerfile.kylin10
@@ -38,8 +38,6 @@ RUN wget --no-check-certificate https://pkg.linbit.com/downloads/drbd/"$([[ $DRB
 COPY /pkgs /pkgs
 COPY /drbdUtils.tar.gz /
 COPY /install-drbdutils.sh /
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 COPY /entry.sh /
 RUN chmod +x /entry.sh
 ENTRYPOINT /entry.sh
diff --git a/docker-drbd9/Dockerfile.rhel7 b/docker-drbd9/Dockerfile.rhel7
@@ -26,8 +26,6 @@ RUN wget --no-check-certificate https://pkg.linbit.com/downloads/drbd/"$([[ $DRB
 # =lbbuild COPY /drbd.tar.gz /
 
 COPY /pkgs /pkgs
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 
 COPY /entry.sh /
 RUN chmod +x /entry.sh

diff --git a/docker-drbd9/Dockerfile.rhel8 b/docker-drbd9/Dockerfile.rhel8
@@ -47,8 +47,6 @@ RUN wget --no-check-certificate https://pkg.linbit.com/downloads/drbd/"$([[ $DRB
 # these are now the kmod pkgs:
 COPY /pkgs /pkgs
 
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 COPY /entry.sh /
 RUN chmod +x /entry.sh
 

diff --git a/docker-drbd9/Dockerfile.rhel9 b/docker-drbd9/Dockerfile.rhel9
@@ -37,8 +37,6 @@ RUN curl -fsSL https://pkg.linbit.com/downloads/drbd/"$([[ $DRBD_VERSION =~ ^9.0
 
 # these are now the kmod pkgs:
 COPY /pkgs /pkgs
-COPY /entrypoint.adapter.sh /
-RUN chmod +x /entrypoint.adapter.sh
 
 COPY /entry.sh /
 RUN chmod +x /entry.sh

diff --git a/docker-drbd9/entrypoint.adapter.sh b/docker-drbd9/entrypoint.adapter.sh
diff --git a/helm/drbd-adapter/Chart.yaml b/helm/drbd-adapter/Chart.yaml
@@ -4,10 +4,10 @@ description: A DRBD kernel loader that auto-adapts OS distros
 
 type: application
 
-version: v0.4.0
+version: v0.4.1
 
 appVersion: v9.0.32
 
-##
+###
 
 
diff --git a/helm/drbd-adapter/templates/daemonset.yaml b/helm/drbd-adapter/templates/daemonset.yaml
@@ -56,7 +56,7 @@ spec:
         image: {{ $.Values.registry }}/drbd9-{{ $dist }}:{{ $tag }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}
         command: 
-	       - /entrypoint.adapter.sh
+	       - /pkgs/entrypoint.adapter.sh
            - {{ $kernelVersion }}
         securityContext:
           privileged: true

diff --git a/helm/drbd-adapter/templates/job.yaml b/helm/drbd-adapter/templates/job.yaml
@@ -58,7 +58,7 @@ spec:
         image: {{ $.Values.registry }}/drbd9-{{ $distro }}:{{ $tag }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}
         command:
-          - /entrypoint.adapter.sh
+          - /pkgs/entrypoint.adapter.sh
           - {{ $kernelVersion }}
         securityContext:
           privileged: true