Skip to content

Commit

Permalink
chore: bump caprke2 (#802)
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Salas <[email protected]>
Co-authored-by: Carlos Salas <[email protected]>
  • Loading branch information
github-actions[bot] and salasberryfin authored Oct 25, 2024
1 parent 3edf9ef commit 98f91c9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion exp/etcdrestore/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions exp/etcdrestore/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions internal/controllers/clusterctl/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ 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
- name: "kubeadm"
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
Expand Down
12 changes: 6 additions & 6 deletions scripts/turtles-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 98f91c9

Please sign in to comment.