Merge pull request #29580 from BenTheElder/revert-dra

Revert "dra: lock down KinD to v0.19.0", use standard base image
kubernetes · May 23, 2023 · c480e22 · c480e22
2 parents 0907d48 + 4d61d17
commit c480e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/config/jobs/kubernetes/sig-node/dynamic-resource-allocation.yaml b/config/jobs/kubernetes/sig-node/dynamic-resource-allocation.yaml
@@ -27,9 +27,8 @@ periodics:
         - -xc
         - >
           make WHAT="github.com/onsi/ginkgo/v2/ginkgo k8s.io/kubernetes/test/e2e/e2e.test" &&
-          curl -sSL --output "${PATH%%:*}/kind" https://github.com/kubernetes-sigs/kind/releases/download/v0.19.0/kind-linux-amd64 &&
-          chmod u+x "${PATH%%:*}/kind" &&
-          kind build node-image --base-image gcr.io/k8s-staging-kind/base:v20230515-01914134-containerd_v1.7.1@sha256:468fc430a6848884b786c5cd2f1c03e7a0977f04fb129a2cda2a19ec986ddacb --image dra/node:latest &&
+          curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" kind &&
+          kind build node-image --image=dra/node:latest . &&
           trap 'kind export logs "${ARTIFACTS}/kind"; kind delete cluster' EXIT &&
           kind create cluster --retain --config test/e2e/dra/kind.yaml --image dra/node:latest &&
           KUBERNETES_PROVIDER=local KUBECONFIG=${HOME}/.kube/config GINKGO_PARALLEL_NODES=8 E2E_REPORT_DIR=${ARTIFACTS} hack/ginkgo-e2e.sh -ginkgo.focus=DynamicResourceAllocation

diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
@@ -1218,9 +1218,8 @@ presubmits:
         - -xc
         - >
           make WHAT="github.com/onsi/ginkgo/v2/ginkgo k8s.io/kubernetes/test/e2e/e2e.test" &&
-          curl -sSL --output "${PATH%%:*}/kind" https://github.com/kubernetes-sigs/kind/releases/download/v0.19.0/kind-linux-amd64 &&
-          chmod u+x "${PATH%%:*}/kind" &&
-          kind build node-image --base-image gcr.io/k8s-staging-kind/base:v20230515-01914134-containerd_v1.7.1@sha256:468fc430a6848884b786c5cd2f1c03e7a0977f04fb129a2cda2a19ec986ddacb --image dra/node:latest &&
+          curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" kind &&
+          kind build node-image --image=dra/node:latest . &&
           trap 'kind export logs "${ARTIFACTS}/kind"; kind delete cluster' EXIT &&
           kind create cluster --retain --config test/e2e/dra/kind.yaml --image dra/node:latest &&
           KUBERNETES_PROVIDER=local KUBECONFIG=${HOME}/.kube/config GINKGO_PARALLEL_NODES=8 E2E_REPORT_DIR=${ARTIFACTS} hack/ginkgo-e2e.sh -ginkgo.focus=DynamicResourceAllocation