helm: spilt karmada-config ConfigMap

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

Hide file tree

Showing 2 changed files with 221 additions and 12 deletions.
diff --git a/charts/karmada/templates/post-delete-job.yaml b/charts/karmada/templates/post-delete-job.yaml
@@ -44,14 +44,44 @@ spec:
               bash <<'EOF'
               set -ex
               kubectl delete -f /opt/mount/ --ignore-not-found=true
+              kubectl delete -f /opt/crds/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-autoscaling-base/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-config-base/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-multicluster-base/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-networking-base/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-policy-base/ --ignore-not-found=true
+              kubectl delete -f /opt/crds-work-base/ --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
+        configMap:
+          name: {{ $name }}-crds-config
+      - name: crds-autoscaling-base
+        configMap:
+          name: {{ $name }}-crds-autoscaling-bases-config
+      - name: crds-config-base
+        configMap:
+          name: {{ $name }}-crds-config-bases-config
+      - name: crds-multicluster-base
+        configMap:
+          name: {{ $name }}-crds-multicluster-bases-config
+      - name: crds-networking-base
+        configMap:
+          name: {{ $name }}-crds-networking-bases-config
+      - name: crds-policy-base
+        configMap:
+          name: {{ $name }}-crds-policy-bases-config
+      - name: crds-work-base
+        configMap:
+          name: {{ $name }}-crds-work-bases-config
 {{- end }}
diff --git a/charts/karmada/templates/pre-install-job.yaml b/charts/karmada/templates/pre-install-job.yaml
@@ -88,6 +88,17 @@ 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
@@ -100,29 +111,155 @@ data:
       {{- (printf "%s: " $name) | nindent 6 }} |-
         {{- $.Files.Get $path | nindent 8 }}
       {{ end }}
-  crds-bases-configmaps.yaml: |-
+  crds-patches-configmaps.yaml: |-
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: {{ $name }}-crds-patches
+      namespace: {{ $namespace }}
+    data:
+      {{- print "webhook_in_clusterresourcebindings.yaml: " | nindent 6 }} |-
+        {{- include "karmada.crd.patch.webhook.clusterresourcebinding" . | nindent 8 }}
+      {{- print "webhook_in_resourcebindings.yaml: " | nindent 6 }} |-
+        {{- include "karmada.crd.patch.webhook.resourcebinding" . | nindent 8 }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-autoscaling-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-autoscaling-configmaps.yaml: |-
     apiVersion: v1
     kind: ConfigMap
     metadata:
-      name: {{ $name }}-crds-bases
+      name: {{ $name }}-crds-autoscaling-bases
       namespace: {{ $namespace }}
     data:
-      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/**")}}
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/autoscaling**")}}
       {{ $name := base $path }}
       {{- (printf "%s: " $name) | nindent 6 }} |-
         {{- $.Files.Get $path | nindent 8 }}
       {{ end }}
-  crds-patches-configmaps.yaml: |-
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-config-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-config-configmaps.yaml: |-
     apiVersion: v1
     kind: ConfigMap
     metadata:
-      name: {{ $name }}-crds-patches
+      name: {{ $name }}-crds-config-bases
       namespace: {{ $namespace }}
     data:
-      {{- print "webhook_in_clusterresourcebindings.yaml: " | nindent 6 }} |-
-        {{- include "karmada.crd.patch.webhook.clusterresourcebinding" . | nindent 8 }}
-      {{- print "webhook_in_resourcebindings.yaml: " | nindent 6 }} |-
-        {{- include "karmada.crd.patch.webhook.resourcebinding" . | nindent 8 }}
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/config**")}}
+      {{ $name := base $path }}
+      {{- (printf "%s: " $name) | nindent 6 }} |-
+        {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-multicluster-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-multicluster-configmaps.yaml: |-
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: {{ $name }}-crds-multicluster-bases
+      namespace: {{ $namespace }}
+    data:
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/multicluster**")}}
+      {{ $name := base $path }}
+      {{- (printf "%s: " $name) | nindent 6 }} |-
+        {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-networking-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-networking-configmaps.yaml: |-
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: {{ $name }}-crds-networking-bases
+      namespace: {{ $namespace }}
+    data:
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/networking**")}}
+      {{ $name := base $path }}
+      {{- (printf "%s: " $name) | nindent 6 }} |-
+        {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-policy-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-policy-configmaps.yaml: |-
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: {{ $name }}-crds-policy-bases
+      namespace: {{ $namespace }}
+    data:
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/policy**")}}
+      {{ $name := base $path }}
+      {{- (printf "%s: " $name) | nindent 6 }} |-
+        {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $name }}-crds-work-bases-config
+  namespace: {{ $namespace }}
+  annotations:
+    "helm.sh/hook": pre-install
+    "helm.sh/hook-weight": "2"
+data:
+  crds-bases-work-configmaps.yaml: |-
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: {{ $name }}-crds-work-bases
+      namespace: {{ $namespace }}
+    data:
+      {{ range $path, $bytes := .Files.Glob (printf "_crds/bases/work**")}}
+      {{ $name := base $path }}
+      {{- (printf "%s: " $name) | nindent 6 }} |-
+        {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
 
 ---
 apiVersion: batch/v1
@@ -171,6 +308,13 @@ spec:
           mkdir -p /opt/configs
           mkdir -p /opt/certs
           cp -r -L /opt/mount/* /opt/configs/
+          cp -r -L /opt/crds/* /opt/configs/
+          cp -r -L /opt/crds-autoscaling-base/* /opt/configs/
+          cp -r -L /opt/crds-config-base/* /opt/configs/
+          cp -r -L /opt/crds-multicluster-base/* /opt/configs/
+          cp -r -L /opt/crds-networking-base/* /opt/configs/
+          cp -r -L /opt/crds-policy-base/* /opt/configs/
+          cp -r -L /opt/crds-work-base/* /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 +346,20 @@ spec:
         volumeMounts:
         - name: mount
           mountPath: /opt/mount
+        - name: crds
+          mountPath: /opt/crds
+        - name: crds-autoscaling-base
+          mountPath: /opt/crds-autoscaling-base
+        - name: crds-config-base
+          mountPath: /opt/crds-config-base
+        - name: crds-multicluster-base
+          mountPath: /opt/crds-multicluster-base
+        - name: crds-networking-base
+          mountPath: /opt/crds-networking-base
+        - name: crds-policy-base
+          mountPath: /opt/crds-policy-base
+        - name: crds-work-base
+          mountPath: /opt/crds-work-base
         - name: configs
           mountPath: /opt/configs
       containers:
@@ -226,6 +384,27 @@ spec:
       - name: mount
         configMap:
           name: {{ $name }}-config
+      - name: crds
+        configMap:
+          name: {{ $name }}-crds-config
+      - name: crds-autoscaling-base
+        configMap:
+          name: {{ $name }}-crds-autoscaling-bases-config
+      - name: crds-config-base
+        configMap:
+          name: {{ $name }}-crds-config-bases-config
+      - name: crds-multicluster-base
+        configMap:
+          name: {{ $name }}-crds-multicluster-bases-config
+      - name: crds-networking-base
+        configMap:
+          name: {{ $name }}-crds-networking-bases-config
+      - name: crds-policy-base
+        configMap:
+          name: {{ $name }}-crds-policy-bases-config
+      - name: crds-work-base
+        configMap:
+          name: {{ $name }}-crds-work-bases-config
       - name: configs
         emptyDir: {}