diff --git a/packages/backend/src/plugins/k8s-apply.ts b/packages/backend/src/plugins/k8s-apply.ts index 0e37f07..733b6d3 100644 --- a/packages/backend/src/plugins/k8s-apply.ts +++ b/packages/backend/src/plugins/k8s-apply.ts @@ -100,6 +100,7 @@ export const createKubernetesApply = (config: Config) => { { name: ctx.input.clusterName, cluster: { + 'certificate-authority-data': targetCluster.getOptionalString('caData'), 'certificate-authority': targetCluster.getOptionalString('caFile'), server: targetCluster.getString('url'), 'insecure-skip-tls-verify': !!targetCluster.getOptionalBoolean('skipTLSVerify'), @@ -115,36 +116,31 @@ export const createKubernetesApply = (config: Config) => { }, ], }; - - //if (!confFile.clusters[0].cluster["insecure-skip-tls-verify"]) { - // let caDataRaw = targetCluster.getOptionalString('caData') - // if (caDataRaw?.startsWith('-----BEGIN CERTIFICATE-----')) { - // caDataRaw = Buffer.from(targetCluster.getString('caData'), 'utf8').toString( - // 'base64', - // ); - // } - // confFile.clusters[0].cluster['certificate-authority-data'] = caDataRaw - //} - + if (!confFile.clusters[0].cluster["insecure-skip-tls-verify"]) { + let caDataRaw = targetCluster.getOptionalString('caData') + if (caDataRaw?.startsWith('-----BEGIN CERTIFICATE-----')) { + caDataRaw = Buffer.from(targetCluster.getString('caData'), 'utf8').toString( + 'base64', + ); + } + confFile.clusters[0].cluster['certificate-authority-data'] = caDataRaw + } const confString = dumpYaml(confFile); const confFilePath = resolveSafeChildPath(ctx.workspacePath, 'config'); fs.writeFileSync(confFilePath, confString, { encoding: 'utf8', mode: '600', }); - await executeShellCommand({ command: 'cat', args: [confFilePath], logStream: ctx.logStream, }); - await executeShellCommand({ command: 'cat', args: [manifestPath], logStream: ctx.logStream, }); - if (obj.metadata.generateName !== undefined) { await executeShellCommand({ command: 'kubectl',