Skip to content

Commit 4c8467e

Browse files
cpanatocpanato
authored
Update CAPI, dockerfile and k8s deps (#497)
* update golang to v1.19.10 Signed-off-by: cpanato <ctadeu@gmail.com> * update capi to v1.3.8 Signed-off-by: cpanato <ctadeu@gmail.com> * update k8s deps to latest of v0.25.x Signed-off-by: cpanato <ctadeu@gmail.com> --------- Signed-off-by: cpanato <ctadeu@gmail.com>
1 parent 3559318 commit 4c8467e

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
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.8@sha256:9f2dd04486e84eec72d945b077d568976981d9afed8b4e2aeb08f7ab739292b3 as builder
16+
FROM golang:1.19.10@sha256:83f9f840072d05ad4d90ce4ac7cb2427632d6b89d5ffc558f18f9577ec8188c0 as builder
1717
WORKDIR /workspace
1818

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

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
303303
.PHONY: docker-pull-prerequisites
304304
docker-pull-prerequisites:
305305
docker pull docker/dockerfile:1.1-experimental
306-
docker pull docker.io/library/golang:1.19.6
306+
docker pull docker.io/library/golang:1.19.10
307307
docker pull gcr.io/distroless/static:latest
308308

309309
.PHONY: docker-build
@@ -391,7 +391,7 @@ release-binary: $(RELEASE_DIR)
391391
-e GOARCH=$(GOARCH) \
392392
-v "$$(pwd):/workspace" \
393393
-w /workspace \
394-
golang:1.19.6 \
394+
golang:1.19.10 \
395395
go build -a -trimpath -ldflags '-extldflags "-static"' \
396396
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)
397397

@@ -437,7 +437,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
437437
./hack/install-cert-manager.sh
438438

439439
# Deploy CAPI
440-
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 -
440+
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 -
441441

442442
# Deploy CAPDO
443443
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo

‎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": "capdo",
19-
"capi_version": "v1.3.7",
19+
"capi_version": "v1.3.8",
2020
"cert_manager_version": "v1.10.1",
2121
"kubernetes_version": "v1.25.5",
2222
}

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ require (
1212
github.com/pkg/errors v0.9.1
1313
github.com/spf13/pflag v1.0.5
1414
golang.org/x/oauth2 v0.8.0
15-
k8s.io/api v0.25.5
16-
k8s.io/apimachinery v0.25.5
17-
k8s.io/client-go v0.25.5
15+
k8s.io/api v0.25.10
16+
k8s.io/apimachinery v0.25.10
17+
k8s.io/client-go v0.25.10
1818
k8s.io/klog/v2 v2.80.1
1919
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
20-
sigs.k8s.io/cluster-api v1.3.7
21-
sigs.k8s.io/cluster-api/test v1.3.7
20+
sigs.k8s.io/cluster-api v1.3.8
21+
sigs.k8s.io/cluster-api/test v1.3.8
2222
sigs.k8s.io/controller-runtime v0.13.1
2323
)
2424

