Skip to content

Commit 7a0f33b

Browse files
author
Cecile Robert-Michon
committed
Update CAPI build to 20210608
1 parent 745c25e commit 7a0f33b

File tree

6 files changed

+95
-152
lines changed

6 files changed

+95
-152
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
462462

463463
# Deploy CAPI
464464
# Using cluster-api nightly build until 0.4.x is released.
465-
curl --retry $(CURL_RETRIES) -sSL https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210526/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
465+
curl --retry $(CURL_RETRIES) -sSL https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_master_20210607/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
466466

467467
# Deploy CAPZ
468468
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ settings = {
1616
"deploy_cert_manager": True,
1717
"preload_images_for_kind": True,
1818
"kind_cluster_name": "capz",
19-
"capi_version": "nightly_master_20210526",
19+
"capi_version": "nightly_master_20210607",
2020
"cert_manager_version": "v1.1.0",
2121
"kubernetes_version": "v1.19.7",
2222
"aks_kubernetes_version": "v1.20.5"

go.mod

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ require (
2020
github.com/google/uuid v1.1.2
2121
github.com/hashicorp/go-retryablehttp v0.6.8
2222
github.com/hashicorp/golang-lru v0.5.4
23-
github.com/onsi/ginkgo v1.16.1
24-
github.com/onsi/gomega v1.11.0
23+
github.com/onsi/ginkgo v1.16.4
24+
github.com/onsi/gomega v1.13.0
2525
github.com/pkg/errors v0.9.1
26-
github.com/prometheus/client_golang v1.9.0
26+
github.com/prometheus/client_golang v1.11.0
2727
github.com/spf13/pflag v1.0.5
2828
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.13.0
2929
go.opentelemetry.io/otel v0.13.0
@@ -35,10 +35,13 @@ require (
3535
k8s.io/apimachinery v0.21.1
3636
k8s.io/client-go v0.21.1
3737
k8s.io/component-base v0.21.1
38-
k8s.io/klog/v2 v2.8.0
38+
k8s.io/klog/v2 v2.9.0
3939
k8s.io/kubectl v0.21.1
40-
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
41-
sigs.k8s.io/cluster-api v0.0.0-20210526191338-0e1629b75111
42-
sigs.k8s.io/controller-runtime v0.9.0-beta.5
43-
sigs.k8s.io/kind v0.11.0
40+
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
41+
sigs.k8s.io/cluster-api v0.0.0-20210608170333-19d791f38b29
42+
sigs.k8s.io/cluster-api/test v0.0.0-20210608170333-19d791f38b29
43+
sigs.k8s.io/controller-runtime v0.9.0
44+
sigs.k8s.io/kind v0.11.1
4445
)
46+
47+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.0.0-20210608170333-19d791f38b29

0 commit comments

Comments
 (0)