diff --git a/changelog/fragments/ansiblev2alpha.yaml b/changelog/fragments/ansiblev2alpha.yaml index 60aaff3e53..376706c7fb 100644 --- a/changelog/fragments/ansiblev2alpha.yaml +++ b/changelog/fragments/ansiblev2alpha.yaml @@ -2,7 +2,7 @@ # release notes and/or the migration guide entries: - description: > - Adds a new `ansible/v2-alpha` plugin. The only user facing difference is that the + Adds a new `ansible-external/v1-alpha` plugin. The only user facing difference is that the image used in the scaffolded `Dockerfile` `FROM` directive is now `quay.io/operator-framework/ansible-operator-plugins:`. The first version tag that is usable is `v0.1.2`. @@ -31,7 +31,7 @@ entries: # Migration can be defined to automatically add a section to # the migration guide. This is required for breaking changes. migration: - header: (Optional) Converting from `ansible/v1` to `ansible/v2-alpha` + header: (Optional) Converting from `ansible/v1` to `ansible-external/v1-alpha` body: | In your `Dockerfile`, replace the `FROM` directive of: ``` diff --git a/internal/cmd/operator-sdk/cli/cli.go b/internal/cmd/operator-sdk/cli/cli.go index 4174d2bd7c..863e2de03d 100644 --- a/internal/cmd/operator-sdk/cli/cli.go +++ b/internal/cmd/operator-sdk/cli/cli.go @@ -104,7 +104,10 @@ func GetPluginsCLIAndRoot() (*cli.CLI, *cobra.Command) { manifestsv2.Plugin{}, scorecardv2.Plugin{}, ) - ansibleV2AlphaBundle, _ := plugin.NewBundle("ansible"+plugins.DefaultNameQualifier, plugin.Version{Number: 2, Stage: stage.Alpha}, + // Having to call this something other than "ansible" due to it causing amibiguity issues + // when marking --plugins=ansible. Naming this "ansible" is likely a breaking change since + // our documentation mentions using --plugins=ansible instead of --plugins=ansible/v1 + ansibleV2AlphaBundle, _ := plugin.NewBundle("ansible-external"+plugins.DefaultNameQualifier, plugin.Version{Number: 1, Stage: stage.Alpha}, kustomizev2Alpha.Plugin{}, ansibleexternal.Plugin{}, manifestsv2.Plugin{},