diff --git a/exp/etcdrestore/go.mod b/exp/etcdrestore/go.mod index 224f68f2..7fc9733b 100644 --- a/exp/etcdrestore/go.mod +++ b/exp/etcdrestore/go.mod @@ -7,7 +7,7 @@ replace github.com/rancher/turtles => ../.. require ( github.com/onsi/ginkgo/v2 v2.20.1 github.com/onsi/gomega v1.34.2 - github.com/rancher/cluster-api-provider-rke2 v0.7.0 + github.com/rancher/cluster-api-provider-rke2 v0.8.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.9 diff --git a/exp/etcdrestore/go.sum b/exp/etcdrestore/go.sum index d8ddd348..6918ba55 100644 --- a/exp/etcdrestore/go.sum +++ b/exp/etcdrestore/go.sum @@ -138,8 +138,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.7.0 h1:Src5ucHhy7l0m4y0ZAjRg7eZzrsrZQDM/vwnMYVDc3g= -github.com/rancher/cluster-api-provider-rke2 v0.7.0/go.mod h1:R3s8FmcmPbdD/jQGR4oqoYj7PGlVIPBhkMlJfyVgdx0= +github.com/rancher/cluster-api-provider-rke2 v0.8.0 h1:MNdprEzj7fJ3NOtsrDYitv4xq/OeCvli6GqefU3Ylg8= +github.com/rancher/cluster-api-provider-rke2 v0.8.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 abd1d853..ee8c2a09 100644 --- a/internal/controllers/clusterctl/config.yaml +++ b/internal/controllers/clusterctl/config.yaml @@ -36,7 +36,7 @@ data: url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.7/bootstrap-components.yaml" type: "BootstrapProvider" - name: "rke2" - url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/bootstrap-components.yaml" + url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.8.0/bootstrap-components.yaml" type: "BootstrapProvider" # ControlPlane providers @@ -44,7 +44,7 @@ data: url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.7/control-plane-components.yaml" type: "ControlPlaneProvider" - name: "rke2" - url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/control-plane-components.yaml" + url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.8.0/control-plane-components.yaml" type: "ControlPlaneProvider" # Addon providers diff --git a/scripts/turtles-dev.sh b/scripts/turtles-dev.sh index c72eca21..8f3286d5 100755 --- a/scripts/turtles-dev.sh +++ b/scripts/turtles-dev.sh @@ -46,12 +46,12 @@ export EXP_CLUSTER_RESOURCE_SET=true export CLUSTER_TOPOLOGY=true helm install capi-operator capi-operator/cluster-api-operator \ - --create-namespace -n capi-operator-system \ - --set infrastructure=docker:v1.7.7 \ - --set core=cluster-api:v1.7.7 \ - --set controlPlane=rke2:v0.7.0 \ - --set bootstrap=rke2:v0.7.0 \ - --timeout 90s --wait + --create-namespace -n capi-operator-system \ + --set infrastructure=docker:v1.7.7 \ + --set core=cluster-api:v1.7.7 \ + --set controlPlane=rke2:v0.8.0 \ + --set bootstrap=rke2:v0.8.0 \ + --timeout 90s --wait kubectl rollout status deployment capi-operator-cluster-api-operator -n capi-operator-system --timeout=180s