Skip to content

Commit

Permalink
Merge pull request #543 from alexander-demicev/caprke2bump
Browse files Browse the repository at this point in the history
Bump CAPRKE2 to the latest RC
  • Loading branch information
alexander-demicev committed May 22, 2024
2 parents 0c1b475 + 09493d4 commit fce076a
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 35 deletions.
4 changes: 2 additions & 2 deletions charts/rancher-turtles/templates/clusterctl-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ data:
url: "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/bootstrap-components.yaml"
type: "BootstrapProvider"
- name: "rke2"
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.2.6/bootstrap-components.yaml"
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.3.0-rc.1/bootstrap-components.yaml"
type: "BootstrapProvider"
# ControlPlane providers
- name: "kubeadm"
url: "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/control-plane-components.yaml"
type: "ControlPlaneProvider"
- name: "rke2"
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.2.6/control-plane-components.yaml"
url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.3.0-rc.1/control-plane-components.yaml"
type: "ControlPlaneProvider"
{{- end }}
14 changes: 7 additions & 7 deletions exp/etcdrestore/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ replace github.com/rancher/turtles => ../..

require (
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/rancher-sandbox/cluster-api-provider-rke2 v0.2.7
github.com/onsi/gomega v1.33.0
github.com/rancher-sandbox/cluster-api-provider-rke2 v0.3.0-rc.1
github.com/rancher/turtles v0.0.0-00010101000000-000000000000
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
k8s.io/api v0.29.3
Expand All @@ -29,10 +29,10 @@ require (
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/coreos/ignition/v2 v2.16.2 // indirect
github.com/coreos/ignition/v2 v2.18.0 // indirect
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
Expand All @@ -49,7 +49,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -59,7 +59,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
Expand All @@ -77,7 +77,7 @@ require (
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.17.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit fce076a

Please sign in to comment.