Skip to content

Rename operator image #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm_chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions inventory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mongodb-community-operator/scripts/ci/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion mongodb-community-operator/test/e2e/setup/test_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/mongodb-enterprise-multi-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/mongodb-enterprise-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/mongodb-enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/evergreen/periodic-cleanup-aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down