From 24d9e12e5cc4f7f49762c1655c6c263efe32d2fe Mon Sep 17 00:00:00 2001 From: Joe Nathan Abellard Date: Fri, 13 Sep 2024 16:14:31 -0400 Subject: [PATCH] Set Karmada Cert Secret Used For Configurating mTLS for Scheduler & Descheduler Components Signed-off-by: Joe Nathan Abellard --- operator/pkg/controlplane/controlplane.go | 42 ++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/operator/pkg/controlplane/controlplane.go b/operator/pkg/controlplane/controlplane.go index 007788ab4947..693d58bd6770 100644 --- a/operator/pkg/controlplane/controlplane.go +++ b/operator/pkg/controlplane/controlplane.go @@ -140,17 +140,18 @@ func getKarmadaControllerManagerManifest(name, namespace string, featureGates ma func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string]bool, cfg *operatorv1alpha1.KarmadaScheduler) (*appsv1.Deployment, error) { karmadaSchedulerBytes, err := util.ParseTemplate(KarmadaSchedulerDeployment, struct { - Replicas *int32 - DeploymentName, Namespace, SystemNamespace string - Image, ImagePullPolicy, KubeconfigSecret string + Replicas *int32 + DeploymentName, Namespace, SystemNamespace string + Image, ImagePullPolicy, KubeconfigSecret, KarmadaCertsSecret string }{ - DeploymentName: util.KarmadaSchedulerName(name), - Namespace: namespace, - SystemNamespace: constants.KarmadaSystemNamespace, - Image: cfg.Image.Name(), - ImagePullPolicy: string(cfg.ImagePullPolicy), - KubeconfigSecret: util.AdminKubeconfigSecretName(name), - Replicas: cfg.Replicas, + DeploymentName: util.KarmadaSchedulerName(name), + Namespace: namespace, + SystemNamespace: constants.KarmadaSystemNamespace, + Image: cfg.Image.Name(), + ImagePullPolicy: string(cfg.ImagePullPolicy), + KubeconfigSecret: util.AdminKubeconfigSecretName(name), + KarmadaCertsSecret: util.KarmadaCertSecretName(name), + Replicas: cfg.Replicas, }) if err != nil { return nil, fmt.Errorf("error when parsing karmada-scheduler deployment template: %w", err) @@ -168,17 +169,18 @@ func getKarmadaSchedulerManifest(name, namespace string, featureGates map[string func getKarmadaDeschedulerManifest(name, namespace string, featureGates map[string]bool, cfg *operatorv1alpha1.KarmadaDescheduler) (*appsv1.Deployment, error) { karmadaDeschedulerBytes, err := util.ParseTemplate(KarmadaDeschedulerDeployment, struct { - Replicas *int32 - DeploymentName, Namespace, SystemNamespace string - Image, ImagePullPolicy, KubeconfigSecret string + Replicas *int32 + DeploymentName, Namespace, SystemNamespace string + Image, ImagePullPolicy, KubeconfigSecret, KarmadaCertsSecret string }{ - DeploymentName: util.KarmadaDeschedulerName(name), - Namespace: namespace, - SystemNamespace: constants.KarmadaSystemNamespace, - Image: cfg.Image.Name(), - ImagePullPolicy: string(cfg.ImagePullPolicy), - KubeconfigSecret: util.AdminKubeconfigSecretName(name), - Replicas: cfg.Replicas, + DeploymentName: util.KarmadaDeschedulerName(name), + Namespace: namespace, + SystemNamespace: constants.KarmadaSystemNamespace, + Image: cfg.Image.Name(), + ImagePullPolicy: string(cfg.ImagePullPolicy), + KubeconfigSecret: util.AdminKubeconfigSecretName(name), + KarmadaCertsSecret: util.KarmadaCertSecretName(name), + Replicas: cfg.Replicas, }) if err != nil { return nil, fmt.Errorf("error when parsing karmada-descheduler deployment template: %w", err)