Skip to content

Commit

Permalink
Merge pull request #7838 from knabben/remove-list-images
Browse files Browse the repository at this point in the history
⚠️ Removing deprecated --list-images flag on init command
  • Loading branch information
k8s-ci-robot authored Jan 4, 2023
2 parents 7bf3ea6 + 913714d commit 192517b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
18 changes: 0 additions & 18 deletions cmd/clusterctl/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package cmd

import (
"fmt"
"time"

"github.com/spf13/cobra"
Expand All @@ -35,7 +34,6 @@ type initOptions struct {
ipamProviders []string
runtimeExtensionProviders []string
targetNamespace string
listImages bool
validate bool
waitProviders bool
waitProviderTimeout int
Expand Down Expand Up @@ -114,10 +112,6 @@ func init() {
initCmd.Flags().BoolVar(&initOpts.validate, "validate", true,
"If true, clusterctl will validate that the deployments will succeed on the management cluster.")

initCmd.Flags().BoolVar(&initOpts.listImages, "list-images", false,
"Lists the container images required for initializing the management cluster (without actually installing the providers)")
_ = initCmd.Flags().MarkDeprecated("list-images", "use 'clusterctl init list-images' instead.")

initCmd.AddCommand(initListImagesCmd)
RootCmd.AddCommand(initCmd)
}
Expand All @@ -143,18 +137,6 @@ func runInit() error {
IgnoreValidationErrors: !initOpts.validate,
}

if initOpts.listImages {
images, err := c.InitImages(options)
if err != nil {
return err
}

for _, i := range images {
fmt.Println(i)
}
return nil
}

if _, err := c.Init(options); err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/developer/providers/v1.3-to-v1.4.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ maintainers of providers and consumers of our Go API.
- `clusterctl backup` has been removed.
- `MachineHealthCheckSuccededCondition` condition type has been removed.
- `CloneTemplate` and `CloneTemplateInput` has been removed.
- The option `--list-images` from `init` subcommand has been removed.

### API Changes

Expand Down

0 comments on commit 192517b

Please sign in to comment.