From 9610dd7b150cdae70d45ff1056e020b09f41b680 Mon Sep 17 00:00:00 2001 From: Mani Kumar Marothu Date: Tue, 3 Sep 2024 15:05:53 -0700 Subject: [PATCH] Removed cert fields from default config Signed-off-by: Mani Kumar Marothu Signed-off-by: Mani Marothu --- packages/backend/src/plugins/k8s-apply.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/plugins/k8s-apply.ts b/packages/backend/src/plugins/k8s-apply.ts index 72215b3..fd413b7 100644 --- a/packages/backend/src/plugins/k8s-apply.ts +++ b/packages/backend/src/plugins/k8s-apply.ts @@ -109,7 +109,7 @@ export const createKubernetesApply = (config: Config) => { server: targetCluster.getString('url'), 'insecure-skip-tls-verify': !!targetCluster.getOptionalBoolean('skipTLSVerify'), - }, + } satisfies Record, }, ], users: [ @@ -121,7 +121,7 @@ export const createKubernetesApply = (config: Config) => { }, ], }; - if(!confFile.clusters[0].cluster['insecure-skip-tls-verify']) { + if (!confFile.clusters[0].cluster['insecure-skip-tls-verify']) { let caDataRaw = targetCluster.getOptionalString('caData'); if (caDataRaw?.startsWith('-----BEGIN CERTIFICATE-----')) { caDataRaw = Buffer.from( @@ -129,10 +129,13 @@ export const createKubernetesApply = (config: Config) => { 'utf8', ).toString('base64'); } - (confFile.clusters[0].cluster as any)['certificate-authority-data'] = + confFile.clusters[0].cluster['certificate-authority-data'] = caDataRaw; - (confFile.clusters[0].cluster as any)['certificate-authority'] = - targetCluster.getOptionalString('caFile'); + + if (! (targetCluster.getOptionalString('caFile').length === 0 || targetCluster.getOptionalString('caFile').length === null)) { + confFile.clusters[0].cluster['certificate-authority'] = + targetCluster.getOptionalString('caFile'); + } } const confString = dumpYaml(confFile); const confFilePath = resolveSafeChildPath(ctx.workspacePath, 'config');