Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps CAPRKE2 to v0.11 #1054

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Bumps CAPRKE2 to v0.11 #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdcb2d7
chore: bump caprke2 provider
github-actions[bot] Jan 28, 2025
9a5fae4
chore: bump caprke2 to v0.11.0
salasberryfin Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exp/etcdrestore/go.mod
View file
Open in desktop
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.22.2
github.com/onsi/gomega v1.36.2
github.com/rancher/cluster-api-provider-rke2 v0.10.0
github.com/rancher/cluster-api-provider-rke2 v0.11.0
github.com/rancher/turtles v0.0.0-00010101000000-000000000000
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
k8s.io/api v0.31.4
Expand Down
4 changes: 2 additions & 2 deletions exp/etcdrestore/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/rancher/cluster-api-provider-rke2 v0.10.0 h1:fDX4n84vaE/5n1Op3/KJAuIqIAPIPPGorUzUlQ8Ck5c=
github.com/rancher/cluster-api-provider-rke2 v0.10.0/go.mod h1:yx6bUVZmpICOZHyHsrJJ8f+NzXKzi87l86bafdQdl4I=
github.com/rancher/cluster-api-provider-rke2 v0.11.0 h1:nVIdF2B+YjGeBt/jJZvwC4D0iFR1N5RT2/t98JcRFt0=
github.com/rancher/cluster-api-provider-rke2 v0.11.0/go.mod h1:/a71KlFmsYRM2QR/2EqDww3VFVyHTL6ZFfd2QHDd0Uo=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
Expand Down
4 changes: 2 additions & 2 deletions internal/controllers/clusterctl/config.yaml
View file
Open in desktop
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.9.4/bootstrap-components.yaml"
type: "BootstrapProvider"
- name: "rke2"
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/bootstrap-components.yaml"
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/bootstrap-components.yaml"
type: "BootstrapProvider"

# ControlPlane providers
- name: "kubeadm"
url: "https://github.com/rancher-sandbox/cluster-api/releases/v1.9.4/control-plane-components.yaml"
type: "ControlPlaneProvider"
- name: "rke2"
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml"
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml"
type: "ControlPlaneProvider"

# Addon providers
Expand Down
8 changes: 4 additions & 4 deletions internal/controllers/clusterctl/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ data:
url: https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.8.1/infrastructure-components.yaml
- name: rke2
type: ControlPlaneProvider
url: https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml
url: https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml
images:
image1:
repository: repo1
Expand Down Expand Up @@ -94,7 +94,7 @@ data:
{
Name: "rke2",
Type: "BootstrapProvider",
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/bootstrap-components.yaml",
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/bootstrap-components.yaml",
},
{
Name: "fleet",
Expand Down Expand Up @@ -139,14 +139,14 @@ data:
Expect(configRepo.Providers).To(ContainElement(v1alpha1.Provider{
Name: "rke2",
Type: "ControlPlaneProvider",
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.10.0/control-plane-components.yaml",
URL: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.11.0/control-plane-components.yaml",
}))

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

// Ensure a new fleet addon provider is added
Expand Down
Loading