DevFW-CICD/backstage-edp
12
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

add caData back in

Browse source 
Signed-off-by: Jesse Sanford <108698+jessesanford@users.noreply.github.com>
This commit is contained in:
Jesse Sanford 2024-03-13 17:16:00 -04:00
parent af1d23bc98
commit e101c857ed
No known key found for this signature in database
GPG key ID: 1254665FB6385552
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/backend/src/plugins/k8s-apply.ts
View file

@ -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',