Skip to content

Commit 2fc8bcd

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #6937 from killianmuldoon/docs/update-capi-versions
🌱 Update example version of core CAPI used in clusterctl
2 parents 505a08e + 4cfafbd commit 2fc8bcd

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎cmd/clusterctl/client/delete.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ type DeleteOptions struct {
3030
// default rules for kubeconfig discovery will be used.
3131
Kubeconfig Kubeconfig
3232

33-
// CoreProvider version (e.g. cluster-api:v0.3.0) to add to the management cluster. If unspecified, the
33+
// CoreProvider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, the
3434
// cluster-api core provider's latest release is used.
3535
CoreProvider string
3636

37-
// BootstrapProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster.
37+
// BootstrapProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster.
3838
// If unspecified, the kubeadm bootstrap provider's latest release is used.
3939
BootstrapProviders []string
4040

4141
// InfrastructureProviders and versions (e.g. aws:v0.5.0) to add to the management cluster.
4242
InfrastructureProviders []string
4343

44-
// ControlPlaneProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster.
44+
// ControlPlaneProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster.
4545
// If unspecified, the kubeadm control plane provider latest release is used.
4646
ControlPlaneProviders []string
4747

‎cmd/clusterctl/client/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ type InitOptions struct {
3838
// default rules for kubeconfig discovery will be used.
3939
Kubeconfig Kubeconfig
4040

41-
// CoreProvider version (e.g. cluster-api:v0.3.0) to add to the management cluster. If unspecified, the
41+
// CoreProvider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, the
4242
// cluster-api core provider's latest release is used.
4343
CoreProvider string
4444

45-
// BootstrapProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster.
45+
// BootstrapProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster.
4646
// If unspecified, the kubeadm bootstrap provider's latest release is used.
4747
BootstrapProviders []string
4848

4949
// InfrastructureProviders and versions (e.g. aws:v0.5.0) to add to the management cluster.
5050
InfrastructureProviders []string
5151

52-
// ControlPlaneProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster.
52+
// ControlPlaneProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster.
5353
// If unspecified, the kubeadm control plane provider latest release is used.
5454
ControlPlaneProviders []string
5555

‎cmd/clusterctl/client/upgrade.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ type ApplyUpgradeOptions struct {
9797
// a more granular control on upgrade, use CoreProvider, BootstrapProviders, ControlPlaneProviders, InfrastructureProviders.
9898
Contract string
9999

100-
// CoreProvider instance and version (e.g. capi-system/cluster-api:v0.3.0) to upgrade to. This field can be used as alternative to Contract.
100+
// CoreProvider instance and version (e.g. capi-system/cluster-api:v1.1.5) to upgrade to. This field can be used as alternative to Contract.
101101
CoreProvider string
102102

103-
// BootstrapProviders instance and versions (e.g. capi-kubeadm-bootstrap-system/kubeadm:v0.3.0) to upgrade to. This field can be used as alternative to Contract.
103+
// BootstrapProviders instance and versions (e.g. capi-kubeadm-bootstrap-system/kubeadm:v1.1.5) to upgrade to. This field can be used as alternative to Contract.
104104
BootstrapProviders []string
105105

106-
// ControlPlaneProviders instance and versions (e.g. capi-kubeadm-control-plane-system/kubeadm:v0.3.0) to upgrade to. This field can be used as alternative to Contract.
106+
// ControlPlaneProviders instance and versions (e.g. capi-kubeadm-control-plane-system/kubeadm:v1.1.5) to upgrade to. This field can be used as alternative to Contract.
107107
ControlPlaneProviders []string
108108

109109
// InfrastructureProviders instance and versions (e.g. capa-system/aws:v0.5.0) to upgrade to. This field can be used as alternative to Contract.

‎cmd/clusterctl/cmd/delete.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ func init() {
9595
"Forces the deletion of the provider's CRDs (and of all the related objects)")
9696

9797
deleteCmd.Flags().StringVar(&dd.coreProvider, "core", "",
98-
"Core provider version (e.g. cluster-api:v0.3.0) to delete from the management cluster")
98+
"Core provider version (e.g. cluster-api:v1.1.5) to delete from the management cluster")
9999
deleteCmd.Flags().StringSliceVarP(&dd.infrastructureProviders, "infrastructure", "i", nil,
100100
"Infrastructure providers and versions (e.g. aws:v0.5.0) to delete from the management cluster")
101101
deleteCmd.Flags().StringSliceVarP(&dd.bootstrapProviders, "bootstrap", "b", nil,
102-
"Bootstrap providers and versions (e.g. kubeadm:v0.3.0) to delete from the management cluster")
102+
"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
103103
deleteCmd.Flags().StringSliceVarP(&dd.controlPlaneProviders, "control-plane", "c", nil,
104-
"ControlPlane providers and versions (e.g. kubeadm:v0.3.0) to delete from the management cluster")
104+
"ControlPlane providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
105105

106106
deleteCmd.Flags().BoolVar(&dd.deleteAll, "all", false,
107107
"Force deletion of all the providers")

‎cmd/clusterctl/cmd/generate_provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ var generateProviderCmd = &cobra.Command{
7575

7676
func init() {
7777
generateProviderCmd.Flags().StringVar(&gpo.coreProvider, "core", "",
78-
"Core provider and version (e.g. cluster-api:v0.3.0)")
78+
"Core provider and version (e.g. cluster-api:v1.1.5)")
7979
generateProviderCmd.Flags().StringVarP(&gpo.infrastructureProvider, "infrastructure", "i", "",
8080
"Infrastructure provider and version (e.g. aws:v0.5.0)")
8181
generateProviderCmd.Flags().StringVarP(&gpo.bootstrapProvider, "bootstrap", "b", "",
82-
"Bootstrap provider and version (e.g. kubeadm:v0.3.0)")
82+
"Bootstrap provider and version (e.g. kubeadm:v1.1.5)")
8383
generateProviderCmd.Flags().StringVarP(&gpo.controlPlaneProvider, "control-plane", "c", "",
84-
"ControlPlane provider and version (e.g. kubeadm:v0.3.0)")
84+
"ControlPlane provider and version (e.g. kubeadm:v1.1.5)")
8585
generateProviderCmd.Flags().StringVarP(&gpo.targetNamespace, "target-namespace", "n", "",
8686
"The target namespace where the provider should be deployed. If unspecified, the components default namespace is used.")
8787
generateProviderCmd.Flags().BoolVar(&gpo.textOutput, "describe", false,

‎cmd/clusterctl/cmd/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ func init() {
9595
initCmd.Flags().StringVar(&initOpts.kubeconfigContext, "kubeconfig-context", "",
9696
"Context to be used within the kubeconfig file. If empty, current context will be used.")
9797
initCmd.Flags().StringVar(&initOpts.coreProvider, "core", "",
98-
"Core provider version (e.g. cluster-api:v0.3.0) to add to the management cluster. If unspecified, Cluster API's latest release is used.")
98+
"Core provider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, Cluster API's latest release is used.")
9999
initCmd.Flags().StringSliceVarP(&initOpts.infrastructureProviders, "infrastructure", "i", nil,
100100
"Infrastructure providers and versions (e.g. aws:v0.5.0) to add to the management cluster.")
101101
initCmd.Flags().StringSliceVarP(&initOpts.bootstrapProviders, "bootstrap", "b", nil,
102-
"Bootstrap providers and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. If unspecified, Kubeadm bootstrap provider's latest release is used.")
102+
"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, Kubeadm bootstrap provider's latest release is used.")
103103
initCmd.Flags().StringSliceVarP(&initOpts.controlPlaneProviders, "control-plane", "c", nil,
104-
"Control plane providers and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. If unspecified, the Kubeadm control plane provider's latest release is used.")
104+
"Control plane providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, the Kubeadm control plane provider's latest release is used.")
105105
initCmd.Flags().StringVarP(&initOpts.targetNamespace, "target-namespace", "n", "",
106106
"The target namespace where the providers should be deployed. If unspecified, the provider components' default namespace is used.")
107107
initCmd.Flags().BoolVar(&initOpts.waitProviders, "wait-providers", false,

‎cmd/clusterctl/cmd/upgrade_apply.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ func init() {
7070
"The API Version of Cluster API (contract, e.g. v1alpha4) the management cluster should upgrade to")
7171

7272
upgradeApplyCmd.Flags().StringVar(&ua.coreProvider, "core", "",
73-
"Core provider instance version (e.g. capi-system/cluster-api:v0.3.0) to upgrade to. This flag can be used as alternative to --contract.")
73+
"Core provider instance version (e.g. capi-system/cluster-api:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
7474
upgradeApplyCmd.Flags().StringSliceVarP(&ua.infrastructureProviders, "infrastructure", "i", nil,
7575
"Infrastructure providers instance and versions (e.g. capa-system/aws:v0.5.0) to upgrade to. This flag can be used as alternative to --contract.")
7676
upgradeApplyCmd.Flags().StringSliceVarP(&ua.bootstrapProviders, "bootstrap", "b", nil,
77-
"Bootstrap providers instance and versions (e.g. capi-kubeadm-bootstrap-system/kubeadm:v0.3.0) to upgrade to. This flag can be used as alternative to --contract.")
77+
"Bootstrap providers instance and versions (e.g. capi-kubeadm-bootstrap-system/kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
7878
upgradeApplyCmd.Flags().StringSliceVarP(&ua.controlPlaneProviders, "control-plane", "c", nil,
79-
"ControlPlane providers instance and versions (e.g. capi-kubeadm-control-plane-system/kubeadm:v0.3.0) to upgrade to. This flag can be used as alternative to --contract.")
79+
"ControlPlane providers instance and versions (e.g. capi-kubeadm-control-plane-system/kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
8080
upgradeApplyCmd.Flags().BoolVar(&ua.waitProviders, "wait-providers", false,
8181
"Wait for providers to be upgraded.")
8282
upgradeApplyCmd.Flags().IntVar(&ua.waitProviderTimeout, "wait-provider-timeout", 5*60,

‎docs/book/src/clusterctl/configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ For example,
120120

121121
```
122122
├── bootstrap-kubeadm
123-
│   └── v0.3.0
123+
│   └── v1.1.5
124124
│   └── bootstrap-components.yaml
125125
├── cluster-api
126-
│   └── v0.3.0
126+
│   └── v1.1.5
127127
│   └── core-components.yaml
128128
├── control-plane-kubeadm
129-
│   └── v0.3.0
129+
│   └── v1.1.5
130130
│   └── control-plane-components.yaml
131131
└── infrastructure-aws
132132
└── v0.5.0

0 commit comments

Comments
 (0)