From 2e8c1310e39178900bf4b7bac40e376d7a05465d Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Wed, 25 Sep 2024 18:18:51 +0300 Subject: [PATCH] Bump CAPRKE2 to v0.7.0 (#752) Signed-off-by: Furkat Gofurov --- exp/etcdrestore/go.mod | 4 ++-- exp/etcdrestore/go.sum | 8 ++++---- internal/controllers/clusterctl/config.yaml | 4 ++-- scripts/turtles-dev.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/exp/etcdrestore/go.mod b/exp/etcdrestore/go.mod index f01f154d..f63720c9 100644 --- a/exp/etcdrestore/go.mod +++ b/exp/etcdrestore/go.mod @@ -5,9 +5,9 @@ go 1.22.0 replace github.com/rancher/turtles => ../.. require ( - github.com/onsi/ginkgo/v2 v2.20.0 + github.com/onsi/ginkgo/v2 v2.20.1 github.com/onsi/gomega v1.34.1 - github.com/rancher/cluster-api-provider-rke2 v0.6.1 + github.com/rancher/cluster-api-provider-rke2 v0.7.0 github.com/rancher/turtles v0.0.0-00010101000000-000000000000 github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace k8s.io/api v0.29.4 diff --git a/exp/etcdrestore/go.sum b/exp/etcdrestore/go.sum index a02b83c2..7de671e3 100644 --- a/exp/etcdrestore/go.sum +++ b/exp/etcdrestore/go.sum @@ -122,8 +122,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= -github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -141,8 +141,8 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rancher/cluster-api-provider-rke2 v0.6.1 h1:P4Rv8HofPfutuL0q5fJ26LRSL0EPcMeBiyAsiElNQfU= -github.com/rancher/cluster-api-provider-rke2 v0.6.1/go.mod h1:V4jxqD4v1xQFSbgk57IECmXS4Y2DPyhrUDAsg/p75+k= +github.com/rancher/cluster-api-provider-rke2 v0.7.0 h1:Src5ucHhy7l0m4y0ZAjRg7eZzrsrZQDM/vwnMYVDc3g= +github.com/rancher/cluster-api-provider-rke2 v0.7.0/go.mod h1:R3s8FmcmPbdD/jQGR4oqoYj7PGlVIPBhkMlJfyVgdx0= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= diff --git a/internal/controllers/clusterctl/config.yaml b/internal/controllers/clusterctl/config.yaml index a0c51ecd..e89f0d0e 100644 --- a/internal/controllers/clusterctl/config.yaml +++ b/internal/controllers/clusterctl/config.yaml @@ -32,7 +32,7 @@ data: url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.3/bootstrap-components.yaml" type: "BootstrapProvider" - name: "rke2" - url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.6.1/bootstrap-components.yaml" + url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/bootstrap-components.yaml" type: "BootstrapProvider" # ControlPlane providers @@ -40,7 +40,7 @@ data: url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.3/control-plane-components.yaml" type: "ControlPlaneProvider" - name: "rke2" - url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.6.1/control-plane-components.yaml" + url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/control-plane-components.yaml" type: "ControlPlaneProvider" # Addon providers diff --git a/scripts/turtles-dev.sh b/scripts/turtles-dev.sh index ee08e1a8..9e242de3 100755 --- a/scripts/turtles-dev.sh +++ b/scripts/turtles-dev.sh @@ -45,8 +45,8 @@ helm install capi-operator capi-operator/cluster-api-operator \ --create-namespace -n capi-operator-system \ --set infrastructure=docker:v1.7.3 \ --set core=cluster-api:v1.7.3 \ - --set controlPlane=rke2:v0.6.1 \ - --set bootstrap=rke2:v0.6.1 \ + --set controlPlane=rke2:v0.7.0 \ + --set bootstrap=rke2:v0.7.0 \ --timeout 90s --wait kubectl rollout status deployment capi-operator-cluster-api-operator -n capi-operator-system --timeout=180s