update default opm index image for run bundle(-upgrade)

Signed-off-by: Joe Lanford <[email protected]>

changelog/fragments/default-opm-image.yaml

@@ -0,0 +1,12 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      Update default base image used in `run bundle` and `run bundle-upgrade` to
+      the multi-arch `quay.io/operator-framework/opm:latest` image to support non-amd64
+      clusters.
+
+    kind: "change"
+
+    # Is this a breaking change?
+    breaking: false

internal/olm/operator/registry/index_image.go

@@ -40,7 +40,7 @@ import (
 const (
 	// defaultIndexImageBase is the base for defaultIndexImage. It is necessary to separate
 	// them for string comparison when defaulting bundle add mode.
-	defaultIndexImageBase = "quay.io/operator-framework/upstream-opm-builder:"
+	defaultIndexImageBase = "quay.io/operator-framework/opm:"
 	// DefaultIndexImage is the index base image used if none is specified. It contains no bundles.
 	// TODO(v2.0.0): pin this image tag to a specific version.
 	DefaultIndexImage = defaultIndexImageBase + "latest"

website/content/en/docs/cli/operator-sdk_run_bundle.md

@@ -19,7 +19,7 @@ operator-sdk run bundle <bundle-image> [flags]
 ```
       --ca-secret-name string           Name of a generic secret containing a PEM root certificate file required to pull bundle images. This secret *must* be in the namespace that this command is configured to run in, and the file *must* be encoded under the key "cert.pem"
   -h, --help                            help for bundle
-      --index-image string              index image in which to inject bundle (default "quay.io/operator-framework/upstream-opm-builder:latest")
+      --index-image string              index image in which to inject bundle (default "quay.io/operator-framework/opm:latest")
       --install-mode InstallModeValue   install mode
       --kubeconfig string               Path to the kubeconfig file to use for CLI requests.
   -n, --namespace string                If present, namespace scope for this CLI request