Skip to content

Commit 8f1c0b6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35849 from BenTheElder/cleanup-scripts
cleanup remaining GA_ONLY references
2 parents 1bfb35d + 45fe181 commit 8f1c0b6

File tree

9 files changed

+0
-210
lines changed

9 files changed

+0
-210
lines changed

‎experiment/compatibility-versions/common.sh‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,12 @@ CONTROL_PLANE_COMPONENTS="kube-apiserver kube-controller-manager kube-scheduler"
3535
# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
3636
# FOCUS is recommended (more expressive, easier to read than regexp).
3737
#
38-
# GA_ONLY: true - limit to GA APIs/features as much as possible
39-
# false - (default) APIs and features left at defaults
4038
# FEATURE_GATES:
4139
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
4240
# Enables or disables feature gates in the entire cluster.
43-
# Cannot be used when GA_ONLY=true.
4441
# RUNTIME_CONFIG:
4542
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
4643
# Enables API groups in the apiserver via --runtime-config.
47-
# Cannot be used when GA_ONLY=true.
4844

4945
# cleanup logic for cleanup on exit
5046
CLEANED_UP=false
@@ -134,30 +130,6 @@ create_cluster() {
134130
# --runtime-config argument value passed to the API server, again as a map
135131
runtime_config="${RUNTIME_CONFIG:-{\}}"
136132

137-
case "${GA_ONLY:-false}" in
138-
false)
139-
:
140-
;;
141-
true)
142-
if [ "${feature_gates}" != "{}" ]; then
143-
echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive."
144-
return 1
145-
fi
146-
if [ "${runtime_config}" != "{}" ]; then
147-
echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive."
148-
return 1
149-
fi
150-
151-
echo "Limiting to GA APIs and features for ${PREV_VERSION}"
152-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
153-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
154-
;;
155-
*)
156-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
157-
return 1
158-
;;
159-
esac
160-
161133
# create the config file
162134
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
163135
# config for 1 control plane node and 2 workers (necessary for conformance)

‎experiment/compatibility-versions/compatibility-versions-feature-gate-test.sh‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,14 @@ set -o errexit -o nounset -o pipefail
2121
set -o xtrace
2222

2323
# Settings:
24-
# GA_ONLY: true - limit to GA APIs/features as much as possible
25-
# false - (default) APIs and features left at defaults
2624

2725
# FEATURE_GATES:
2826
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
2927
# Enables or disables feature gates in the entire cluster.
30-
# Cannot be used when GA_ONLY=true.
3128

3229
# RUNTIME_CONFIG:
3330
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
3431
# Enables API groups in the apiserver via --runtime-config.
35-
# Cannot be used when GA_ONLY=true.
3632

3733
# cleanup logic for cleanup on exit
3834
CLEANED_UP=false
@@ -119,30 +115,6 @@ create_cluster() {
119115
# --runtime-config argument value passed to the API server, again as a map
120116
runtime_config="${RUNTIME_CONFIG:-{\}}"
121117

122-
case "${GA_ONLY:-false}" in
123-
false)
124-
:
125-
;;
126-
true)
127-
if [ "${feature_gates}" != "{}" ]; then
128-
echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive."
129-
exit 1
130-
fi
131-
if [ "${runtime_config}" != "{}" ]; then
132-
echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive."
133-
exit 1
134-
fi
135-
136-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
137-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
138-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
139-
;;
140-
*)
141-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
142-
exit 1
143-
;;
144-
esac
145-
146118
# create the config file
147119
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
148120
# config for 1 control plane node and 2 workers (necessary for conformance)

‎experiment/compatibility-versions/e2e-k8s-compatibility-versions.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@ set -o errexit -o nounset -o xtrace
2828
# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
2929
# FOCUS is recommended (more expressive, easier to read than regexp).
3030
#
31-
# GA_ONLY: true - limit to GA APIs/features as much as possible
32-
# false - (default) APIs and features left at defaults
3331
# FEATURE_GATES:
3432
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
3533
# Enables or disables feature gates in the entire cluster.
36-
# Cannot be used when GA_ONLY=true.
3734
# RUNTIME_CONFIG:
3835
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
3936
# Enables API groups in the apiserver via --runtime-config.
40-
# Cannot be used when GA_ONLY=true.
4137

4238
COMMON_SCRIPT="${COMMON_SCRIPT:-${PWD}/../test-infra/experiment/compatibility-versions/common.sh}"
4339
source "${COMMON_SCRIPT}"

‎experiment/compatibility-versions/e2e-two-steps-upgrade.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@ set -o errexit -o nounset -o xtrace
2828
# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
2929
# FOCUS is recommended (more expressive, easier to read than regexp).
3030
#
31-
# GA_ONLY: true - limit to GA APIs/features as much as possible
32-
# false - (default) APIs and features left at defaults
3331
# FEATURE_GATES:
3432
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
3533
# Enables or disables feature gates in the entire cluster.
36-
# Cannot be used when GA_ONLY=true.
3734
# RUNTIME_CONFIG:
3835
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
3936
# Enables API groups in the apiserver via --runtime-config.
40-
# Cannot be used when GA_ONLY=true.
4137

4238
COMMON_SCRIPT="${COMMON_SCRIPT:-${PWD}/../test-infra/experiment/compatibility-versions/common.sh}"
4339
source "${COMMON_SCRIPT}"

‎experiment/kind-detect-local-e2e.sh‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ set -o errexit -o nounset -o xtrace
2222
# Settings:
2323
# SKIP: ginkgo skip regex
2424
# FOCUS: ginkgo focus regex
25-
# GA_ONLY: true - limit to GA APIs/features as much as possible
26-
# false - (default) APIs and features left at defaults
2725
#
2826

2927
# cleanup logic for cleanup on exit
@@ -114,35 +112,6 @@ create_cluster() {
114112
# --runtime-config argument value passed to the API server
115113
runtime_config="{}"
116114

117-
case "${GA_ONLY:-false}" in
118-
false)
119-
feature_gates="{}"
120-
runtime_config="{}"
121-
;;
122-
true)
123-
case "${KUBE_VERSION}" in
124-
v1.1[0-7].*)
125-
echo "GA_ONLY=true is only supported on versions >= v1.18, got ${KUBE_VERSION}"
126-
exit 1
127-
;;
128-
v1.18.*)
129-
echo "Limiting to GA APIs and features (plus certificates.k8s.io/v1beta1 and RotateKubeletClientCertificate) for ${KUBE_VERSION}"
130-
feature_gates='{"AllAlpha":false,"AllBeta":false,"RotateKubeletClientCertificate":true}'
131-
runtime_config='{"api/alpha":"false", "api/beta":"false", "certificates.k8s.io/v1beta1":"true"}'
132-
;;
133-
*)
134-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
135-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
136-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
137-
;;
138-
esac
139-
;;
140-
*)
141-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
142-
exit 1
143-
;;
144-
esac
145-
146115
# create the config file
147116
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
148117
# config for 1 control plane node and 2 workers (necessary for conformance)

‎experiment/kind-logs-e2e-k8s.sh‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ set -o errexit -o nounset -o xtrace
2222
# Settings:
2323
# SKIP: ginkgo skip regex
2424
# FOCUS: ginkgo focus regex
25-
# GA_ONLY: true - limit to GA APIs/features as much as possible
26-
# false - (default) APIs and features left at defaults
2725
# FEATURE_GATES:
2826
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
2927
# Enables or disables feature gates in the entire cluster.
30-
# Cannot be used when GA_ONLY=true.
3128
# RUNTIME_CONFIG:
3229
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
3330
# Enables API groups in the apiserver via --runtime-config.
34-
# Cannot be used when GA_ONLY=true.
3531

3632
# cleanup logic for cleanup on exit
3733
CLEANED_UP=false
@@ -120,30 +116,6 @@ create_cluster() {
120116
# --runtime-config argument value passed to the API server, again as a map
121117
runtime_config="${RUNTIME_CONFIG:-{\}}"
122118

123-
case "${GA_ONLY:-false}" in
124-
false)
125-
:
126-
;;
127-
true)
128-
if [ "${feature_gates}" != "{}" ]; then
129-
echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive."
130-
exit 1
131-
fi
132-
if [ "${runtime_config}" != "{}" ]; then
133-
echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive."
134-
exit 1
135-
fi
136-
137-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
138-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
139-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
140-
;;
141-
*)
142-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
143-
exit 1
144-
;;
145-
esac
146-
147119
# create the config file
148120
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
149121
# config for 1 control plane node and 2 workers (necessary for conformance)

‎experiment/kind-multizone-e2e.sh‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ set -o errexit -o nounset -o xtrace
2222
# Settings:
2323
# SKIP: ginkgo skip regex
2424
# FOCUS: ginkgo focus regex
25-
# GA_ONLY: true - limit to GA APIs/features as much as possible
26-
# false - (default) APIs and features left at defaults
2725
#
2826

2927
# cleanup logic for cleanup on exit
@@ -114,35 +112,6 @@ create_cluster() {
114112
# --runtime-config argument value passed to the API server
115113
runtime_config="{}"
116114

117-
case "${GA_ONLY:-false}" in
118-
false)
119-
feature_gates="{}"
120-
runtime_config="{}"
121-
;;
122-
true)
123-
case "${KUBE_VERSION}" in
124-
v1.1[0-7].*)
125-
echo "GA_ONLY=true is only supported on versions >= v1.18, got ${KUBE_VERSION}"
126-
exit 1
127-
;;
128-
v1.18.*)
129-
echo "Limiting to GA APIs and features (plus certificates.k8s.io/v1beta1 and RotateKubeletClientCertificate) for ${KUBE_VERSION}"
130-
feature_gates='{"AllAlpha":false,"AllBeta":false,"RotateKubeletClientCertificate":true}'
131-
runtime_config='{"api/alpha":"false", "api/beta":"false", "certificates.k8s.io/v1beta1":"true"}'
132-
;;
133-
*)
134-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
135-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
136-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
137-
;;
138-
esac
139-
;;
140-
*)
141-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
142-
exit 1
143-
;;
144-
esac
145-
146115
# create the config file with 2 nodes per zone
147116
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
148117
kind: Cluster

‎experiment/kind-noendpoints-e2e.sh‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@ set -o errexit -o nounset -o xtrace
2828
# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
2929
# FOCUS is recommended (more expressive, easier to read than regexp).
3030
#
31-
# GA_ONLY: true - limit to GA APIs/features as much as possible
32-
# false - (default) APIs and features left at defaults
3331
# FEATURE_GATES:
3432
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
3533
# Enables or disables feature gates in the entire cluster.
36-
# Cannot be used when GA_ONLY=true.
3734
# RUNTIME_CONFIG:
3835
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
3936
# Enables API groups in the apiserver via --runtime-config.
40-
# Cannot be used when GA_ONLY=true.
4137

4238
# cleanup logic for cleanup on exit
4339
CLEANED_UP=false
@@ -130,30 +126,6 @@ create_cluster() {
130126
# --runtime-config argument value passed to the API server, again as a map
131127
runtime_config="${RUNTIME_CONFIG:-{\}}"
132128

133-
case "${GA_ONLY:-false}" in
134-
false)
135-
:
136-
;;
137-
true)
138-
if [ "${feature_gates}" != "{}" ]; then
139-
echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive."
140-
exit 1
141-
fi
142-
if [ "${runtime_config}" != "{}" ]; then
143-
echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive."
144-
exit 1
145-
fi
146-
147-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
148-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
149-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
150-
;;
151-
*)
152-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
153-
exit 1
154-
;;
155-
esac
156-
157129
# create the config file
158130
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
159131
# config for 1 control plane node and 2 workers (necessary for conformance)

‎experiment/kubelet-serving-certificates/e2e-k8s.sh‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@ set -o errexit -o nounset -o xtrace
2929
# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
3030
# FOCUS is recommended (more expressive, easier to read than regexp).
3131
#
32-
# GA_ONLY: true - limit to GA APIs/features as much as possible
33-
# false - (default) APIs and features left at defaults
3432
# FEATURE_GATES:
3533
# JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false}
3634
# Enables or disables feature gates in the entire cluster.
37-
# Cannot be used when GA_ONLY=true.
3835
# RUNTIME_CONFIG:
3936
# JSON or YAML encoding of a string/string (!) map: {"apia.example.com/v1alpha1": "true", "apib.example.com/v1beta1": "false"}
4037
# Enables API groups in the apiserver via --runtime-config.
41-
# Cannot be used when GA_ONLY=true.
4238

4339
# cleanup logic for cleanup on exit
4440
CLEANED_UP=false
@@ -133,30 +129,6 @@ create_cluster() {
133129
# --runtime-config argument value passed to the API server, again as a map
134130
runtime_config="${RUNTIME_CONFIG:-{\}}"
135131

136-
case "${GA_ONLY:-false}" in
137-
false)
138-
:
139-
;;
140-
true)
141-
if [ "${feature_gates}" != "{}" ]; then
142-
echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive."
143-
exit 1
144-
fi
145-
if [ "${runtime_config}" != "{}" ]; then
146-
echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive."
147-
exit 1
148-
fi
149-
150-
echo "Limiting to GA APIs and features for ${KUBE_VERSION}"
151-
feature_gates='{"AllAlpha":false,"AllBeta":false}'
152-
runtime_config='{"api/alpha":"false", "api/beta":"false"}'
153-
;;
154-
*)
155-
echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)"
156-
exit 1
157-
;;
158-
esac
159-
160132
# create the config file
161133
cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
162134
# config for 1 control plane node and 2 workers (necessary for conformance)

0 commit comments

Comments
 (0)