Merge pull request #33018 from damdo/capa-bump-e2e-version

Bump CAPA to use k8s 1.30
kubernetes · Jul 18, 2024 · 2777208 · 2777208
2 parents 24b5469 + 0d89812
commit 2777208
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-periodics.yaml
@@ -18,7 +18,7 @@ periodics:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e.sh"
@@ -63,7 +63,7 @@ periodics:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e.sh"
@@ -107,7 +107,7 @@ periodics:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e-eks.sh"
@@ -149,7 +149,7 @@ periodics:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-conformance.sh"
@@ -203,7 +203,7 @@ periodics:
  path_alias: k8s.io/kubernetes
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  env:
  - name: BOSKOS_HOST
  value: "boskos.test-pods.svc.cluster.local"
@@ -250,7 +250,7 @@ periodics:
  path_alias: k8s.io/test-infra
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - runner.sh
  - bash

diff --git a/...g/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-postsubmits.yaml b/...g/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-postsubmits.yaml
@@ -18,7 +18,7 @@ postsubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e.sh"
@@ -62,7 +62,7 @@ postsubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e-eks.sh"
@@ -104,7 +104,7 @@ postsubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-conformance.sh"

diff --git a/...ig/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml b/...ig/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml
@@ -11,7 +11,7 @@ presubmits:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "./scripts/ci-test.sh"
  resources:
@@ -40,7 +40,7 @@ presubmits:
  - command:
  - runner.sh
  - ./scripts/ci-apidiff.sh
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  resources:
  requests:
  cpu: 7300m
@@ -59,7 +59,7 @@ presubmits:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "./scripts/ci-build.sh"
  resources:
@@ -83,7 +83,7 @@ presubmits:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - runner.sh
  args:
@@ -112,7 +112,7 @@ presubmits:
  path_alias: "sigs.k8s.io/cluster-api-provider-aws"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "make"
@@ -162,7 +162,7 @@ presubmits:
  path_alias: k8s.io/kubernetes
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-conformance.sh"
@@ -208,7 +208,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-conformance.sh"
@@ -253,7 +253,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e.sh"
@@ -300,7 +300,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e.sh"
@@ -342,7 +342,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e-eks.sh"
@@ -384,7 +384,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e-eks-gc.sh"
@@ -426,7 +426,7 @@ presubmits:
  preset-aws-credential: "true"
  spec:
  containers:
- - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.29
+ - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-1.30
  command:
  - "runner.sh"
  - "./scripts/ci-e2e-eks.sh"