Skip to content

Commit 97a58f7

Browse files
Remove workaround for credentials rotation
Issue: ZENKO-4879
1 parent 726bcc9 commit 97a58f7

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

tests/ctst/steps/pra.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import Zenko from 'world/Zenko';
33
import ZenkoDrctl from './dr/drctl';
44
import {
55
createSecret,
6-
deletePodsByLabel,
76
displayCRStatus,
87
getDRSink,
98
getDRSource,
@@ -74,7 +73,7 @@ async function installPRA(world: Zenko, sinkS3Endpoint = 'http://s3.zenko.local'
7473
prometheusDisableTls: true,
7574
forceRotateServiceCredentials: world.praInstallCount > 0,
7675
...kafkaExternalIpOption,
77-
timeout
76+
timeout,
7877
});
7978
}
8079

@@ -165,15 +164,13 @@ async function waitForPhase(
165164
}
166165

167166
const installTimeout = 360000;
168-
Given('a DR installed', { timeout: installTimeout }, async function (this: Zenko) {
167+
Given('a DR installed', { timeout: installTimeout + 2000 }, async function (this: Zenko) {
169168
Identity.useIdentity(IdentityEnum.ACCOUNT, Zenko.sites['source'].accountName);
170169
const credentials = Identity.getCurrentCredentials();
171170
await createSecret(this, 'drctl-s3-creds', {
172171
accessKey: Buffer.from(credentials.accessKeyId).toString('base64'),
173172
secretAccessKey: Buffer.from(credentials.secretAccessKey).toString('base64'),
174173
});
175-
await deletePodsByLabel(this,
176-
'app.kubernetes.io/name=sorbet-fwd-user-create,app.kubernetes.io/instance=end2end-pra');
177174
await installPRA(this, undefined, `${installTimeout.toString()}ms`);
178175
this.praInstallCount += 1;
179176
return;

tests/ctst/steps/utils/kubernetes.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,6 @@ export function createKubeCustomObjectClient(world: Zenko) {
6363
return KubernetesHelper.customObject as CustomObjectsApi;
6464
}
6565

66-
export async function deletePodsByLabel(world: Zenko, label: string, namespace = 'default') {
67-
const coreClient = createKubeCoreClient(world);
68-
69-
try {
70-
await coreClient.deleteCollectionNamespacedPod(
71-
namespace, undefined, undefined, undefined, undefined, undefined, label);
72-
} catch (err) {
73-
world.logger.debug('Error deleting pods by label', {
74-
label,
75-
namespace,
76-
err,
77-
});
78-
throw err;
79-
}
80-
}
81-
8266
export async function createJobAndWaitForCompletion(world: Zenko, jobName: string, customMetadata?: string) {
8367
const batchClient = createKubeBatchClient(world);
8468
const watchClient = createKubeWatchClient(world);

0 commit comments

Comments
 (0)