@@ -39,7 +39,7 @@ require (
3939
github.com/coredns/caddy v1.1.0 // indirect
4040
github.com/coredns/corefile-migration v1.0.20 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/docker/distribution v2.8.1+incompatible // indirect
42+
github.com/docker/distribution v2.8.2+incompatible // indirect
4343
github.com/docker/docker v20.10.24+incompatible // indirect
4444
github.com/docker/go-connections v0.4.0 // indirect
4545
github.com/docker/go-units v0.4.0 // indirect
@@ -126,4 +126,4 @@ require (
126126
sigs.k8s.io/yaml v1.3.0 // indirect
127127
)
128128

129-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.7
129+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.8

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
115115
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
116116
github.com/digitalocean/godo v1.99.0 h1:gUHO7n9bDaZFWvbzOum4bXE0/09ZuYA9yA8idQHX57E=
117117
github.com/digitalocean/godo v1.99.0/go.mod h1:SsS2oXo2rznfM/nORlZ/6JaUJZFhmKTib1YhopUc8NA=
118-
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
119-
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
118+
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
119+
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
120120
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
121121
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
122122
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -928,16 +928,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
928928
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
929929
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
930930
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
931-
k8s.io/api v0.25.5 h1:mqyHf7aoaYMpdvO87mqpol+Qnsmo+y09S0PMIXwiZKo=
932-
k8s.io/api v0.25.5/go.mod h1:RzplZX0Z8rV/WhSTfEvnyd91bBhBQTRWo85qBQwRmb8=
931+
k8s.io/api v0.25.10 h1:YfcmWMKDnWpzKV2byP+fu0v00yNTS4+cqw4g0ndUsJA=
932+
k8s.io/api v0.25.10/go.mod h1:7inWacs1rgsi5uLOONfUmo4on+tVkkuJZNsMLouGAhA=
933933
k8s.io/apiextensions-apiserver v0.25.0 h1:CJ9zlyXAbq0FIW8CD7HHyozCMBpDSiH7EdrSTCZcZFY=
934934
k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E=
935-
k8s.io/apimachinery v0.25.5 h1:SQomYHvv+aO43qdu3QKRf9YuI0oI8w3RrOQ1qPbAUGY=
936-
k8s.io/apimachinery v0.25.5/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
935+
k8s.io/apimachinery v0.25.10 h1:uvPXar0BVg9g2R5a5kTjMuHCjLxC5LiAclSrLOP8Q20=
936+
k8s.io/apimachinery v0.25.10/go.mod h1:PJ+6cm50BMETqCCJx1RXQIXaq937SUdAq2vVKCGDZXU=
937937
k8s.io/apiserver v0.25.0 h1:8kl2ifbNffD440MyvHtPaIz1mw4mGKVgWqM0nL+oyu4=
938938
k8s.io/apiserver v0.25.0/go.mod h1:BKwsE+PTC+aZK+6OJQDPr0v6uS91/HWxX7evElAH6xo=
939-
k8s.io/client-go v0.25.5 h1:7QWVK0Ph4bLn0UwotPTc2FTgm8shreQXyvXnnHDd8rE=
940-
k8s.io/client-go v0.25.5/go.mod h1:bOeoaUUdpyz3WDFGo+Xm3nOQFh2KuYXRDwrvbAPtFQA=
939+
k8s.io/client-go v0.25.10 h1:FhTgEpCDboGjByXnoEj/kiHK12SC+fjRMrkNKn72/aU=
940+
k8s.io/client-go v0.25.10/go.mod h1:zqpG8XvdsDK7q/Dh83v2M3LgTVj8sAbT3BT0JnANjME=
941941
k8s.io/cluster-bootstrap v0.25.0 h1:KJ2/r0dV+bLfTK5EBobAVKvjGel3N4Qqh3bvnzh9qPk=
942942
k8s.io/cluster-bootstrap v0.25.0/go.mod h1:x/TCtY3EiuR/rODkA3SvVQT3uSssQLf9cXcmSjdDTe0=
943943
k8s.io/component-base v0.25.0 h1:haVKlLkPCFZhkcqB6WCvpVxftrg6+FK5x1ZuaIDaQ5Y=
@@ -952,10 +952,10 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
952952
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
953953
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
954954
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
955-
sigs.k8s.io/cluster-api v1.3.7 h1:SqVOfGtwmSH2ryuhxruWD6r31PN5UDYBcnAbQCHrC9c=
956-
sigs.k8s.io/cluster-api v1.3.7/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
957-
sigs.k8s.io/cluster-api/test v1.3.7 h1:RI9m/qNvILItKTQSWaFL6TPcZcg3Wbu+Iuz3m5JCshU=
958-
sigs.k8s.io/cluster-api/test v1.3.7/go.mod h1:RwkAw4bkNW0s+AhRokbgEPWGbdN5VxdmOsLNQeuZCoU=
955+
sigs.k8s.io/cluster-api v1.3.8 h1:aBNsoPbU86oWQVWRO2ekHvYUe7NQ1qD4TFL42Xn1PC4=
956+
sigs.k8s.io/cluster-api v1.3.8/go.mod h1:AAgtyudmqHMp95hS4l1jb+IzFFdhiCmyUYyO9wVUKu0=
957+
sigs.k8s.io/cluster-api/test v1.3.8 h1:GpwQf2i+pOnSTZf70TjG0RmblcqHkMXwy8OJP3+x3Cw=
958+
sigs.k8s.io/cluster-api/test v1.3.8/go.mod h1:mq+w7KLwwbWxsIrY1dTmRn2WokLGDqylQyJ/O9AUb8w=
959959
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
960960
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
961961
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.3.7
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/core-components.yaml
10+
- name: v1.3.8
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.3.7
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/bootstrap-components.yaml
23+
- name: v1.3.8
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.3.7
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/control-plane-components.yaml
36+
- name: v1.3.8
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"

‎test/e2e/config/digitalocean-dev.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.3.7
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/core-components.yaml
10+
- name: v1.3.8
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.3.7
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/bootstrap-components.yaml
23+
- name: v1.3.8
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.3.7
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.7/control-plane-components.yaml
36+
- name: v1.3.8
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.8/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"

0 commit comments

Comments
 (0)