Skip to content

Commit ce4490f

Browse files
committed
Fixed integration test errors
1 parent 5ae8700 commit ce4490f

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

package-lock.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/strategyHelpers/blueGreen/smiBlueGreenHelper.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ export async function createTrafficSplitObject(
8080
): Promise<TrafficSplitObject> {
8181
// cache traffic split api version
8282
if (!trafficSplitAPIVersion)
83-
trafficSplitAPIVersion =
84-
await kubectlUtils.getTrafficSplitAPIVersion(kubectl)
83+
trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion(
84+
kubectl,
85+
timeout
86+
)
8587

8688
// retrieve annotations for TS object
8789
const annotations = inputAnnotations

src/strategyHelpers/canary/smiCanaryHelper.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ async function adjustTraffic(
303303
const result = await kubectl.apply(
304304
trafficSplitManifests,
305305
forceDeployment,
306-
serverSideApply
306+
serverSideApply,
307+
timeout
307308
)
308309
checkForErrors([result])
309310
return trafficSplitManifests
@@ -379,8 +380,10 @@ async function getTrafficSplitObject(
379380
): Promise<string> {
380381
// cached version
381382
if (!trafficSplitAPIVersion) {
382-
trafficSplitAPIVersion =
383-
await kubectlUtils.getTrafficSplitAPIVersion(kubectl)
383+
trafficSplitAPIVersion = await kubectlUtils.getTrafficSplitAPIVersion(
384+
kubectl,
385+
timeout
386+
)
384387
}
385388

386389
return JSON.stringify({

src/utilities/trafficSplitUtils.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ import {Kubectl} from '../types/kubectl'
33
const trafficSplitAPIVersionPrefix = 'split.smi-spec.io'
44

55
export async function getTrafficSplitAPIVersion(
6-
kubectl: Kubectl
6+
kubectl: Kubectl,
7+
timeout?: string
78
): Promise<string> {
8-
const result = await kubectl.executeCommand('api-versions')
9+
const result = await kubectl.executeCommand(
10+
'api-versions',
11+
undefined,
12+
timeout
13+
)
914
const trafficSplitAPIVersion = result.stdout
1015
.split('\n')
1116
.find((version) => version.startsWith(trafficSplitAPIVersionPrefix))

0 commit comments

Comments
 (0)