Skip to content

Commit 5df4126

Browse files
authored
Merge pull request #1010 from jichenjc/update_e2e_container
🏃update e2e container to latest cluster-api
2 parents 1358f6e + bc3610d commit 5df4126

File tree

4 files changed

+75
-85
lines changed

4 files changed

+75
-85
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ e2e-image: docker-build
133133

134134
# Pull all the images references in test/e2e/data/e2e_conf.yaml
135135
test-e2e-image-prerequisites:
136-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.4.0
137-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.4.0
138-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.4.0
139-
docker pull quay.io/jetstack/cert-manager-cainjector:v1.1.0
140-
docker pull quay.io/jetstack/cert-manager-webhook:v1.1.0
141-
docker pull quay.io/jetstack/cert-manager-controller:v1.1.0
136+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v0.4.3
137+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v0.4.3
138+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v0.4.3
139+
docker pull quay.io/jetstack/cert-manager-cainjector:v1.5.0
140+
docker pull quay.io/jetstack/cert-manager-webhook:v1.5.0
141+
docker pull quay.io/jetstack/cert-manager-controller:v1.5.0
142142

143143
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
144144
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ require (
88
github.com/gophercloud/gophercloud v0.16.0
99
github.com/gophercloud/utils v0.0.0-20210323225332-7b186010c04f
1010
github.com/onsi/ginkgo v1.16.4
11-
github.com/onsi/gomega v1.14.0
11+
github.com/onsi/gomega v1.15.0
1212
github.com/pkg/errors v0.9.1
1313
github.com/prometheus/client_golang v1.11.0
1414
github.com/spf13/pflag v1.0.5
1515
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
1616
gopkg.in/ini.v1 v1.62.0
17-
k8s.io/api v0.21.3
18-
k8s.io/apimachinery v0.21.3
19-
k8s.io/client-go v0.21.3
20-
k8s.io/component-base v0.21.3
17+
k8s.io/api v0.21.4
18+
k8s.io/apimachinery v0.21.4
19+
k8s.io/client-go v0.21.4
20+
k8s.io/component-base v0.21.4
2121
k8s.io/klog/v2 v2.9.0
22-
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
23-
sigs.k8s.io/cluster-api v0.4.0
24-
sigs.k8s.io/cluster-api/test v0.4.1-0.20210713191401-bc94459d95c6
25-
sigs.k8s.io/controller-runtime v0.9.6
22+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
23+
sigs.k8s.io/cluster-api v0.4.3
24+
sigs.k8s.io/cluster-api/test v0.4.3
25+
sigs.k8s.io/controller-runtime v0.9.7
2626
sigs.k8s.io/yaml v1.2.0
2727
)
2828

29-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.0
29+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.3

0 commit comments

Comments
 (0)