diff --git a/cmd/clusterctl/client/delete.go b/cmd/clusterctl/client/delete.go index ea5785afaa24..17e3f976386e 100644 --- a/cmd/clusterctl/client/delete.go +++ b/cmd/clusterctl/client/delete.go @@ -30,18 +30,18 @@ type DeleteOptions struct { // default rules for kubeconfig discovery will be used. Kubeconfig Kubeconfig - // CoreProvider version (e.g. cluster-api:v0.3.0) to add to the management cluster. If unspecified, the + // CoreProvider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, the // cluster-api core provider's latest release is used. CoreProvider string - // BootstrapProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. + // BootstrapProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. // If unspecified, the kubeadm bootstrap provider's latest release is used. BootstrapProviders []string // InfrastructureProviders and versions (e.g. aws:v0.5.0) to add to the management cluster. InfrastructureProviders []string - // ControlPlaneProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. + // ControlPlaneProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. // If unspecified, the kubeadm control plane provider latest release is used. ControlPlaneProviders []string diff --git a/cmd/clusterctl/client/init.go b/cmd/clusterctl/client/init.go index 6f472fc4a50f..ec9e67e77a27 100644 --- a/cmd/clusterctl/client/init.go +++ b/cmd/clusterctl/client/init.go @@ -38,18 +38,18 @@ type InitOptions struct { // default rules for kubeconfig discovery will be used. Kubeconfig Kubeconfig - // CoreProvider version (e.g. cluster-api:v0.3.0) to add to the management cluster. If unspecified, the + // CoreProvider version (e.g. cluster-api:v1.1.5) to add to the management cluster. If unspecified, the // cluster-api core provider's latest release is used. CoreProvider string - // BootstrapProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. + // BootstrapProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. // If unspecified, the kubeadm bootstrap provider's latest release is used. BootstrapProviders []string // InfrastructureProviders and versions (e.g. aws:v0.5.0) to add to the management cluster. InfrastructureProviders []string - // ControlPlaneProviders and versions (e.g. kubeadm:v0.3.0) to add to the management cluster. + // ControlPlaneProviders and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. // If unspecified, the kubeadm control plane provider latest release is used. ControlPlaneProviders []string diff --git a/cmd/clusterctl/client/upgrade.go b/cmd/clusterctl/client/upgrade.go index eb224da11d70..2bbfe07247fc 100644 --- a/cmd/clusterctl/client/upgrade.go +++ b/cmd/clusterctl/client/upgrade.go @@ -97,13 +97,13 @@ type ApplyUpgradeOptions struct { // a more granular control on upgrade, use CoreProvider, BootstrapProviders, ControlPlaneProviders, InfrastructureProviders. Contract string - // 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. + // 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. CoreProvider string - // 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. + // 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. BootstrapProviders []string - // 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. + // 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. ControlPlaneProviders []string // InfrastructureProviders instance and versions (e.g. capa-system/aws:v0.5.0) to upgrade to. This field can be used as alternative to Contract. diff --git a/cmd/clusterctl/cmd/delete.go b/cmd/clusterctl/cmd/delete.go index 2cba499d2361..950340ce1571 100644 --- a/cmd/clusterctl/cmd/delete.go +++ b/cmd/clusterctl/cmd/delete.go @@ -95,13 +95,13 @@ func init() { "Forces the deletion of the provider's CRDs (and of all the related objects)") deleteCmd.Flags().StringVar(&dd.coreProvider, "core", "", - "Core provider version (e.g. cluster-api:v0.3.0) to delete from the management cluster") + "Core provider version (e.g. cluster-api:v1.1.5) to delete from the management cluster") deleteCmd.Flags().StringSliceVarP(&dd.infrastructureProviders, "infrastructure", "i", nil, "Infrastructure providers and versions (e.g. aws:v0.5.0) to delete from the management cluster") deleteCmd.Flags().StringSliceVarP(&dd.bootstrapProviders, "bootstrap", "b", nil, - "Bootstrap providers and versions (e.g. kubeadm:v0.3.0) to delete from the management cluster") + "Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster") deleteCmd.Flags().StringSliceVarP(&dd.controlPlaneProviders, "control-plane", "c", nil, - "ControlPlane providers and versions (e.g. kubeadm:v0.3.0) to delete from the management cluster") + "ControlPlane providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster") deleteCmd.Flags().BoolVar(&dd.deleteAll, "all", false, "Force deletion of all the providers") diff --git a/cmd/clusterctl/cmd/generate_provider.go b/cmd/clusterctl/cmd/generate_provider.go index f88c1df2266b..930301bad227 100644 --- a/cmd/clusterctl/cmd/generate_provider.go +++ b/cmd/clusterctl/cmd/generate_provider.go @@ -75,13 +75,13 @@ var generateProviderCmd = &cobra.Command{ func init() { generateProviderCmd.Flags().StringVar(&gpo.coreProvider, "core", "", - "Core provider and version (e.g. cluster-api:v0.3.0)") + "Core provider and version (e.g. cluster-api:v1.1.5)") generateProviderCmd.Flags().StringVarP(&gpo.infrastructureProvider, "infrastructure", "i", "", "Infrastructure provider and version (e.g. aws:v0.5.0)") generateProviderCmd.Flags().StringVarP(&gpo.bootstrapProvider, "bootstrap", "b", "", - "Bootstrap provider and version (e.g. kubeadm:v0.3.0)") + "Bootstrap provider and version (e.g. kubeadm:v1.1.5)") generateProviderCmd.Flags().StringVarP(&gpo.controlPlaneProvider, "control-plane", "c", "", - "ControlPlane provider and version (e.g. kubeadm:v0.3.0)") + "ControlPlane provider and version (e.g. kubeadm:v1.1.5)") generateProviderCmd.Flags().StringVarP(&gpo.targetNamespace, "target-namespace", "n", "", "The target namespace where the provider should be deployed. If unspecified, the components default namespace is used.") generateProviderCmd.Flags().BoolVar(&gpo.textOutput, "describe", false, diff --git a/cmd/clusterctl/cmd/init.go b/cmd/clusterctl/cmd/init.go index 12caa08cc97a..6025a62131ac 100644 --- a/cmd/clusterctl/cmd/init.go +++ b/cmd/clusterctl/cmd/init.go @@ -95,13 +95,13 @@ func init() { initCmd.Flags().StringVar(&initOpts.kubeconfigContext, "kubeconfig-context", "", "Context to be used within the kubeconfig file. If empty, current context will be used.") initCmd.Flags().StringVar(&initOpts.coreProvider, "core", "", - "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.") + "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.") initCmd.Flags().StringSliceVarP(&initOpts.infrastructureProviders, "infrastructure", "i", nil, "Infrastructure providers and versions (e.g. aws:v0.5.0) to add to the management cluster.") initCmd.Flags().StringSliceVarP(&initOpts.bootstrapProviders, "bootstrap", "b", nil, - "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.") + "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.") initCmd.Flags().StringSliceVarP(&initOpts.controlPlaneProviders, "control-plane", "c", nil, - "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.") + "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.") initCmd.Flags().StringVarP(&initOpts.targetNamespace, "target-namespace", "n", "", "The target namespace where the providers should be deployed. If unspecified, the provider components' default namespace is used.") initCmd.Flags().BoolVar(&initOpts.waitProviders, "wait-providers", false, diff --git a/cmd/clusterctl/cmd/upgrade_apply.go b/cmd/clusterctl/cmd/upgrade_apply.go index ba569e9b04fa..8fb343797698 100644 --- a/cmd/clusterctl/cmd/upgrade_apply.go +++ b/cmd/clusterctl/cmd/upgrade_apply.go @@ -70,13 +70,13 @@ func init() { "The API Version of Cluster API (contract, e.g. v1alpha4) the management cluster should upgrade to") upgradeApplyCmd.Flags().StringVar(&ua.coreProvider, "core", "", - "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.") + "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.") upgradeApplyCmd.Flags().StringSliceVarP(&ua.infrastructureProviders, "infrastructure", "i", nil, "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.") upgradeApplyCmd.Flags().StringSliceVarP(&ua.bootstrapProviders, "bootstrap", "b", nil, - "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.") + "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.") upgradeApplyCmd.Flags().StringSliceVarP(&ua.controlPlaneProviders, "control-plane", "c", nil, - "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.") + "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.") upgradeApplyCmd.Flags().BoolVar(&ua.waitProviders, "wait-providers", false, "Wait for providers to be upgraded.") upgradeApplyCmd.Flags().IntVar(&ua.waitProviderTimeout, "wait-provider-timeout", 5*60, diff --git a/docs/book/src/clusterctl/configuration.md b/docs/book/src/clusterctl/configuration.md index e60fcacdbc47..3cb51a6ec82a 100644 --- a/docs/book/src/clusterctl/configuration.md +++ b/docs/book/src/clusterctl/configuration.md @@ -120,13 +120,13 @@ For example, ``` ├── bootstrap-kubeadm -│   └── v0.3.0 +│   └── v1.1.5 │   └── bootstrap-components.yaml ├── cluster-api -│   └── v0.3.0 +│   └── v1.1.5 │   └── core-components.yaml ├── control-plane-kubeadm -│   └── v0.3.0 +│   └── v1.1.5 │   └── control-plane-components.yaml └── infrastructure-aws └── v0.5.0