Skip to content

Commit 3e18fbc

Browse files
authored
Merge pull request #11888 from jnummelin/backport-11872-release-1.9
[release-1.9] 🌱 Change k0smotron repo location
2 parents 5be192b + f812cf2 commit 3e18fbc

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

cmd/clusterctl/client/config/providers_client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ func (p *providersClient) defaults() []Provider {
327327
},
328328
&provider{
329329
name: K0smotronProviderName,
330-
url: "https://github.com/k0sproject/k0smotron/releases/latest/infrastructure-components.yaml",
330+
url: "https://github.com/k0smotron/k0smotron/releases/latest/infrastructure-components.yaml",
331331
providerType: clusterctlv1.InfrastructureProviderType,
332332
},
333333
&provider{
@@ -374,7 +374,7 @@ func (p *providersClient) defaults() []Provider {
374374
},
375375
&provider{
376376
name: K0smotronBootstrapProviderName,
377-
url: "https://github.com/k0sproject/k0smotron/releases/latest/bootstrap-components.yaml",
377+
url: "https://github.com/k0smotron/k0smotron/releases/latest/bootstrap-components.yaml",
378378
providerType: clusterctlv1.BootstrapProviderType,
379379
},
380380
&provider{
@@ -421,7 +421,7 @@ func (p *providersClient) defaults() []Provider {
421421
},
422422
&provider{
423423
name: K0smotronControlPlaneProviderName,
424-
url: "https://github.com/k0sproject/k0smotron/releases/latest/control-plane-components.yaml",
424+
url: "https://github.com/k0smotron/k0smotron/releases/latest/control-plane-components.yaml",
425425
providerType: clusterctlv1.ControlPlaneProviderType,
426426
},
427427
&provider{

cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ var expectedOutputText = `NAME TYPE URL
105105
cluster-api CoreProvider https://github.com/myorg/myforkofclusterapi/releases/latest/ core_components.yaml
106106
another-provider BootstrapProvider ./ bootstrap-components.yaml
107107
canonical-kubernetes BootstrapProvider https://github.com/canonical/cluster-api-k8s/releases/latest/ bootstrap-components.yaml
108-
k0sproject-k0smotron BootstrapProvider https://github.com/k0sproject/k0smotron/releases/latest/ bootstrap-components.yaml
108+
k0sproject-k0smotron BootstrapProvider https://github.com/k0smotron/k0smotron/releases/latest/ bootstrap-components.yaml
109109
kubeadm BootstrapProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ bootstrap-components.yaml
110110
kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubekey/releases/latest/ bootstrap-components.yaml
111111
microk8s BootstrapProvider https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/ bootstrap-components.yaml
112112
rke2 BootstrapProvider https://github.com/rancher/cluster-api-provider-rke2/releases/latest/ bootstrap-components.yaml
113113
talos BootstrapProvider https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml
114114
canonical-kubernetes ControlPlaneProvider https://github.com/canonical/cluster-api-k8s/releases/latest/ control-plane-components.yaml
115-
k0sproject-k0smotron ControlPlaneProvider https://github.com/k0sproject/k0smotron/releases/latest/ control-plane-components.yaml
115+
k0sproject-k0smotron ControlPlaneProvider https://github.com/k0smotron/k0smotron/releases/latest/ control-plane-components.yaml
116116
kamaji ControlPlaneProvider https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/ control-plane-components.yaml
117117
kubeadm ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ control-plane-components.yaml
118118
kubekey-k3s ControlPlaneProvider https://github.com/kubesphere/kubekey/releases/latest/ control-plane-components.yaml
@@ -135,7 +135,7 @@ huawei InfrastructureProvider https://github.com/HuaweiClou
135135
ibmcloud InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/ infrastructure-components.yaml
136136
in-memory InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ infrastructure-components-in-memory-development.yaml
137137
ionoscloud-ionoscloud InfrastructureProvider https://github.com/ionos-cloud/cluster-api-provider-ionoscloud/releases/latest/ infrastructure-components.yaml
138-
k0sproject-k0smotron InfrastructureProvider https://github.com/k0sproject/k0smotron/releases/latest/ infrastructure-components.yaml
138+
k0sproject-k0smotron InfrastructureProvider https://github.com/k0smotron/k0smotron/releases/latest/ infrastructure-components.yaml
139139
kubekey InfrastructureProvider https://github.com/kubesphere/kubekey/releases/latest/ infrastructure-components.yaml
140140
kubevirt InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/releases/latest/ infrastructure-components.yaml
141141
linode-linode InfrastructureProvider https://github.com/linode/cluster-api-provider-linode/releases/latest/ infrastructure-components.yaml
@@ -179,7 +179,7 @@ var expectedOutputYaml = `- File: core_components.yaml
179179
- File: bootstrap-components.yaml
180180
Name: k0sproject-k0smotron
181181
ProviderType: BootstrapProvider
182-
URL: https://github.com/k0sproject/k0smotron/releases/latest/
182+
URL: https://github.com/k0smotron/k0smotron/releases/latest/
183183
- File: bootstrap-components.yaml
184184
Name: kubeadm
185185
ProviderType: BootstrapProvider
@@ -207,7 +207,7 @@ var expectedOutputYaml = `- File: core_components.yaml
207207
- File: control-plane-components.yaml
208208
Name: k0sproject-k0smotron
209209
ProviderType: ControlPlaneProvider
210-
URL: https://github.com/k0sproject/k0smotron/releases/latest/
210+
URL: https://github.com/k0smotron/k0smotron/releases/latest/
211211
- File: control-plane-components.yaml
212212
Name: kamaji
213213
ProviderType: ControlPlaneProvider
@@ -299,7 +299,7 @@ var expectedOutputYaml = `- File: core_components.yaml
299299
- File: infrastructure-components.yaml
300300
Name: k0sproject-k0smotron
301301
ProviderType: InfrastructureProvider
302-
URL: https://github.com/k0sproject/k0smotron/releases/latest/
302+
URL: https://github.com/k0smotron/k0smotron/releases/latest/
303303
- File: infrastructure-components.yaml
304304
Name: kubekey
305305
ProviderType: InfrastructureProvider

docs/book/src/reference/providers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updated info about which API version they are supporting.
88
## Bootstrap
99
- [Amazon Elastic Kubernetes Service (EKS)](https://github.com/kubernetes-sigs/cluster-api-provider-aws/tree/main/bootstrap/eks)
1010
- [Canonical Kubernetes](https://github.com/canonical/cluster-api-k8s)
11-
- [k0smotron/k0s](https://github.com/k0sproject/k0smotron)
11+
- [k0smotron/k0s](https://github.com/k0smotron/k0smotron)
1212
- [K3s](https://github.com/cluster-api-provider-k3s/cluster-api-k3s)
1313
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm)
1414
- [MicroK8s](https://github.com/canonical/cluster-api-bootstrap-provider-microk8s)
@@ -17,7 +17,7 @@ updated info about which API version they are supporting.
1717

1818
## Control Plane
1919
- [Canonical Kubernetes](https://github.com/canonical/cluster-api-k8s)
20-
- [k0smotron/k0s](https://github.com/k0sproject/k0smotron)
20+
- [k0smotron/k0s](https://github.com/k0smotron/k0smotron)
2121
- [K3s](https://github.com/cluster-api-provider-k3s/cluster-api-k3s)
2222
- [Kamaji](https://github.com/clastix/cluster-api-control-plane-provider-kamaji)
2323
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm)
@@ -43,7 +43,7 @@ updated info about which API version they are supporting.
4343
- [IBM Cloud](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud)
4444
- [IONOS Cloud](https://github.com/ionos-cloud/cluster-api-provider-ionoscloud)
4545
- [KubeKey](https://github.com/kubesphere/kubekey)
46-
- [k0smotron RemoteMachine (SSH)](https://github.com/k0sproject/k0smotron)
46+
- [k0smotron RemoteMachine (SSH)](https://github.com/k0smotron/k0smotron)
4747
- [KubeVirt](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt)
4848
- [MAAS](https://github.com/spectrocloud/cluster-api-provider-maas)
4949
- [Metal3](https://github.com/metal3-io/cluster-api-provider-metal3)

docs/book/src/user/quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ kind delete cluster
19621962
[management cluster]: ../reference/glossary.md#management-cluster
19631963
[Metal3 getting started guide]: https://github.com/metal3-io/cluster-api-provider-metal3/blob/master/docs/getting-started.md
19641964
[Metal3 provider]: https://github.com/metal3-io/cluster-api-provider-metal3/
1965-
[K0smotron provider]: https://github.com/k0sproject/k0smotron
1965+
[K0smotron provider]: https://github.com/k0smotron/k0smotron
19661966
[KubeKey provider]: https://github.com/kubesphere/kubekey
19671967
[KubeVirt provider]: https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/
19681968
[KubeVirt]: https://kubevirt.io/

0 commit comments

Comments
 (0)