azure/k8s-deploy
1
0
Fork 0
mirror of https://github.com/Azure/k8s-deploy.git synced 2026-06-27 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing label values of workflow names with spaces (#134)

Browse Source
This commit is contained in:
Koushik Dey
2021-05-05 15:55:02 +05:30
committed by GitHub
parent d332939666
commit ac49626466
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utilities/strategy-helpers/deployment-helper.ts
+2 -5
View File
@@ -17,7 +17,7 @@ import { IExecSyncResult } from '../../utilities/tool-runner';
import { deployPodCanary } from './pod-canary-deployment-helper';
import { deploySMICanary } from './smi-canary-deployment-helper';
import { checkForErrors, annotateChildPods, getWorkflowFilePath, getLastSuccessfulRunSha, DeploymentConfig, getDeploymentConfig } from "../utility";
import { checkForErrors, annotateChildPods, getWorkflowFilePath, getLastSuccessfulRunSha, DeploymentConfig, getDeploymentConfig, normaliseWorkflowStrLabel } from "../utility";
import { isBlueGreenDeploymentStrategy, isIngressRoute, isSMIRoute, routeBlueGreen } from './blue-green-helper';
import { deployBlueGreenService } from './service-blue-green-helper';
import { deployBlueGreenIngress } from './ingress-blue-green-helper';
@@ -152,10 +152,7 @@ function annotateResources(files: string[], kubectl: Kubectl, resourceTypes: Res
}
function labelResources(files: string[], kubectl: Kubectl, label: string) {
let workflowName = process.env.GITHUB_WORKFLOW;
workflowName = workflowName.startsWith('.github/workflows/') ?
workflowName.replace(".github/workflows/", "") : workflowName;
const labels = [`workflowFriendlyName=${workflowName}`, `workflow=${label}`];
const labels = [`workflowFriendlyName=${normaliseWorkflowStrLabel(process.env.GITHUB_WORKFLOW)}`, `workflow=${label}`];
checkForErrors([kubectl.labelFiles(files, labels)], true);
}
src/utilities/utility.ts
+6
View File
@@ -169,6 +169,12 @@ export async function getDeploymentConfig(): Promise<DeploymentConfig> {
return Promise.resolve(deploymentConfig);
}
export function normaliseWorkflowStrLabel(workflowName: string): string {
workflowName = workflowName.startsWith('.github/workflows/') ?
workflowName.replace(".github/workflows/", "") : workflowName;
return workflowName.replace(/ /g, "_");
}
export function sleep(timeout: number) {
return new Promise(resolve => setTimeout(resolve, timeout));
}