diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index f0d0cd7c5..d9c451bfc 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -22,7 +22,7 @@ spec: serviceAccountName: mongodb-enterprise-operator containers: - name: mongodb-enterprise-operator - image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:0.1.0" + image: "quay.io/mongodb/mongodb-kubernetes:0.1.0" imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml b/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml index 859df6f22..03e0663ab 100644 --- a/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml +++ b/config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml @@ -6,7 +6,7 @@ metadata: capabilities: Deep Insights categories: Database certified: "true" - containerImage: quay.io/mongodb/mongodb-enterprise-operator-ubi:0.1.0 + containerImage: quay.io/mongodb/mongodb-kubernetes:0.1.0 createdAt: "" description: The MongoDB Enterprise Kubernetes Operator enables easy deploys of MongoDB into Kubernetes clusters, using our management, monitoring and backup diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml index 8be7cc70b..6e297b50d 100644 --- a/helm_chart/values.yaml +++ b/helm_chart/values.yaml @@ -14,7 +14,7 @@ operator: name: mongodb-enterprise-operator # Name of the operator image - operator_image_name: mongodb-enterprise-operator-ubi + operator_image_name: mongodb-kubernetes # Name of the deployment of the operator pod deployment_name: mongodb-enterprise-operator diff --git a/inventory.yaml b/inventory.yaml index e803dc1ea..d6b177af6 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -52,7 +52,7 @@ images: buildargs: imagebase: $(inputs.params.registry)/operator-context:$(inputs.params.version_id) output: - - registry: $(inputs.params.registry)/mongodb-enterprise-operator-ubi + - registry: $(inputs.params.registry)/mongodb-kubernetes tag: $(inputs.params.version_id) - name: operator-ubi-race-build @@ -61,17 +61,17 @@ images: buildargs: imagebase: $(inputs.params.registry)/operator-context:$(inputs.params.version_id)-race output: - - registry: $(inputs.params.registry)/mongodb-enterprise-operator-ubi + - registry: $(inputs.params.registry)/mongodb-kubernetes tag: $(inputs.params.version_id)-race - name: master-latest task_type: tag_image tags: [ "master" ] source: - registry: $(inputs.params.registry)/mongodb-enterprise-operator-ubi + registry: $(inputs.params.registry)/mongodb-kubernetes tag: $(inputs.params.version_id) destination: - - registry: $(inputs.params.registry)/mongodb-enterprise-operator-ubi + - registry: $(inputs.params.registry)/mongodb-kubernetes tag: latest - name: operator-context-release diff --git a/mongodb-community-operator/scripts/ci/config.json b/mongodb-community-operator/scripts/ci/config.json index 7bb0fdabb..61f64bd42 100644 --- a/mongodb-community-operator/scripts/ci/config.json +++ b/mongodb-community-operator/scripts/ci/config.json @@ -3,7 +3,7 @@ "shared_repo_url": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev", "mongodb_image_repo_url": "quay.io/mongodb", "mongodb_image_name": "mongodb-community-server", - "operator_image": "mongodb-enterprise-operator-ubi", + "operator_image": "mongodb-kubernetes", "e2e_image": "mongodb-community-tests", "version_upgrade_hook_image": "mongodb-kubernetes-operator-version-upgrade-post-start-hook", "agent_image_dev": "mongodb-agent-ubi", diff --git a/mongodb-community-operator/test/e2e/setup/test_config.go b/mongodb-community-operator/test/e2e/setup/test_config.go index 9185b9330..957914f37 100644 --- a/mongodb-community-operator/test/e2e/setup/test_config.go +++ b/mongodb-community-operator/test/e2e/setup/test_config.go @@ -36,7 +36,7 @@ type TestConfig struct { func LoadTestConfigFromEnv() TestConfig { return TestConfig{ - OperatorImage: "mongodb-enterprise-operator-ubi", + OperatorImage: "mongodb-kubernetes", Namespace: envvar.GetEnvOrDefault(testNamespaceEnvName, "mongodb"), // nolint:forbidigo // The operator version is based on the versionID, which context sets either locally manually or evg per patch OperatorVersion: envvar.GetEnvOrDefault(versionIdEnv, ""), // nolint:forbidigo diff --git a/pipeline.py b/pipeline.py index 918301de9..8b58e77be 100755 --- a/pipeline.py +++ b/pipeline.py @@ -647,7 +647,7 @@ def args_for_daily_image(image_name: str) -> Dict[str, str]: image_config("agent", name_prefix="mongodb-enterprise-"), image_config("init-database", ubi_suffix=""), image_config("init-ops-manager", ubi_suffix=""), - image_config("operator"), + image_config("mongodb-kubernetes", name_prefix="", ubi_suffix=""), image_config("ops-manager", name_prefix="mongodb-enterprise-"), image_config("mongodb-agent", name_prefix="", ubi_suffix="-ubi", base_suffix="-ubi"), image_config( diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out index f69848d32..809f01430 100644 --- a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out +++ b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out @@ -66,7 +66,7 @@ operator: name: mongodb-enterprise-operator-multi-cluster namespace: mongodb-operator nodeSelector: {} - operator_image_name: mongodb-enterprise-operator-ubi + operator_image_name: mongodb-kubernetes replicas: 1 resources: limits: @@ -224,7 +224,7 @@ spec: runAsUser: 2000 containers: - name: mongodb-enterprise-operator-multi-cluster - image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:1.33.0" + image: "quay.io/mongodb/mongodb-kubernetes:1.33.0" imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/public/mongodb-enterprise-multi-cluster.yaml b/public/mongodb-enterprise-multi-cluster.yaml index bc74178ac..ad5366a99 100644 --- a/public/mongodb-enterprise-multi-cluster.yaml +++ b/public/mongodb-enterprise-multi-cluster.yaml @@ -279,7 +279,7 @@ spec: runAsUser: 2000 containers: - name: mongodb-enterprise-operator-multi-cluster - image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:0.1.0" + image: "quay.io/mongodb/mongodb-kubernetes:0.1.0" imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/public/mongodb-enterprise-openshift.yaml b/public/mongodb-enterprise-openshift.yaml index bd6d06c06..1cbcd2ca3 100644 --- a/public/mongodb-enterprise-openshift.yaml +++ b/public/mongodb-enterprise-openshift.yaml @@ -276,7 +276,7 @@ spec: serviceAccountName: mongodb-enterprise-operator containers: - name: mongodb-enterprise-operator - image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:0.1.0" + image: "quay.io/mongodb/mongodb-kubernetes:0.1.0" imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/public/mongodb-enterprise.yaml b/public/mongodb-enterprise.yaml index 6852e9f2e..4c023c826 100644 --- a/public/mongodb-enterprise.yaml +++ b/public/mongodb-enterprise.yaml @@ -279,7 +279,7 @@ spec: runAsUser: 2000 containers: - name: mongodb-enterprise-operator - image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:0.1.0" + image: "quay.io/mongodb/mongodb-kubernetes:0.1.0" imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/scripts/evergreen/operator-sdk/prepare-openshift-bundles-for-e2e.sh b/scripts/evergreen/operator-sdk/prepare-openshift-bundles-for-e2e.sh index 5d4c0848d..84af61e1d 100755 --- a/scripts/evergreen/operator-sdk/prepare-openshift-bundles-for-e2e.sh +++ b/scripts/evergreen/operator-sdk/prepare-openshift-bundles-for-e2e.sh @@ -265,7 +265,7 @@ generate_helm_charts # prepare openshift bundles the same way it's built in release process from the current sources and helm charts. export CERTIFIED_BUNDLE_IMAGE=${current_bundle_image} export VERSION="${current_incremented_operator_version_from_release_json}" -export OPERATOR_IMAGE="${OPERATOR_REGISTRY:-${REGISTRY}}/mongodb-enterprise-operator-ubi:${VERSION_ID}" +export OPERATOR_IMAGE="${OPERATOR_REGISTRY:-${REGISTRY}}/mongodb-kubernetes:${VERSION_ID}" header "Preparing OpenShift bundles:" scripts/evergreen/operator-sdk/prepare-openshift-bundles.sh diff --git a/scripts/evergreen/operator-sdk/prepare-openshift-bundles.sh b/scripts/evergreen/operator-sdk/prepare-openshift-bundles.sh index 82af2b2a9..80f68cfe7 100755 --- a/scripts/evergreen/operator-sdk/prepare-openshift-bundles.sh +++ b/scripts/evergreen/operator-sdk/prepare-openshift-bundles.sh @@ -8,7 +8,7 @@ source scripts/dev/set_env_context.sh RELEASE_JSON_PATH=${RELEASE_JSON_PATH:-"release.json"} VERSION=${VERSION:-$(jq -r .mongodbOperator < "${RELEASE_JSON_PATH}")} BUILD_DOCKER_IMAGES=${BUILD_DOCKER_IMAGES:-"false"} -OPERATOR_IMAGE=${OPERATOR_IMAGE:-"quay.io/mongodb/mongodb-enterprise-operator-ubi:${VERSION}"} +OPERATOR_IMAGE=${OPERATOR_IMAGE:-"quay.io/mongodb/mongodb-kubernetes:${VERSION}"} DOCKER_PLATFORM=${DOCKER_PLATFORM:-"linux/amd64"} mkdir -p bundle diff --git a/scripts/evergreen/periodic-cleanup-aws.py b/scripts/evergreen/periodic-cleanup-aws.py index 58da53913..e82d11ff4 100755 --- a/scripts/evergreen/periodic-cleanup-aws.py +++ b/scripts/evergreen/periodic-cleanup-aws.py @@ -12,7 +12,7 @@ "dev/mongodb-kubernetes-init-database", "dev/mongodb-kubernetes-init-ops-manager", "dev/mongodb-enterprise-ops-manager-ubi", - "dev/mongodb-enterprise-operator-ubi", + "dev/mongodb-kubernetes", ] REGISTRY_ID = "268558157000" REGION = "us-east-1"