Skip to content

Commit

Permalink
update CAPI to v1.3.8
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <[email protected]>
  • Loading branch information
cpanato committed Jun 7, 2023
1 parent a3d45ec commit 234dbf4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KIND) $(KUBECTL)
./hack/install-cert-manager.sh

# Deploy CAPI
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -

# Deploy CAPG
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capg",
"capi_version": "v1.3.7",
"capi_version": "v1.3.8",
"cert_manager_version": "v1.11.0",
"kubernetes_version": "v1.25.10",
}
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ require (
k8s.io/component-base v0.25.10
k8s.io/klog/v2 v2.80.1
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
sigs.k8s.io/cluster-api v1.3.7
sigs.k8s.io/cluster-api/test v1.3.7
sigs.k8s.io/cluster-api v1.3.8
sigs.k8s.io/cluster-api/test v1.3.8
sigs.k8s.io/controller-runtime v0.13.1
)

Expand All @@ -50,7 +50,7 @@ require (
github.com/coredns/caddy v1.1.0 // indirect
github.com/coredns/corefile-migration v1.0.20 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
Expand Down Expand Up @@ -145,4 +145,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.7
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.8
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
Expand Down Expand Up @@ -1013,10 +1013,10 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/cluster-api v1.3.7 h1:SqVOfGtwmSH2ryuhxruWD6r31PN5UDYBcnAbQCHrC9c=
sigs.k8s.io/cluster-api v1.3.7/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
sigs.k8s.io/cluster-api/test v1.3.7 h1:RI9m/qNvILItKTQSWaFL6TPcZcg3Wbu+Iuz3m5JCshU=
sigs.k8s.io/cluster-api/test v1.3.7/go.mod h1:RwkAw4bkNW0s+AhRokbgEPWGbdN5VxdmOsLNQeuZCoU=
sigs.k8s.io/cluster-api v1.3.8 h1:aBNsoPbU86oWQVWRO2ekHvYUe7NQ1qD4TFL42Xn1PC4=
sigs.k8s.io/cluster-api v1.3.8/go.mod h1:AAgtyudmqHMp95hS4l1jb+IzFFdhiCmyUYyO9wVUKu0=
sigs.k8s.io/cluster-api/test v1.3.8 h1:GpwQf2i+pOnSTZf70TjG0RmblcqHkMXwy8OJP3+x3Cw=
sigs.k8s.io/cluster-api/test v1.3.8/go.mod h1:mq+w7KLwwbWxsIrY1dTmRn2WokLGDqylQyJ/O9AUb8w=
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/gcp-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.3.7
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/core-components.yaml
- name: v1.3.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/core-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
Expand All @@ -28,8 +28,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.3.7
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/bootstrap-components.yaml
- name: v1.3.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/bootstrap-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
Expand All @@ -41,8 +41,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.3.7
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/control-plane-components.yaml
- name: v1.3.8
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/control-plane-components.yaml
type: url
files:
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
Expand Down

0 comments on commit 234dbf4

Please sign in to comment.