From 04e1a17b688c544250ec3549241f6294f4880a05 Mon Sep 17 00:00:00 2001 From: Ivan Kolodiazhnyi Date: Mon, 22 Apr 2024 16:37:03 +0300 Subject: [PATCH] Change DefaultIndexImage to UBI Description of the change: Change untar image from busybox to UBI image as #5191 Motivation for the change: Remove dependency on dockerhub --- internal/olm/fbcutil/util.go | 2 +- website/content/en/docs/cli/operator-sdk_run_bundle.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/olm/fbcutil/util.go b/internal/olm/fbcutil/util.go index 57c930044f2..afa429a464d 100644 --- a/internal/olm/fbcutil/util.go +++ b/internal/olm/fbcutil/util.go @@ -48,7 +48,7 @@ const ( // TODO(v2.0.0): pin this image tag to a specific version. DefaultIndexImage = DefaultIndexImageBase + "latest" // DefaultInitImage is the default image to be used in the registry init container - DefaultInitImage = "docker.io/library/busybox:1.36.0" + DefaultInitImage = "registry.access.redhat.com/ubi8-micro:8.9" ) // BundleDeclcfg represents a minimal File-Based Catalog. diff --git a/website/content/en/docs/cli/operator-sdk_run_bundle.md b/website/content/en/docs/cli/operator-sdk_run_bundle.md index d707be1ed2e..f8eaeb0e5b8 100644 --- a/website/content/en/docs/cli/operator-sdk_run_bundle.md +++ b/website/content/en/docs/cli/operator-sdk_run_bundle.md @@ -29,7 +29,7 @@ operator-sdk run bundle [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" - --decompression-image string image used in an init container in the registry pod to decompress the compressed catalog contents. cat and gzip binaries are expected to exist in the PATH (default "docker.io/library/busybox:1.36.0") + --decompression-image string image used in an init container in the registry pod to decompress the compressed catalog contents. cat and gzip binaries are expected to exist in the PATH (default "registry.access.redhat.com/ubi8-micro:8.9") -h, --help help for bundle --index-image string index image in which to inject bundle (default "quay.io/operator-framework/opm:latest") --install-mode InstallModeValue install mode