Skip to content

Commit

Permalink
test/e2e bump capi
Browse files Browse the repository at this point in the history
  • Loading branch information
chrischdi committed Jul 5, 2023
1 parent 1d43cca commit c06eea0
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions test/e2e/config/vsphere-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
# For creating local images, run ./hack/e2e.sh

images:
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.1
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.1
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.1
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
loadBehavior: mustLoad
- name: quay.io/jetstack/cert-manager-cainjector:v1.11.0
- name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-webhook:v1.11.0
- name: quay.io/jetstack/cert-manager-webhook:v1.12.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.11.0
- name: quay.io/jetstack/cert-manager-controller:v1.12.2
loadBehavior: tryLoad

providers:
Expand All @@ -37,9 +37,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/core-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -60,9 +60,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/bootstrap-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -83,9 +83,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
24 changes: 12 additions & 12 deletions test/e2e/config/vsphere-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
# - from the CAPV repository root, `make e2e` to build the vsphere provider image and run e2e tests.

images:
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.1
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.1
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.1
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-beta.0
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
loadBehavior: mustLoad
- name: quay.io/jetstack/cert-manager-cainjector:v1.11.0
- name: quay.io/jetstack/cert-manager-cainjector:v1.12.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-webhook:v1.11.0
- name: quay.io/jetstack/cert-manager-webhook:v1.12.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.11.0
- name: quay.io/jetstack/cert-manager-controller:v1.12.2
loadBehavior: tryLoad

providers:
Expand All @@ -40,9 +40,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/core-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -63,9 +63,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/bootstrap-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/bootstrap-components.yaml"
type: "url"
contract: "v1beta1"
files:
Expand All @@ -86,9 +86,9 @@ providers:
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- name: v1.4.1
- name: v1.5.0-beta.0
# Use manifest from source files
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.1/control-plane-components.yaml"
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-beta.0/control-plane-components.yaml"
type: "url"
files:
- sourcePath: "../data/shared/metadata.yaml"
Expand Down

0 comments on commit c06eea0

Please sign in to comment.