From a7999ef663f0edc6c06b47d99b341bd781c3b886 Mon Sep 17 00:00:00 2001 From: Patryk Przekwas Date: Thu, 3 Aug 2023 11:13:03 +0200 Subject: [PATCH] Revert "kinder: use eks cluster in test-infra jobs" This reverts commit e47366886e79972fa4e825e754219cda8546c08a. --- .../templates/testinfra/kubeadm-kinder-addons.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-discovery.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-dryrun.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-external-ca.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-external-etcd.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-kubelet-x-on-y.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-learner-mode.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-patches.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-rootless.yaml | 2 +- .../kubeadm-kinder-upgrade-addons-before-controlplane.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-upgrade.yaml | 2 +- .../templates/testinfra/kubeadm-kinder-x-on-y.yaml | 2 +- .../update-workflows/templates/testinfra/kubeadm-kinder.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-addons.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-addons.yaml index 357d140d..95123be6 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-addons.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-addons.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-no-addons-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: 12h decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-discovery.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-discovery.yaml index 53fb2e28..ac4ae2c0 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-discovery.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-discovery.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-discovery-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-dryrun.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-dryrun.yaml index 7ad04d01..af8205d4 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-dryrun.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-dryrun.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-dryrun-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-ca.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-ca.yaml index 2400de76..5715940b 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-ca.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-ca.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-external-ca-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-etcd.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-etcd.yaml index a6a907a1..4122ebc8 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-etcd.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-external-etcd.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-external-etcd-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-kubelet-x-on-y.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-kubelet-x-on-y.yaml index 0729e089..a827ad11 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-kubelet-x-on-y.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-kubelet-x-on-y.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-kubelet-{{ dashVer .KubeletVersion }}-on-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml index 5ecd4a2b..8f032073 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-learner-mode.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-learner-mode-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-patches.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-patches.yaml index dc3f2ae2..9b9cca8d 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-patches.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-patches.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-patches-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-rootless.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-rootless.yaml index 02f5ee85..370fd716 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-rootless.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-rootless.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-rootless-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade-addons-before-controlplane.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade-addons-before-controlplane.yaml index 57f32d00..76a0fd79 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade-addons-before-controlplane.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade-addons-before-controlplane.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-upgrade-addons-before-controlplane-{{ dashVer .InitVersion }}-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade.yaml index c2cb107c..d4fb92eb 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-upgrade.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-upgrade-{{ dashVer .InitVersion }}-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-x-on-y.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-x-on-y.yaml index cc217a75..ebe68472 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-x-on-y.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder-x-on-y.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-{{ dashVer .KubeadmVersion }}-on-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: diff --git a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder.yaml b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder.yaml index ec57db29..0352996a 100644 --- a/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder.yaml +++ b/kinder/ci/tools/update-workflows/templates/testinfra/kubeadm-kinder.yaml @@ -1,5 +1,5 @@ - name: ci-kubernetes-e2e-kubeadm-kinder-{{ dashVer .KubernetesVersion }} - cluster: eks-prow-build-cluster + cluster: k8s-infra-prow-build interval: {{ .JobInterval }} decorate: true labels: