From 2cba49ad16bf6689981c1f74dc4b9fdd249deaf4 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 29 Sep 2021 06:03:09 -0700 Subject: [PATCH] Revert "config/jobs: mv some canary jobs to local ssd nodepool" This reverts commit 4d4660c966e25f82283c85aed22c6e813d7a0e4d. Experiment has concluded and we've migrated to using a local-ssd-backed nodepool exclusively. These can be reverted to their original config --- .../jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml | 8 -------- config/jobs/kubernetes/sig-testing/integration.yaml | 8 -------- .../sig-testing/kubernetes-kind-presubmits.yaml | 8 -------- config/jobs/kubernetes/sig-testing/make-test.yaml | 8 -------- config/jobs/kubernetes/sig-testing/verify.yaml | 8 -------- 5 files changed, 40 deletions(-) diff --git a/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml b/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml index 891ca939a85a..b77b0af1db95 100644 --- a/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml +++ b/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml @@ -165,14 +165,6 @@ presubmits: preset-pull-kubernetes-e2e: "true" preset-pull-kubernetes-e2e-gce: "true" spec: - # TODO(https://github.com/kubernetes/k8s.io/issues/1187): remove nodeSelector/tolerations once new nodepool confirmed healthy - nodeSelector: - cloud.google.com/gke-ephemeral-storage-local-ssd: "true" - tolerations: - - key: "ephemeral-ssd-experiment" - operator: "Equal" - value: "true" - effect: "NoSchedule" containers: - args: - --root=/go/src diff --git a/config/jobs/kubernetes/sig-testing/integration.yaml b/config/jobs/kubernetes/sig-testing/integration.yaml index 19e484037268..78b01404dbd7 100644 --- a/config/jobs/kubernetes/sig-testing/integration.yaml +++ b/config/jobs/kubernetes/sig-testing/integration.yaml @@ -50,14 +50,6 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" spec: - # TODO(https://github.com/kubernetes/k8s.io/issues/1187): remove nodeSelector/tolerations once new nodepool confirmed healthy - nodeSelector: - cloud.google.com/gke-ephemeral-storage-local-ssd: "true" - tolerations: - - key: "ephemeral-ssd-experiment" - operator: "Equal" - value: "true" - effect: "NoSchedule" containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20210928-2a55334641-go-canary command: diff --git a/config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml b/config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml index e3eb261cb7f2..29abc8cd6488 100644 --- a/config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml +++ b/config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml @@ -62,14 +62,6 @@ presubmits: grace_period: 15m path_alias: k8s.io/kubernetes spec: - # TODO(https://github.com/kubernetes/k8s.io/issues/1187): remove nodeSelector/tolerations once new nodepool confirmed healthy - nodeSelector: - cloud.google.com/gke-ephemeral-storage-local-ssd: "true" - tolerations: - - key: "ephemeral-ssd-experiment" - operator: "Equal" - value: "true" - effect: "NoSchedule" containers: - image: gcr.io/k8s-staging-test-infra/krte:latest-master imagePullPolicy: Always # pull latest image for canary testing diff --git a/config/jobs/kubernetes/sig-testing/make-test.yaml b/config/jobs/kubernetes/sig-testing/make-test.yaml index 665b7c5cb118..76f23320c64f 100644 --- a/config/jobs/kubernetes/sig-testing/make-test.yaml +++ b/config/jobs/kubernetes/sig-testing/make-test.yaml @@ -87,14 +87,6 @@ presubmits: skip_report: false path_alias: k8s.io/kubernetes spec: - # TODO(https://github.com/kubernetes/k8s.io/issues/1187): remove nodeSelector/tolerations once new nodepool confirmed healthy - nodeSelector: - cloud.google.com/gke-ephemeral-storage-local-ssd: "true" - tolerations: - - key: "ephemeral-ssd-experiment" - operator: "Equal" - value: "true" - effect: "NoSchedule" # unit tests have no business requiring root or doing privileged operations securityContext: runAsUser: 2000 diff --git a/config/jobs/kubernetes/sig-testing/verify.yaml b/config/jobs/kubernetes/sig-testing/verify.yaml index 7d7d1f4abe07..09ac3009b309 100644 --- a/config/jobs/kubernetes/sig-testing/verify.yaml +++ b/config/jobs/kubernetes/sig-testing/verify.yaml @@ -64,14 +64,6 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" spec: - # TODO(https://github.com/kubernetes/k8s.io/issues/1187): remove nodeSelector/tolerations once new nodepool confirmed healthy - nodeSelector: - cloud.google.com/gke-ephemeral-storage-local-ssd: "true" - tolerations: - - key: "ephemeral-ssd-experiment" - operator: "Equal" - value: "true" - effect: "NoSchedule" containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20210928-2a55334641-go-canary imagePullPolicy: Always