Skip to content

Commit 193dda0

Browse files
Merge pull request #1054 from salasberryfin/providers-bumps-caprke2-to-v0-11
Bumps CAPRKE2 to v0.11
2 parents d3dfa2f + 9a5fae4 commit 193dda0

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Diff for: exp/etcdrestore/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/rancher/turtles => ../..
77
require (
88
github.com/onsi/ginkgo/v2 v2.22.2
99
github.com/onsi/gomega v1.36.2
10-
github.com/rancher/cluster-api-provider-rke2 v0.10.0
10+
github.com/rancher/cluster-api-provider-rke2 v0.11.0
1111
github.com/rancher/turtles v0.0.0-00010101000000-000000000000
1212
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
1313
k8s.io/api v0.31.4

Diff for: exp/etcdrestore/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G
152152
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
153153
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
154154
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
155-
github.com/rancher/cluster-api-provider-rke2 v0.10.0 h1:fDX4n84vaE/5n1Op3/KJAuIqIAPIPPGorUzUlQ8Ck5c=
156-
github.com/rancher/cluster-api-provider-rke2 v0.10.0/go.mod h1:yx6bUVZmpICOZHyHsrJJ8f+NzXKzi87l86bafdQdl4I=
155+
github.com/rancher/cluster-api-provider-rke2 v0.11.0 h1:nVIdF2B+YjGeBt/jJZvwC4D0iFR1N5RT2/t98JcRFt0=
156+
github.com/rancher/cluster-api-provider-rke2 v0.11.0/go.mod h1:/a71KlFmsYRM2QR/2EqDww3VFVyHTL6ZFfd2QHDd0Uo=
157157
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
158158
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
159159
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=

Diff for: internal/controllers/clusterctl/config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ data:
3636
url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.9.4/bootstrap-components.yaml"
3737
type: "BootstrapProvider"
3838
- name: "rke2"
39-
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/bootstrap-components.yaml"
39+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/bootstrap-components.yaml"
4040
type: "BootstrapProvider"
4141
4242
# ControlPlane providers
4343
- name: "kubeadm"
4444
url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.9.4/control-plane-components.yaml"
4545
type: "ControlPlaneProvider"
4646
- name: "rke2"
47-
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml"
47+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml"
4848
type: "ControlPlaneProvider"
4949
5050
# Addon providers

Diff for: internal/controllers/clusterctl/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ data:
6565
url: https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.8.1/infrastructure-components.yaml
6666
- name: rke2
6767
type: ControlPlaneProvider
68-
url: https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml
68+
url: https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml
6969
images:
7070
image1:
7171
repository: repo1
@@ -94,7 +94,7 @@ data:
9494
{
9595
Name: "rke2",
9696
Type: "BootstrapProvider",
97-
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/bootstrap-components.yaml",
97+
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/bootstrap-components.yaml",
9898
},
9999
{
100100
Name: "fleet",
@@ -139,14 +139,14 @@ data:
139139
Expect(configRepo.Providers).To(ContainElement(v1alpha1.Provider{
140140
Name: "rke2",
141141
Type: "ControlPlaneProvider",
142-
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml",
142+
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml",
143143
}))
144144

145145
// Ensure a new rke2 bootstrap provider is added
146146
Expect(configRepo.Providers).To(ContainElement(v1alpha1.Provider{
147147
Name: "rke2",
148148
Type: "BootstrapProvider",
149-
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/bootstrap-components.yaml",
149+
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/bootstrap-components.yaml",
150150
}))
151151

152152
// Ensure a new fleet addon provider is added

0 commit comments

Comments
 (0)