From 4c8467efe576c9e29bad996d4e94724d7f4dcded Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Thu, 8 Jun 2023 08:00:12 +0200 Subject: [PATCH] Update CAPI, dockerfile and k8s deps (#497) * update golang to v1.19.10 Signed-off-by: cpanato * update capi to v1.3.8 Signed-off-by: cpanato * update k8s deps to latest of v0.25.x Signed-off-by: cpanato --------- Signed-off-by: cpanato --- Dockerfile | 2 +- Makefile | 6 +++--- Tiltfile | 2 +- go.mod | 14 +++++++------- go.sum | 24 ++++++++++++------------ test/e2e/config/digitalocean-ci.yaml | 12 ++++++------ test/e2e/config/digitalocean-dev.yaml | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index c71f7bd59..199481dd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.19.8@sha256:9f2dd04486e84eec72d945b077d568976981d9afed8b4e2aeb08f7ab739292b3 as builder +FROM golang:1.19.10@sha256:83f9f840072d05ad4d90ce4ac7cb2427632d6b89d5ffc558f18f9577ec8188c0 as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy diff --git a/Makefile b/Makefile index 1513b5e36..404f64d5b 100644 --- a/Makefile +++ b/Makefile @@ -303,7 +303,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. .PHONY: docker-pull-prerequisites docker-pull-prerequisites: docker pull docker/dockerfile:1.1-experimental - docker pull docker.io/library/golang:1.19.6 + docker pull docker.io/library/golang:1.19.10 docker pull gcr.io/distroless/static:latest .PHONY: docker-build @@ -391,7 +391,7 @@ release-binary: $(RELEASE_DIR) -e GOARCH=$(GOARCH) \ -v "$$(pwd):/workspace" \ -w /workspace \ - golang:1.19.6 \ + golang:1.19.10 \ go build -a -trimpath -ldflags '-extldflags "-static"' \ -o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY) @@ -437,7 +437,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) ./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 CAPDO kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo diff --git a/Tiltfile b/Tiltfile index 191a7cc86..8aaf7c8e8 100644 --- a/Tiltfile +++ b/Tiltfile @@ -16,7 +16,7 @@ settings = { "deploy_cert_manager": True, "preload_images_for_kind": True, "kind_cluster_name": "capdo", - "capi_version": "v1.3.7", + "capi_version": "v1.3.8", "cert_manager_version": "v1.10.1", "kubernetes_version": "v1.25.5", } diff --git a/go.mod b/go.mod index a233b0061..90695cd3e 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,13 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/pflag v1.0.5 golang.org/x/oauth2 v0.8.0 - k8s.io/api v0.25.5 - k8s.io/apimachinery v0.25.5 - k8s.io/client-go v0.25.5 + k8s.io/api v0.25.10 + k8s.io/apimachinery v0.25.10 + k8s.io/client-go 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 ) @@ -39,7 +39,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 @@ -126,4 +126,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 diff --git a/go.sum b/go.sum index 8ae90f2e9..b62ca1a87 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.99.0 h1:gUHO7n9bDaZFWvbzOum4bXE0/09ZuYA9yA8idQHX57E= github.com/digitalocean/godo v1.99.0/go.mod h1:SsS2oXo2rznfM/nORlZ/6JaUJZFhmKTib1YhopUc8NA= -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= @@ -928,16 +928,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.5 h1:mqyHf7aoaYMpdvO87mqpol+Qnsmo+y09S0PMIXwiZKo= -k8s.io/api v0.25.5/go.mod h1:RzplZX0Z8rV/WhSTfEvnyd91bBhBQTRWo85qBQwRmb8= +k8s.io/api v0.25.10 h1:YfcmWMKDnWpzKV2byP+fu0v00yNTS4+cqw4g0ndUsJA= +k8s.io/api v0.25.10/go.mod h1:7inWacs1rgsi5uLOONfUmo4on+tVkkuJZNsMLouGAhA= k8s.io/apiextensions-apiserver v0.25.0 h1:CJ9zlyXAbq0FIW8CD7HHyozCMBpDSiH7EdrSTCZcZFY= k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E= -k8s.io/apimachinery v0.25.5 h1:SQomYHvv+aO43qdu3QKRf9YuI0oI8w3RrOQ1qPbAUGY= -k8s.io/apimachinery v0.25.5/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4= +k8s.io/apimachinery v0.25.10 h1:uvPXar0BVg9g2R5a5kTjMuHCjLxC5LiAclSrLOP8Q20= +k8s.io/apimachinery v0.25.10/go.mod h1:PJ+6cm50BMETqCCJx1RXQIXaq937SUdAq2vVKCGDZXU= k8s.io/apiserver v0.25.0 h1:8kl2ifbNffD440MyvHtPaIz1mw4mGKVgWqM0nL+oyu4= k8s.io/apiserver v0.25.0/go.mod h1:BKwsE+PTC+aZK+6OJQDPr0v6uS91/HWxX7evElAH6xo= -k8s.io/client-go v0.25.5 h1:7QWVK0Ph4bLn0UwotPTc2FTgm8shreQXyvXnnHDd8rE= -k8s.io/client-go v0.25.5/go.mod h1:bOeoaUUdpyz3WDFGo+Xm3nOQFh2KuYXRDwrvbAPtFQA= +k8s.io/client-go v0.25.10 h1:FhTgEpCDboGjByXnoEj/kiHK12SC+fjRMrkNKn72/aU= +k8s.io/client-go v0.25.10/go.mod h1:zqpG8XvdsDK7q/Dh83v2M3LgTVj8sAbT3BT0JnANjME= k8s.io/cluster-bootstrap v0.25.0 h1:KJ2/r0dV+bLfTK5EBobAVKvjGel3N4Qqh3bvnzh9qPk= k8s.io/cluster-bootstrap v0.25.0/go.mod h1:x/TCtY3EiuR/rODkA3SvVQT3uSssQLf9cXcmSjdDTe0= 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/ 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= diff --git a/test/e2e/config/digitalocean-ci.yaml b/test/e2e/config/digitalocean-ci.yaml index 29ec02283..bc5367273 100644 --- a/test/e2e/config/digitalocean-ci.yaml +++ b/test/e2e/config/digitalocean-ci.yaml @@ -7,8 +7,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml" @@ -20,8 +20,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml" @@ -33,8 +33,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml" diff --git a/test/e2e/config/digitalocean-dev.yaml b/test/e2e/config/digitalocean-dev.yaml index b0f8fc425..07ad11bf1 100644 --- a/test/e2e/config/digitalocean-dev.yaml +++ b/test/e2e/config/digitalocean-dev.yaml @@ -7,8 +7,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml" @@ -20,8 +20,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml" @@ -33,8 +33,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: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"