fix: checksum/config annotation for restart service by configmap (#232)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jan 19, 2024 · 5510b7d · 5510b7d
1 parent 1b9d896
commit 5510b7d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/charts/dragonfly/Chart.yaml b/charts/dragonfly/Chart.yaml
@@ -3,7 +3,7 @@ name: dragonfly
 description: Dragonfly is an intelligent P2P based image and file distribution system
 icon: https://raw.githubusercontent.com/dragonflyoss/Dragonfly2/main/docs/images/logo/dragonfly.svg
 type: application
-version: 1.1.28
+version: 1.1.29
 appVersion: 2.1.30
 keywords:
   - dragonfly
@@ -26,7 +26,7 @@ sources:
 
 annotations:
   artifacthub.io/changes: |
-    - Fix dfdaemon restart check config issue.
+    - Fix checksum/config annotation for restart service by configmap.
 
   artifacthub.io/links: |
     - name: Chart Source

diff --git a/charts/dragonfly/templates/client/client-daemonset.yaml b/charts/dragonfly/templates/client/client-daemonset.yaml
@@ -10,7 +10,6 @@ metadata:
     heritage: {{ .Release.Service }}
     component: {{ .Values.client.name }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/client/client-configmap.yaml") . | sha256sum }}
   {{- if .Values.client.daemonsetAnnotations }}
 {{ toYaml .Values.client.daemonsetAnnotations | indent 4 }}
   {{- end }}
@@ -33,8 +32,9 @@ spec:
         {{- if .Values.client.podLabels }}
 {{ toYaml .Values.client.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.client.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/client/client-configmap.yaml") . | sha256sum }}
+      {{- if .Values.client.podAnnotations }}
 {{ toYaml .Values.client.podAnnotations | indent 8 }}
       {{- end }}
     spec:

diff --git a/charts/dragonfly/templates/manager/manager-deployment.yaml b/charts/dragonfly/templates/manager/manager-deployment.yaml
@@ -10,7 +10,6 @@ metadata:
     component: {{ .Values.manager.name }}
   name: {{ template "dragonfly.manager.fullname" . }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/manager/manager-configmap.yaml") . | sha256sum }}
   {{- if .Values.manager.deploymentAnnotations }}
 {{ toYaml .Values.manager.deploymentAnnotations | indent 4 }}
   {{- end }}
@@ -33,8 +32,9 @@ spec:
         {{- if .Values.manager.podLabels }}
 {{ toYaml .Values.manager.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.manager.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/manager/manager-configmap.yaml") . | sha256sum }}
+      {{- if .Values.manager.podAnnotations }}
 {{ toYaml .Values.manager.podAnnotations | indent 8 }}
       {{- end }}
     spec:

diff --git a/charts/dragonfly/templates/scheduler/scheduler-statefulset.yaml b/charts/dragonfly/templates/scheduler/scheduler-statefulset.yaml
@@ -10,7 +10,6 @@ metadata:
     heritage: {{ .Release.Service }}
     component: {{ .Values.scheduler.name }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/scheduler/scheduler-configmap.yaml") . | sha256sum }}
   {{- if .Values.scheduler.statefulsetAnnotations }}
 {{ toYaml .Values.scheduler.statefulsetAnnotations | indent 4 }}
   {{- end }}
@@ -35,8 +34,9 @@ spec:
         {{- if .Values.scheduler.podLabels }}
 {{ toYaml .Values.scheduler.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.scheduler.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/scheduler/scheduler-configmap.yaml") . | sha256sum }}
+      {{- if .Values.scheduler.podAnnotations }}
 {{ toYaml .Values.scheduler.podAnnotations | indent 8 }}
       {{- end }}
     spec:

diff --git a/charts/dragonfly/templates/seed-client/seed-client-statefulset.yaml b/charts/dragonfly/templates/seed-client/seed-client-statefulset.yaml
@@ -10,7 +10,6 @@ metadata:
     component: {{ .Values.seedClient.name }}
   name: {{ template "dragonfly.seedClient.fullname" . }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/seed-client/seed-client-configmap.yaml") . | sha256sum }}
   {{- if .Values.seedClient.statefulsetAnnotations }}
 {{ toYaml .Values.seedClient.statefulsetAnnotations | indent 4 }}
   {{- end }}
@@ -35,8 +34,9 @@ spec:
         {{- if .Values.seedClient.podLabels }}
 {{ toYaml .Values.seedClient.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.seedClient.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/seed-client/seed-client-configmap.yaml") . | sha256sum }}
+      {{- if .Values.seedClient.podAnnotations }}
 {{ toYaml .Values.seedClient.podAnnotations | indent 8 }}
       {{- end }}
     spec:

diff --git a/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml b/charts/dragonfly/templates/seed-peer/seed-peer-statefulset.yaml
@@ -10,7 +10,6 @@ metadata:
     component: {{ .Values.seedPeer.name }}
   name: {{ template "dragonfly.seedPeer.fullname" . }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/seed-peer/seed-peer-configmap.yaml") . | sha256sum }}
   {{- if .Values.seedPeer.statefulsetAnnotations }}
 {{ toYaml .Values.seedPeer.statefulsetAnnotations | indent 4 }}
   {{- end }}
@@ -35,8 +34,9 @@ spec:
         {{- if .Values.seedPeer.podLabels }}
 {{ toYaml .Values.seedPeer.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.seedPeer.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/seed-peer/seed-peer-configmap.yaml") . | sha256sum }}
+      {{- if .Values.seedPeer.podAnnotations }}
 {{ toYaml .Values.seedPeer.podAnnotations | indent 8 }}
       {{- end }}
     spec:

diff --git a/charts/dragonfly/templates/trainer/trainer-deployment.yaml b/charts/dragonfly/templates/trainer/trainer-deployment.yaml
@@ -10,7 +10,6 @@ metadata:
     component: {{ .Values.trainer.name }}
   name: {{ template "dragonfly.trainer.fullname" . }}
   annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/trainer/trainer-configmap.yaml") . | sha256sum }}
   {{- if .Values.trainer.deploymentAnnotations }}
 {{ toYaml .Values.trainer.deploymentAnnotations | indent 4 }}
   {{- end }}
@@ -33,8 +32,9 @@ spec:
         {{- if .Values.trainer.podLabels }}
 {{ toYaml .Values.trainer.podLabels | indent 8 }}
         {{- end }}
-      {{- if .Values.trainer.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/trainer/trainer-configmap.yaml") . | sha256sum }}
+      {{- if .Values.trainer.podAnnotations }}
 {{ toYaml .Values.trainer.podAnnotations | indent 8 }}
       {{- end }}
     spec: