diff --git a/hack/ci/e2e-k8s.sh b/hack/ci/e2e-k8s.sh index 6e692c3a..6c7e523e 100755 --- a/hack/ci/e2e-k8s.sh +++ b/hack/ci/e2e-k8s.sh @@ -28,8 +28,6 @@ set -o errexit -o nounset -o xtrace # parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and # FOCUS is recommended (more expressive, easier to read than regexp). # -# GA_ONLY: true - limit to GA APIs/features as much as possible -# false - (default) APIs and features left at defaults # FEATURE_GATES: # JSON or YAML encoding of a string/bool map: {"FeatureGateA": true, "FeatureGateB": false} # Enables or disables feature gates in the entire cluster. @@ -130,30 +128,6 @@ create_cluster() { # --runtime-config argument value passed to the API server, again as a map runtime_config="${RUNTIME_CONFIG:-{\}}" - case "${GA_ONLY:-false}" in - false) - : - ;; - true) - if [ "${feature_gates}" != "{}" ]; then - echo "GA_ONLY=true and FEATURE_GATES=${feature_gates} are mutually exclusive." - exit 1 - fi - if [ "${runtime_config}" != "{}" ]; then - echo "GA_ONLY=true and RUNTIME_CONFIG=${runtime_config} are mutually exclusive." - exit 1 - fi - - echo "Limiting to GA APIs and features for ${KUBE_VERSION}" - feature_gates='{"AllAlpha":false,"AllBeta":false}' - runtime_config='{"api/alpha":"false", "api/beta":"false"}' - ;; - *) - echo "\$GA_ONLY set to '${GA_ONLY}'; supported values are true and false (default)" - exit 1 - ;; - esac - # create the config file cat < "${ARTIFACTS}/kind-config.yaml" # config for 1 control plane node and 2 workers (necessary for conformance)