Skip to content

Skip manifest stability check for fleet #20874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
13 changes: 13 additions & 0 deletions Tasks/KubernetesManifestV1/Tests/L0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ describe('Kubernetes Manifests Suite', function () {
delete process.env[shared.TestEnvVars.baselineAndCanaryReplicas];
delete process.env[shared.TestEnvVars.trafficSplitMethod];
delete process.env[shared.TestEnvVars.containers];
delete process.env[shared.TestEnvVars.resourceType]
delete process.env.RemoveNamespaceFromEndpoint;
});

Expand All @@ -46,6 +47,18 @@ describe('Kubernetes Manifests Suite', function () {
assert(tr.stdout.indexOf('nginx-service 104.211.243.77') != -1, 'nginx-service external IP is 104.211.243.77')
});

it('Fleet deployment skips checkManifestStability step', async () => {
const tp = path.join(__dirname, 'TestSetup.js');
const tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
process.env[shared.TestEnvVars.action] = shared.Actions.deploy;
process.env[shared.TestEnvVars.strategy] = shared.Strategy.none;
process.env[shared.TestEnvVars.imagePullSecrets] = 'test-key1\ntest-key2';
process.env[shared.TestEnvVars.resourceType] = 'Microsoft.ContainerService/fleets';
await tr.runAsync();
assert(tr.stdout.indexOf('checking manifest stability') === -1, 'checking manifest stability should not be printed');
assert(tr.succeeded, 'task should have succeeded');
});

it('Run successfully for deploy canary', async () => {
const tp = path.join(__dirname, 'TestSetup.js');
const tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
Expand Down
1 change: 1 addition & 0 deletions Tasks/KubernetesManifestV1/Tests/TestSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ tr.setInput('dockerComposeFile', process.env[shared.TestEnvVars.dockerComposeFil
tr.setInput('kustomizationPath', process.env[shared.TestEnvVars.kustomizationPath] || '');
tr.setInput('baselineAndCanaryReplicas', process.env[shared.TestEnvVars.baselineAndCanaryReplicas] || '0');
tr.setInput('trafficSplitMethod', process.env[shared.TestEnvVars.trafficSplitMethod]);
tr.setInput('resourceType', process.env[shared.TestEnvVars.resourceType] || '');

process.env.SYSTEM_DEFAULTWORKINGDIRECTORY = testnamespaceWorkingDirectory;
process.env.SYSTEM_TEAMFOUNDATIONCOLLECTIONURI = teamFoundationCollectionUri;
Expand Down
3 changes: 2 additions & 1 deletion Tasks/KubernetesManifestV1/Tests/TestShared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export let TestEnvVars = {
isCanaryDeploymentPresent: "__isCanaryDeploymentPresent__",
isBaselineDeploymentPresent: "__isBaselineDeploymentPresent__",
baselineAndCanaryReplicas: "__baselineAndCanaryReplicas__",
trafficSplitMethod: "__trafficSplitMethod__"
trafficSplitMethod: "__trafficSplitMethod__",
resourceType: "__resourceType__"
};

export let OperatingSystems = {
Expand Down
8 changes: 7 additions & 1 deletion Tasks/KubernetesManifestV1/src/utils/DeploymentHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ export async function deploy(kubectl: Kubectl, manifestFilePaths: string[], depl

// check manifest stability
const resourceTypes: Resource[] = KubernetesObjectUtility.getResources(deployedManifestFiles, models.deploymentTypes.concat([KubernetesConstants.DiscoveryAndLoadBalancerResource.service]));
await checkManifestStability(kubectl, resourceTypes);
const resourceType = tl.getInput('resourceType') || ''

// for a fleet object, we do not check for manifest stability
if (resourceType.toLowerCase() != 'microsoft.containerservice/fleets') {
tl.debug('checking manifest stability');
await checkManifestStability(kubectl, resourceTypes)
}

// print ingress resources
const ingressResources: Resource[] = KubernetesObjectUtility.getResources(deployedManifestFiles, [KubernetesConstants.DiscoveryAndLoadBalancerResource.ingress]);
Expand Down