Skip to content

Commit bcde408

Browse files
committed
Don't get the k8s version from the wrong kube context
1 parent 9d19742 commit bcde408

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

newsfragments/789.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ensure all `kubectl` commands in `scripts/setup_test_cluster.sh` specify the context.

scripts/setup_test_cluster.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2024 New Vector Ltd
3+
# Copyright 2024-2025 New Vector Ltd
44
#
55
# SPDX-License-Identifier: AGPL-3.0-only
66

@@ -108,7 +108,7 @@ fi
108108

109109
for namespace in $ess_namespaces; do
110110
echo "Constructing ESS dependencies in $namespace"
111-
server_version=$(kubectl version | grep Server | sed 's/.*v/v/' | awk -F. '{print $1"."$2}')
111+
server_version=$(kubectl --context $kind_context_name version | grep Server | sed 's/.*v/v/' | awk -F. '{print $1"."$2}')
112112
# We don't turn on enforce here as people may be experimenting but we do turn on warn so people see the warnings when helm install/upgrade
113113
cat <<EOF | kubectl --context $kind_context_name apply -f -
114114
apiVersion: v1

0 commit comments

Comments
 (0)