Skip to content

Commit fa642b2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #862 from cpanato/update
Update GO to v1.19.7 and CAPI to v1.3.5
2 parents f1b8fb9 + ba1d3ce commit fa642b2

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.19.6@sha256:7ce31d15a3a4dbf20446cccffa4020d3a2974ad2287d96123f55caf22c7adb71 as builder
16+
FROM golang:1.19.7@sha256:5ba5ed13de753eb50daef1a750f78a1ec6ebd9fbb58b5a7a608efd5df7429c57 as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KIND) $(KUBECTL)
473473
./hack/install-cert-manager.sh
474474

475475
# Deploy CAPI
476-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
476+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
477477

478478
# Deploy CAPG
479479
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ settings = {
1818
"deploy_cert_manager": True,
1919
"preload_images_for_kind": True,
2020
"kind_cluster_name": "capg",
21-
"capi_version": "v1.3.1",
21+
"capi_version": "v1.3.5",
2222
"cert_manager_version": "v1.11.0",
2323
"kubernetes_version": "v1.25.5",
2424
}

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
k8s.io/component-base v0.25.5
2828
k8s.io/klog/v2 v2.80.1
2929
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
30-
sigs.k8s.io/cluster-api v1.3.1
31-
sigs.k8s.io/cluster-api/test v1.3.1
30+
sigs.k8s.io/cluster-api v1.3.5
31+
sigs.k8s.io/cluster-api/test v1.3.5
3232
sigs.k8s.io/controller-runtime v0.13.1
3333
)
3434

@@ -48,7 +48,7 @@ require (
4848
github.com/blang/semver/v4 v4.0.0 // indirect
4949
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5050
github.com/coredns/caddy v1.1.0 // indirect
51-
github.com/coredns/corefile-migration v1.0.18 // indirect
51+
github.com/coredns/corefile-migration v1.0.20 // indirect
5252
github.com/davecgh/go-spew v1.1.1 // indirect
5353
github.com/docker/distribution v2.8.1+incompatible // indirect
5454
github.com/docker/docker v20.10.21+incompatible // indirect
@@ -142,4 +142,4 @@ require (
142142
sigs.k8s.io/yaml v1.3.0 // indirect
143143
)
144144

145-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.1
145+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.5

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
135135
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
136136
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
137137
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
138-
github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
139-
github.com/coredns/corefile-migration v1.0.18/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
138+
github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI=
139+
github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
140140
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
141141
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
142142
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -1174,10 +1174,10 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
11741174
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
11751175
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11761176
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1177-
sigs.k8s.io/cluster-api v1.3.1 h1:sFd/ayOhQxd4YZX1qw8HC2xO7eKRBNRL+mlCKwdVhvY=
1178-
sigs.k8s.io/cluster-api v1.3.1/go.mod h1:ef5vvtp2PyhEHTYCw8niaVPlOX5Ntvrh+8oBZt0PJ08=
1179-
sigs.k8s.io/cluster-api/test v1.3.1 h1:5j0EJi58qgP6Ga9W0fI/T0rW+CeKPq1BoOg30Yx9zfI=
1180-
sigs.k8s.io/cluster-api/test v1.3.1/go.mod h1:aK8zSbF7gQyoM2FaPVFcE0o125feyRXVKlw03Ok+feA=
1177+
sigs.k8s.io/cluster-api v1.3.5 h1:Chg56Piv5ip0AFRN83H1I8uIn6qsdk+mr9hdq5Cxkf0=
1178+
sigs.k8s.io/cluster-api v1.3.5/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
1179+
sigs.k8s.io/cluster-api/test v1.3.5 h1:+uY+oMwIK5NOH1S/VPCl5gl9TuUBRRdr/qiji4r1B7I=
1180+
sigs.k8s.io/cluster-api/test v1.3.5/go.mod h1:oRc0fAaj3ZPMuV0GTRQbseZ6IrNyDUB8ReKil5lkAtw=
11811181
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
11821182
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
11831183
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎test/e2e/config/gcp-ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ providers:
1515
- name: cluster-api
1616
type: CoreProvider
1717
versions:
18-
- name: v1.3.1
19-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/core-components.yaml
18+
- name: v1.3.5
19+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml
2020
type: url
2121
files:
2222
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -28,8 +28,8 @@ providers:
2828
- name: kubeadm
2929
type: BootstrapProvider
3030
versions:
31-
- name: v1.3.1
32-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/bootstrap-components.yaml
31+
- name: v1.3.5
32+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml
3333
type: url
3434
files:
3535
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -41,8 +41,8 @@ providers:
4141
- name: kubeadm
4242
type: ControlPlaneProvider
4343
versions:
44-
- name: v1.3.1
45-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/control-plane-components.yaml
44+
- name: v1.3.5
45+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml
4646
type: url
4747
files:
4848
- sourcePath: "../data/shared/v1beta1/metadata.yaml"

0 commit comments

Comments
 (0)