Skip to content

Commit 858e967

Browse files
committed
use general purpsoe FEATURES_GATES and RUNTIME_CONFIG instead of GA_ONLY
so we can streamline mainteance of e2e-k8s.sh which is also used as a template for other scripts that wind up inheriting its complexity
1 parent e4b4ee5 commit 858e967

File tree

7 files changed

+40
-16
lines changed

7 files changed

+40
-16
lines changed

config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,11 @@ presubmits:
9898
# skip serial tests and run with --ginkgo-parallel
9999
- name: "PARALLEL"
100100
value: "true"
101-
- name: GA_ONLY
102-
value: "true"
101+
# disable non-GA APIs and features
102+
- name: FEATURE_GATES
103+
value: '{"AllAlpha":false,"AllBeta":false}'
104+
- name: RUNTIME_CONFIG
105+
value: '{"api/alpha":"false", "api/beta":"false"}'
103106
command:
104107
- wrapper.sh
105108
- bash

config/jobs/kubernetes/sig-release/release-branch-jobs/1.31.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,8 +1912,11 @@ presubmits:
19121912
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz
19131913
- -C "${PATH%%:*}/" && e2e-k8s.sh
19141914
env:
1915-
- name: GA_ONLY
1916-
value: "true"
1915+
# disable non-GA APIs and features
1916+
- name: FEATURE_GATES
1917+
value: '{"AllAlpha":false,"AllBeta":false}'
1918+
- name: RUNTIME_CONFIG
1919+
value: '{"api/alpha":"false", "api/beta":"false"}'
19171920
- name: PARALLEL
19181921
value: "true"
19191922
image: gcr.io/k8s-staging-test-infra/krte:v20251021-e2c2c9806f-1.31

config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,8 +2042,11 @@ presubmits:
20422042
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz
20432043
- -C "${PATH%%:*}/" && e2e-k8s.sh
20442044
env:
2045-
- name: GA_ONLY
2046-
value: "true"
2045+
# disable non-GA APIs and features
2046+
- name: FEATURE_GATES
2047+
value: '{"AllAlpha":false,"AllBeta":false}'
2048+
- name: RUNTIME_CONFIG
2049+
value: '{"api/alpha":"false", "api/beta":"false"}'
20472050
- name: PARALLEL
20482051
value: "true"
20492052
image: gcr.io/k8s-staging-test-infra/krte:v20251021-e2c2c9806f-1.32

config/jobs/kubernetes/sig-release/release-branch-jobs/1.33.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,8 +2609,11 @@ presubmits:
26092609
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz
26102610
- -C "${PATH%%:*}/" && e2e-k8s.sh
26112611
env:
2612-
- name: GA_ONLY
2613-
value: "true"
2612+
# disable non-GA APIs and features
2613+
- name: FEATURE_GATES
2614+
value: '{"AllAlpha":false,"AllBeta":false}'
2615+
- name: RUNTIME_CONFIG
2616+
value: '{"api/alpha":"false", "api/beta":"false"}'
26142617
- name: PARALLEL
26152618
value: "true"
26162619
image: gcr.io/k8s-staging-test-infra/krte:v20251021-e2c2c9806f-1.33

config/jobs/kubernetes/sig-release/release-branch-jobs/1.34.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,8 +3452,11 @@ presubmits:
34523452
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz
34533453
- -C "${PATH%%:*}/" && e2e-k8s.sh
34543454
env:
3455-
- name: GA_ONLY
3456-
value: "true"
3455+
# disable non-GA APIs and features
3456+
- name: FEATURE_GATES
3457+
value: '{"AllAlpha":false,"AllBeta":false}'
3458+
- name: RUNTIME_CONFIG
3459+
value: '{"api/alpha":"false", "api/beta":"false"}'
34573460
- name: PARALLEL
34583461
value: "true"
34593462
image: gcr.io/k8s-staging-test-infra/krte:v20251021-e2c2c9806f-1.34

config/jobs/kubernetes/sig-testing/conformance-e2e.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,11 @@ periodics:
165165
- -c
166166
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
167167
env:
168-
- name: GA_ONLY
169-
value: "true"
168+
# disable non-GA APIs and features
169+
- name: FEATURE_GATES
170+
value: '{"AllAlpha":false,"AllBeta":false}'
171+
- name: RUNTIME_CONFIG
172+
value: '{"api/alpha":"false", "api/beta":"false"}'
170173
# we need privileged mode in order to do docker in docker
171174
securityContext:
172175
privileged: true

config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,11 @@ presubmits:
208208
- -c
209209
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
210210
env:
211-
- name: GA_ONLY
212-
value: "true"
211+
# disable non-GA APIs and features
212+
- name: FEATURE_GATES
213+
value: '{"AllAlpha":false,"AllBeta":false}'
214+
- name: RUNTIME_CONFIG
215+
value: '{"api/alpha":"false", "api/beta":"false"}'
213216
# we need privileged mode in order to do docker in docker
214217
securityContext:
215218
privileged: true
@@ -247,8 +250,11 @@ presubmits:
247250
- -c
248251
- curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
249252
env:
250-
- name: GA_ONLY
251-
value: "true"
253+
# disable non-GA APIs and features
254+
- name: FEATURE_GATES
255+
value: '{"AllAlpha":false,"AllBeta":false}'
256+
- name: RUNTIME_CONFIG
257+
value: '{"api/alpha":"false", "api/beta":"false"}'
252258
- name: PARALLEL
253259
value: "true"
254260
# we need privileged mode in order to do docker in docker

0 commit comments

Comments
 (0)