Skip to content

Commit 12d1b90

Browse files
authored
Renaming "MongoDB Enterprise" with "MongoDB Kubernetes" (#52)
# Summary This pull request introduces a comprehensive renaming effort to replace "MongoDB Enterprise" with "MongoDB Kubernetes" across various files and configurations. The changes primarily focus on updating paths, labels, and references to align with the new naming convention. Below is a summary of the most important changes, grouped by theme: ### File and Path Updates: * Updated `.dockerignore` to replace the `docker/mongodb-enterprise-tests` directory with `docker/mongodb-kubernetes-tests`. * Renamed `docker/mongodb-enterprise-operator` to `docker/mongodb-kubernetes-operator` and updated references in `Dockerfile.builder` and related files. [[1]](diffhunk://#diff-9ca98c29d294f48d3d9c4f1c854ab0d18e1f150748a2b47a6a6ddf8657523063L4-R4) [[2]](diffhunk://#diff-9ca98c29d294f48d3d9c4f1c854ab0d18e1f150748a2b47a6a6ddf8657523063L51-R51) ### Makefile Adjustments: * Updated the `Makefile` to reflect the new directory structure and naming, including changes to paths for certificates, Python tests, and the operator binary. [[1]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L207-R210) [[2]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L283-R287) [[3]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L302-R302) ### Dockerfile Label Updates: * Updated labels in `Dockerfile.template` files to reflect the new "MongoDB Kubernetes" naming for the database, init database, and Ops Manager init images. [[1]](diffhunk://#diff-9fdf19780109f4e8f1cf96645e2433a28468805e74dd75a04046c6dbff7bc9caL8-R11) [[2]](diffhunk://#diff-191424211c774e51d314543eb911533a690bbf9c90a8275543c06903eaeb6d95L9-R16) [[3]](diffhunk://#diff-07261d9aa27a958d09b039f251f3795ce0625c5149777790068d48ea17617568L6-R11) * Renamed `docker/mongodb-enterprise-operator/Dockerfile.template` to `docker/mongodb-kubernetes-operator/Dockerfile.template` and updated its labels accordingly. ### Configuration Changes: * Adjusted the `working_dir` in `.evergreen-functions.yml` to point to the new `docker/mongodb-kubernetes-appdb-database` directory. ## Proof of Work - green ci; like here: [Patch](https://spruce.mongodb.com/version/6810933e484785000708fcd5/tasks?sorts=STATUS%3AASC%3BBASE_STATUS%3ADESC) ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you checked for release_note changes? ## Reminder (Please remove this when merging) - Please try to Approve or Reject Changes the PR, keep PRs in review as short as possible - Our Short Guide for PRs: [Link](https://docs.google.com/document/d/1T93KUtdvONq43vfTfUt8l92uo4e4SEEvFbIEKOxGr44/edit?tab=t.0) - Remember the following Communication Standards - use comment prefixes for clarity: * **blocking**: Must be addressed before approval. * **follow-up**: Can be addressed in a later PR or ticket. * **q**: Clarifying question. * **nit**: Non-blocking suggestions. * **note**: Side-note, non-actionable. Example: Praise * --> no prefix is considered a question
1 parent 0c3b3c2 commit 12d1b90

File tree

539 files changed

+76
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+76
-78
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
.generated/
88
vendor/
99
pkg/client/
10-
docker/mongodb-enterprise-tests
10+
docker/mongodb-kubernetes-tests
1111
scripts/
1212
samples/
1313
.multi_cluster_local_test_files/

.evergreen-functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ functions:
474474
build_and_push_appdb_database:
475475
- command: subprocess.exec
476476
params:
477-
working_dir: src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-enterprise-appdb-database
477+
working_dir: src/github.com/mongodb/mongodb-kubernetes/docker/mongodb-kubernetes-appdb-database
478478
binary: ./build_and_push_appdb_database_images.sh
479479
add_to_path:
480480
- ${workdir}/bin

.gitignore

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
/pkg/client
55
/vendor/
66
public/tools/multicluster/vendor
7-
docker/mongodb-enterprise-operator/content/mongodb-enterprise-operator
7+
docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator
88
docker/mongodb-kubernetes-database/content/mongodb-mms-automation-agent-version.properties
99
docker/mongodb-kubernetes-database/content/readinessprobe
1010
docker/mongodb-enterprise-ops-manager/scripts/mmsconfiguration
11-
docker/mongodb-enterprise-tests/public
11+
docker/mongodb-kubernetes-tests/public
1212

1313
my-*
1414
.vscode
@@ -42,20 +42,20 @@ public/architectures/**/.generated
4242
public/architectures/**/certs/*
4343
public/architectures/**/secrets/*
4444

45-
docker/mongodb-enterprise-appdb/content/readinessprobe
45+
docker/mongodb-kubernetes-appdb/content/readinessprobe
4646
mongodb-kubernetes
47-
docker/mongodb-enterprise-operator/Dockerfile
47+
docker/mongodb-kubernetes-operator/Dockerfile
4848
docker/mongodb-kubernetes-database/Dockerfile
4949
docker/mongodb-enterprise-ops-manager/Dockerfile
5050
docker/mongodb-kubernetes-init-database/Dockerfile
5151
docker/mongodb-kubernetes-init-ops-manager/Dockerfile
52-
docker/mongodb-enterprise-operator/content/mongodb-enterprise-operator.tar
53-
docker/mongodb-enterprise-tests/helm_chart/
54-
docker/mongodb-enterprise-tests/public/
55-
docker/mongodb-enterprise-tests/requirements.txt
56-
docker/mongodb-enterprise-tests/.flake8
57-
docker/mongodb-enterprise-tests/.pylintrc
58-
docker/mongodb-enterprise-tests/pyproject.toml
52+
docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator.tar
53+
docker/mongodb-kubernetes-tests/helm_chart/
54+
docker/mongodb-kubernetes-tests/public/
55+
docker/mongodb-kubernetes-tests/requirements.txt
56+
docker/mongodb-kubernetes-tests/.flake8
57+
docker/mongodb-kubernetes-tests/.pylintrc
58+
docker/mongodb-kubernetes-tests/pyproject.toml
5959

6060
bundle
6161

@@ -86,7 +86,7 @@ tmp
8686

8787
licenses_full.csv
8888
licenses_stderr
89-
docker/mongodb-enterprise-tests/.test_identifiers*
89+
docker/mongodb-kubernetes-tests/.test_identifiers*
9090

9191
logs-debug/
9292
/ssdlc-report/*

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ deploy-and-configure-operator: deploy-operator configure-operator
204204

205205
cert:
206206
@ openssl req -nodes -new -x509 -keyout ca-tls.key -out ca-tls.crt -extensions v3_ca -days 3650
207-
@ mv ca-tls.key ca-tls.crt docker/mongodb-enterprise-tests/tests/opsmanager/fixtures/
208-
@ cat docker/mongodb-enterprise-tests/tests/opsmanager/fixtures/ca-tls.crt \
209-
docker/mongodb-enterprise-tests/tests/opsmanager/fixtures/mongodb-download.crt \
210-
> docker/mongodb-enterprise-tests/tests/opsmanager/fixtures/ca-tls-full-chain.crt
207+
@ mv ca-tls.key ca-tls.crt docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/
208+
@ cat docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/ca-tls.crt \
209+
docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/mongodb-download.crt \
210+
> docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/ca-tls-full-chain.crt
211211

212212
.PHONY: recreate-e2e-multicluster-kind
213213
recreate-e2e-multicluster-kind:
@@ -280,11 +280,11 @@ golang-tests-race:
280280
sbom-tests:
281281
@ scripts/evergreen/run_python.sh -m pytest generate_ssdlc_report_test.py
282282

283-
# e2e tests are also in python and we will need to ignore them as they are in the docker/mongodb-enterprise-tests folder
284-
# additionally, we have one lib which we want to test which is in the =docker/mongodb-enterprise-tests folder.
283+
# e2e tests are also in python and we will need to ignore them as they are in the docker/mongodb-kubernetes-tests folder
284+
# additionally, we have one lib which we want to test which is in the =docker/mongodb-kubernetes-tests folder.
285285
python-tests:
286-
@ scripts/evergreen/run_python.sh -m pytest docker/mongodb-enterprise-tests/kubeobject
287-
@ scripts/evergreen/run_python.sh -m pytest --ignore=docker/mongodb-enterprise-tests
286+
@ scripts/evergreen/run_python.sh -m pytest docker/mongodb-kubernetes-tests/kubeobject
287+
@ scripts/evergreen/run_python.sh -m pytest --ignore=docker/mongodb-kubernetes-tests
288288

289289
generate-ssdlc-report:
290290
@ scripts/evergreen/run_python.sh generate_ssdlc_report.py
@@ -299,7 +299,7 @@ all-tests: test python-tests
299299

300300
# Build manager binary
301301
manager: generate fmt vet
302-
GOOS=linux GOARCH=amd64 go build -o docker/mongodb-enterprise-operator/content/mongodb-enterprise-operator main.go
302+
GOOS=linux GOARCH=amd64 go build -o docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator main.go
303303

304304
# Run against the configured Kubernetes cluster in ~/.kube/config
305305
run: generate fmt vet manifests

docker/mongodb-kubernetes-database/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ FROM {{ base_image }}
55

66
{% block labels %}
77

8-
LABEL name="MongoDB Enterprise Database" \
8+
LABEL name="MongoDB Kubernetes Database" \
99
version="{{ version }}" \
10-
summary="MongoDB Enterprise Database Image" \
11-
description="MongoDB Enterprise Database Image" \
10+
summary="MongoDB Kubernetes Database Image" \
11+
description="MongoDB Kubernetes Database Image" \
1212
vendor="MongoDB" \
1313
release="1" \
1414
maintainer="[email protected]"

docker/mongodb-kubernetes-init-database/Dockerfile.template

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ FROM {{ base_image }}
66
ARG version
77

88
{%- if is_appdb %}
9-
LABEL name="MongoDB Enterprise Init AppDB" \
10-
version="mongodb-enterprise-init-appdb-${version}" \
11-
summary="MongoDB Enterprise AppDB Init Image" \
9+
LABEL name="MongoDB Kubernetes Init AppDB" \
10+
version="mongodb-kubernetes-init-appdb-${version}" \
11+
summary="MongoDB Kubernetes AppDB Init Image" \
1212
description="Startup Scripts for MongoDB Enterprise Application Database for Ops Manager" \
1313
{%- else %}
14-
LABEL name="MongoDB Enterprise Init Database" \
15-
version="mongodb-enterprise-init-database-${version}" \
16-
summary="MongoDB Enterprise Database Init Image" \
14+
LABEL name="MongoDB Kubernetes Init Database" \
15+
version="mongodb-kubernetes-init-database-${version}" \
16+
summary="MongoDB Kubernetes Database Init Image" \
1717
description="Startup Scripts for MongoDB Enterprise Database" \
1818
{%- endif %}
1919
release="1" \

docker/mongodb-kubernetes-init-ops-manager/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ FROM ${imagebase} as base
33

44
FROM {{ base_image }}
55

6-
LABEL name="MongoDB Enterprise Ops Manager Init" \
6+
LABEL name="MongoDB Kubernetes Ops Manager Init" \
77
maintainer="[email protected]" \
88
vendor="MongoDB" \
9-
version="mongodb-enterprise-init-ops-manager-{{version}}" \
9+
version="mongodb-kubernetes-init-ops-manager-{{version}}" \
1010
release="1" \
11-
summary="MongoDB Enterprise Ops Manager Init Image" \
11+
summary="MongoDB Kubernetes Ops Manager Init Image" \
1212
description="Startup Scripts for MongoDB Enterprise Ops Manager"
1313

1414

docker/mongodb-enterprise-operator/Dockerfile.builder renamed to docker/mongodb-kubernetes-operator/Dockerfile.builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Dockerfile for Operator.
33
# to be called from git root
4-
# docker build . -f docker/mongodb-enterprise-operator/Dockerfile.builder
4+
# docker build . -f docker/mongodb-kubernetes-operator/Dockerfile.builder
55
#
66

77
FROM public.ecr.aws/docker/library/golang:1.24 as builder
@@ -48,4 +48,4 @@ FROM scratch
4848
COPY --from=builder /build/mongodb-enterprise-operator /data/
4949
COPY --from=builder /data/om_version_mapping.json /data/om_version_mapping.json
5050

51-
ADD docker/mongodb-enterprise-operator/licenses /data/licenses/
51+
ADD docker/mongodb-kubernetes-operator/licenses /data/licenses/

docker/mongodb-enterprise-operator/Dockerfile.template renamed to docker/mongodb-kubernetes-operator/Dockerfile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ FROM ${imagebase} as base
88
FROM {{ base_image }}
99

1010
{% block labels %}
11-
LABEL name="MongoDB Enterprise Operator" \
11+
LABEL name="MongoDB Kubernetes Operator" \
1212
maintainer="[email protected]" \
1313
vendor="MongoDB" \
1414
version="{{ version }}" \
1515
release="1" \
16-
summary="MongoDB Enterprise Operator Image" \
17-
description="MongoDB Enterprise Operator Image"
16+
summary="MongoDB Kubernetes Operator Image" \
17+
description="MongoDB Kubernetes Operator Image"
1818
{% endblock %}
1919

2020
{% block packages -%}

0 commit comments

Comments
 (0)