From e2392fb07c13707243196a5ed8e8699af7d68921 Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Tue, 3 Sep 2024 20:07:23 +0800 Subject: [PATCH] chore: remove redundancy certificate configuration Signed-off-by: zhzhuang-zju --- artifacts/deploy/karmada-apiserver.yaml | 3 --- charts/karmada/templates/karmada-apiserver.yaml | 3 --- operator/pkg/controlplane/apiserver/mainfests.go | 3 --- pkg/karmadactl/cmdinit/kubernetes/deployments.go | 3 --- 4 files changed, 12 deletions(-) diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml index 296f7b8f0..5d5c2f458 100644 --- a/artifacts/deploy/karmada-apiserver.yaml +++ b/artifacts/deploy/karmada-apiserver.yaml @@ -43,9 +43,6 @@ spec: - --etcd-keyfile=/etc/karmada/pki/etcd-client.key - --etcd-servers=https://etcd-client.karmada-system.svc.cluster.local:2379 - --bind-address=0.0.0.0 - - --kubelet-client-certificate=/etc/karmada/pki/karmada.crt - - --kubelet-client-key=/etc/karmada/pki/karmada.key - - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --disable-admission-plugins=StorageObjectInUseProtection,ServiceAccount - --runtime-config= - --secure-port=5443 diff --git a/charts/karmada/templates/karmada-apiserver.yaml b/charts/karmada/templates/karmada-apiserver.yaml index 0be9002dc..69d2e2852 100644 --- a/charts/karmada/templates/karmada-apiserver.yaml +++ b/charts/karmada/templates/karmada-apiserver.yaml @@ -55,9 +55,6 @@ spec: - --etcd-servers=https://etcd-client.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}:2379 {{- end }} - --bind-address=0.0.0.0 - - --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt - - --kubelet-client-key=/etc/kubernetes/pki/karmada.key - - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --runtime-config= - --secure-port=5443 - --service-account-issuer=https://kubernetes.default.svc.{{ .Values.clusterDomain }} diff --git a/operator/pkg/controlplane/apiserver/mainfests.go b/operator/pkg/controlplane/apiserver/mainfests.go index 0cdea33af..75bc0e0b3 100644 --- a/operator/pkg/controlplane/apiserver/mainfests.go +++ b/operator/pkg/controlplane/apiserver/mainfests.go @@ -55,9 +55,6 @@ spec: - --etcd-keyfile=/etc/etcd/pki/etcd-client.key - --etcd-servers=https://{{ .EtcdClientService }}.{{ .Namespace }}.svc.cluster.local:{{ .EtcdListenClientPort }} - --bind-address=0.0.0.0 - - --kubelet-client-certificate=/etc/karmada/pki/karmada.crt - - --kubelet-client-key=/etc/karmada/pki/karmada.key - - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --secure-port=5443 - --service-account-issuer=https://kubernetes.default.svc.cluster.local - --service-account-key-file=/etc/karmada/pki/karmada.key diff --git a/pkg/karmadactl/cmdinit/kubernetes/deployments.go b/pkg/karmadactl/cmdinit/kubernetes/deployments.go index 793e7258b..7a6b487a6 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deployments.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deployments.go @@ -92,9 +92,6 @@ func (i *CommandInitOption) karmadaAPIServerContainerCommand() []string { fmt.Sprintf("--etcd-keyfile=%s/%s.key", karmadaCertsVolumeMountPath, options.EtcdClientCertAndKeyName), fmt.Sprintf("--etcd-servers=%s", etcdServers), "--bind-address=0.0.0.0", - fmt.Sprintf("--kubelet-client-certificate=%s/%s.crt", karmadaCertsVolumeMountPath, options.KarmadaCertAndKeyName), - fmt.Sprintf("--kubelet-client-key=%s/%s.key", karmadaCertsVolumeMountPath, options.KarmadaCertAndKeyName), - "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname", "--disable-admission-plugins=StorageObjectInUseProtection,ServiceAccount", "--runtime-config=", fmt.Sprintf("--apiserver-count=%v", i.KarmadaAPIServerReplicas),