Skip to content

Commit e7b30e8

Browse files
committed
Fix: run it for each one (also seen the issue on 1.32
1 parent 72b5ecd commit e7b30e8

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

build/e2e-image/e2e.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,13 @@ FEATURES=$1
1818
CLOUD_PRODUCT=$2
1919
REGISTRY=$3
2020

21-
K8S_MINOR=$(kubectl version -o json | jq -r '.serverVersion.minor' | sed 's/+//')
22-
2321
echo $FEATURES
2422
echo $REGISTRY
25-
echo $K8S_MINOR
2623
set -e
2724

28-
# Ensure we cleanup the finalizers from k8s 1.33 until they patch it
29-
if [ "$K8S_MINOR" = "33" ]; then
30-
echo "GKE 1.33 detected: cleaning up stuck service finalizers"
31-
32-
kubectl get svc -n agones-system -o json \
33-
| jq -r '.items[] | select(.metadata.finalizers | length > 0) | .metadata.name' \
34-
| xargs -r -I {} kubectl patch svc {} -n agones-system -p '{"metadata":{"finalizers":null}}' --type=merge
35-
fi
25+
kubectl get svc -n agones-system -o json \
26+
| jq -r '.items[] | select(.metadata.finalizers | length > 0) | .metadata.name' \
27+
| xargs -r -I {} kubectl patch svc {} -n agones-system -p '{"metadata":{"finalizers":null}}' --type=merge
3628

3729
echo "installing current release"
3830
DOCKER_RUN= make install FEATURE_GATES='"'$FEATURES'"' REGISTRY='"'$REGISTRY'"'

0 commit comments

Comments
 (0)