helm: spilt karmada-config ConfigMap

Signed-off-by: changzhen <changzhen5@huawei.com>
karmada-io · Jun 26, 2023 · bd74adb · bd74adb
1 parent c5b11dd
commit bd74adb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/charts/karmada/templates/post-delete-job.yaml b/charts/karmada/templates/post-delete-job.yaml
@@ -44,14 +44,20 @@ spec:
               bash <<'EOF'
               set -ex
               kubectl delete -f /opt/mount/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-mount/ --ignore-not-found=true
               kubectl delete cm/{{ $name }}-config -n {{ $namespace }} --ignore-not-found=true
               kubectl delete deployment/{{ $name }}-controller-manager -n {{ $namespace }} --ignore-not-found=true
               EOF
           volumeMounts:
             - name: mount
               mountPath: /opt/mount
+            - name: crds-mount
+              mountPath: /opt/crds-mount
       volumes:
-        - name: mount
-          configMap:
-            name: {{ $name }}-config
+      - name: mount
+        configMap:
+          name: {{ $name }}-config
+      - name: crds-mount
+        configMap:
+          name: {{ $name }}-crds-config
 {{- end }}
diff --git a/charts/karmada/templates/pre-install-job.yaml b/charts/karmada/templates/pre-install-job.yaml
@@ -88,6 +88,16 @@ data:
         {{- include "karmada.proxyRbac" . | nindent 8 }}
       {{- print "bootstrap-token-configuration.yaml: " | nindent 6 }} |-
         {{- include "karmada.bootstrapToken.configuration" . | nindent 8 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
   crds-configmaps.yaml: |-
     apiVersion: v1
     kind: ConfigMap
@@ -171,6 +181,7 @@ spec:
           mkdir -p /opt/configs
           mkdir -p /opt/certs
           cp -r -L /opt/mount/* /opt/configs/
+          cp -r -L /opt/crds-mount/* /opt/configs/
           openssl req -x509 -sha256 -new -nodes -days 365 -newkey rsa:2048 -keyout "/opt/certs/server-ca.key" -out "/opt/certs/server-ca.crt" -subj "/C=xx/ST=x/L=x/O=x/OU=x/CN=ca/emailAddress=x/"
           openssl req -x509 -sha256 -new -nodes -days 365 -newkey rsa:2048 -keyout "/opt/certs/front-proxy-ca.key" -out "/opt/certs/front-proxy-ca.crt" -subj "/C=xx/ST=x/L=x/O=x/OU=x/CN=ca/emailAddress=x/"
           echo '{"signing":{"default":{"expiry":{{ printf `"%s"` .Values.certs.auto.expiry }},"usages":["signing","key encipherment","client auth","server auth"]}}}' > "/opt/certs/server-ca-config.json"
@@ -202,6 +213,8 @@ spec:
         volumeMounts:
         - name: mount
           mountPath: /opt/mount
+        - name: crds-mount
+          mountPath: /opt/crds-mount
         - name: configs
           mountPath: /opt/configs
       containers:
@@ -226,6 +239,9 @@ spec:
       - name: mount
         configMap:
           name: {{ $name }}-config
+      - name: crds-mount
+        configMap:
+          name: {{ $name }}-crds-config
       - name: configs
         emptyDir: {}