@ministryofjustice/hmpps-probation-integration-e2e-tests 1.44.0 → 1.45.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/steps/k8s/k8s-utils.d.ts +1 -1
- package/steps/k8s/k8s-utils.js +24 -21
- package/steps/k8s/k8s-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ministryofjustice/hmpps-probation-integration-e2e-tests",
|
|
3
3
|
"description": "Playwright end to end tests for hmpps-probation-integration-services.",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.45.0",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
|
|
7
7
|
"bugs": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"type": "module",
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@faker-js/faker": "^9.0.3",
|
|
20
|
-
"@kubernetes/client-node": "^0.
|
|
20
|
+
"@kubernetes/client-node": "^1.0.0",
|
|
21
21
|
"@playwright/test": "1.49.1",
|
|
22
22
|
"@types/luxon": "^3.4.2",
|
|
23
23
|
"@types/node": "^22.10.1",
|
package/steps/k8s/k8s-utils.d.ts
CHANGED
package/steps/k8s/k8s-utils.js
CHANGED
|
@@ -49,10 +49,10 @@ export function getPodName(namespace, deploymentName) {
|
|
|
49
49
|
kubeConfig = new KubeConfig();
|
|
50
50
|
kubeConfig.loadFromDefault();
|
|
51
51
|
coreV1Api = kubeConfig.makeApiClient(CoreV1Api);
|
|
52
|
-
return [4 /*yield*/, coreV1Api.listNamespacedPod(namespace
|
|
52
|
+
return [4 /*yield*/, coreV1Api.listNamespacedPod({ namespace: namespace, labelSelector: "app=".concat(deploymentName) })];
|
|
53
53
|
case 1:
|
|
54
54
|
podsResponse = _a.sent();
|
|
55
|
-
name = podsResponse.
|
|
55
|
+
name = podsResponse.items[0].metadata.name;
|
|
56
56
|
console.log('Found pod:', name);
|
|
57
57
|
return [2 /*return*/, name];
|
|
58
58
|
}
|
|
@@ -118,22 +118,25 @@ export function runPod(namespace_1, podName_1, serviceAccountName_1) {
|
|
|
118
118
|
kubeConfig = new KubeConfig();
|
|
119
119
|
kubeConfig.loadFromDefault();
|
|
120
120
|
coreV1Api = kubeConfig.makeApiClient(CoreV1Api);
|
|
121
|
-
return [4 /*yield*/, coreV1Api.createNamespacedPod(
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
121
|
+
return [4 /*yield*/, coreV1Api.createNamespacedPod({
|
|
122
|
+
namespace: namespace,
|
|
123
|
+
body: {
|
|
124
|
+
metadata: {
|
|
125
|
+
name: podName,
|
|
126
|
+
},
|
|
127
|
+
spec: {
|
|
128
|
+
serviceAccountName: serviceAccountName,
|
|
129
|
+
restartPolicy: 'Never',
|
|
130
|
+
containers: [
|
|
131
|
+
{
|
|
132
|
+
name: podName,
|
|
133
|
+
image: 'ghcr.io/ministryofjustice/hmpps-devops-tools:latest',
|
|
134
|
+
command: ['sh', '-c'],
|
|
135
|
+
args: args,
|
|
136
|
+
env: env,
|
|
137
|
+
},
|
|
138
|
+
],
|
|
139
|
+
},
|
|
137
140
|
},
|
|
138
141
|
})];
|
|
139
142
|
case 1:
|
|
@@ -146,9 +149,9 @@ export function runPod(namespace_1, podName_1, serviceAccountName_1) {
|
|
|
146
149
|
_c.label = 3;
|
|
147
150
|
case 3:
|
|
148
151
|
if (!(Date.now() - started < 30000)) return [3 /*break*/, 6];
|
|
149
|
-
return [4 /*yield*/, coreV1Api.readNamespacedPod(podName, namespace)];
|
|
152
|
+
return [4 /*yield*/, coreV1Api.readNamespacedPod({ name: podName, namespace: namespace })];
|
|
150
153
|
case 4:
|
|
151
|
-
pod =
|
|
154
|
+
pod = _c.sent();
|
|
152
155
|
if (((_a = pod.status) === null || _a === void 0 ? void 0 : _a.phase) === 'Succeeded')
|
|
153
156
|
return [3 /*break*/, 6];
|
|
154
157
|
if (((_b = pod.status) === null || _b === void 0 ? void 0 : _b.phase) === 'Failed')
|
|
@@ -160,7 +163,7 @@ export function runPod(namespace_1, podName_1, serviceAccountName_1) {
|
|
|
160
163
|
case 6:
|
|
161
164
|
console.log('Pod completed:', podName);
|
|
162
165
|
return [3 /*break*/, 9];
|
|
163
|
-
case 7: return [4 /*yield*/, coreV1Api.deleteNamespacedPod(podName, namespace)];
|
|
166
|
+
case 7: return [4 /*yield*/, coreV1Api.deleteNamespacedPod({ name: podName, namespace: namespace })];
|
|
164
167
|
case 8:
|
|
165
168
|
_c.sent();
|
|
166
169
|
console.log('Pod deleted:', podName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../steps/k8s/k8s-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../steps/k8s/k8s-utils.ts"],"names":[],"mappings":"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"}
|