standardize the naming of karmada secrets in local up method

Signed-off-by: chaosi-zju <[email protected]>
karmada-io · Aug 26, 2024 · cef66b8 · cef66b8
1 parent aee21b8
commit cef66b8
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 49 deletions.
diff --git a/artifacts/deploy/karmada-aggregated-apiserver.yaml b/artifacts/deploy/karmada-aggregated-apiserver.yaml
@@ -28,7 +28,7 @@ spec:
             - name: karmada-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
           command:
@@ -68,10 +68,10 @@ spec:
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
 ---
 apiVersion: v1
 kind: Service

diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml
@@ -110,7 +110,7 @@ spec:
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
+            secretName: karmada-certs
 ---
 apiVersion: v1
 kind: Service

diff --git a/artifacts/deploy/karmada-cert-secret.yaml b/artifacts/deploy/karmada-cert-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: karmada-cert-secret
+  name: karmada-certs
   namespace: karmada-system
 type: Opaque
 data:

diff --git a/artifacts/deploy/karmada-controller-manager.yaml b/artifacts/deploy/karmada-controller-manager.yaml
@@ -43,10 +43,10 @@ spec:
             periodSeconds: 15
             timeoutSeconds: 5
           volumeMounts:
-          - name: kubeconfig
+          - name: karmada-kubeconfig
             subPath: kubeconfig
             mountPath: /etc/kubeconfig
       volumes:
-        - name: kubeconfig
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
diff --git a/artifacts/deploy/karmada-descheduler.yaml b/artifacts/deploy/karmada-descheduler.yaml
@@ -44,13 +44,13 @@ spec:
             - name: karmada-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
diff --git a/artifacts/deploy/karmada-etcd.yaml b/artifacts/deploy/karmada-etcd.yaml
@@ -93,7 +93,7 @@ spec:
           name: etcd-data
         - name: etcd-certs
           secret:
-            secretName: karmada-cert-secret
+            secretName: karmada-certs
 ---
 
 apiVersion: v1

diff --git a/artifacts/deploy/karmada-metrics-adapter.yaml b/artifacts/deploy/karmada-metrics-adapter.yaml
@@ -28,7 +28,7 @@ spec:
             - name: karmada-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
           command:
@@ -67,10 +67,10 @@ spec:
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
 ---
 apiVersion: v1
 kind: Service

diff --git a/artifacts/deploy/karmada-scheduler-estimator.yaml b/artifacts/deploy/karmada-scheduler-estimator.yaml
@@ -49,7 +49,7 @@ spec:
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
+            secretName: karmada-certs
         - name: member-kubeconfig
           secret:
             secretName: {{member_cluster_name}}-kubeconfig

diff --git a/artifacts/deploy/karmada-scheduler.yaml b/artifacts/deploy/karmada-scheduler.yaml
@@ -46,13 +46,13 @@ spec:
             - name: karmada-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
diff --git a/artifacts/deploy/karmada-search.yaml b/artifacts/deploy/karmada-search.yaml
@@ -28,7 +28,7 @@ spec:
             - name: karmada-certs
               mountPath: /etc/karmada/pki
               readOnly: true
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
           command:
@@ -61,10 +61,10 @@ spec:
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
 ---
 apiVersion: v1
 kind: Service

diff --git a/artifacts/deploy/karmada-webhook-cert-secret.yaml b/artifacts/deploy/karmada-webhook-cert-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: webhook-cert
+  name: karmada-webhook-cert
   namespace: karmada-system
 type: kubernetes.io/tls
 data:

diff --git a/artifacts/deploy/karmada-webhook.yaml b/artifacts/deploy/karmada-webhook.yaml
@@ -30,29 +30,29 @@ spec:
             - --default-not-ready-toleration-seconds=30
             - --default-unreachable-toleration-seconds=30
             - --secure-port=8443
-            - --cert-dir=/var/serving-cert
+            - --cert-dir=/etc/karmada/pki
             - --v=4
           ports:
             - containerPort: 8443
           volumeMounts:
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
-            - name: cert
-              mountPath: /var/serving-cert
+            - name: karmada-webhook-cert
+              mountPath: /etc/karmada/pki
               readOnly: true
           readinessProbe:
             httpGet:
               path: /readyz
               port: 8443
               scheme: HTTPS
       volumes:
-        - name: kubeconfig
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
-        - name: cert
+            secretName: karmada-kubeconfig
+        - name: karmada-webhook-cert
           secret:
-            secretName: webhook-cert
+            secretName: karmada-webhook-cert
 ---
 apiVersion: v1
 kind: Service

diff --git a/artifacts/deploy/kube-controller-manager.yaml b/artifacts/deploy/kube-controller-manager.yaml
@@ -74,12 +74,12 @@ spec:
               readOnly: true
             - mountPath: /etc/kubeconfig
               subPath: kubeconfig
-              name: kubeconfig
+              name: karmada-kubeconfig
       priorityClassName: system-node-critical
       volumes:
         - name: karmada-certs
           secret:
-            secretName: karmada-cert-secret
-        - name: kubeconfig
+            secretName: karmada-certs
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
+            secretName: karmada-kubeconfig
diff --git a/artifacts/deploy/secret.yaml b/artifacts/deploy/secret.yaml
@@ -22,5 +22,5 @@ stringData:
         client-key-data: {{client_key}}
 kind: Secret
 metadata:
-  name: kubeconfig
+  name: karmada-kubeconfig
   namespace: karmada-system
diff --git a/examples/customresourceinterpreter/karmada-interpreter-webhook-example.yaml b/examples/customresourceinterpreter/karmada-interpreter-webhook-example.yaml
@@ -28,29 +28,29 @@ spec:
             - --kubeconfig=/etc/kubeconfig
             - --bind-address=0.0.0.0
             - --secure-port=8445
-            - --cert-dir=/var/serving-cert
+            - --cert-dir=/etc/karmada/pki
             - --v=4
           ports:
             - containerPort: 8445
           volumeMounts:
-            - name: kubeconfig
+            - name: karmada-kubeconfig
               subPath: kubeconfig
               mountPath: /etc/kubeconfig
-            - name: cert
-              mountPath: /var/serving-cert
+            - name: karmada-webhook-cert
+              mountPath: /etc/karmada/pki
               readOnly: true
           readinessProbe:
             httpGet:
               path: /readyz
               port: 8445
               scheme: HTTPS
       volumes:
-        - name: kubeconfig
+        - name: karmada-kubeconfig
           secret:
-            secretName: kubeconfig
-        - name: cert
+            secretName: karmada-kubeconfig
+        - name: karmada-webhook-cert
           secret:
-            secretName: webhook-cert
+            secretName: karmada-webhook-cert
 ---
 apiVersion: v1
 kind: Service