Skip to content

Commit ccf22c8

Browse files
nammnmircea-cosbuclucian-tosa
authored
Standardize references from "mongodb-enterprise" to "mongodb-kubernetes (#59)
# Summary This pull request primarily focuses on renaming resources and references from "mongodb-enterprise" to "mongodb-kubernetes" across the codebase. The changes ensure consistency in naming conventions and align with the updated project branding. Below are the key changes grouped by theme: ### Resource and Binary Renaming * Updated the output binary name in `Makefile` from `mongodb-enterprise-operator` to `mongodb-kubernetes-operator`. * Changed the command in `manager.yaml` to use `/usr/local/bin/mongodb-kubernetes-operator` instead of `/usr/local/bin/mongodb-enterprise-operator`. * Updated the Helm chart template to reflect the new binary name `mongodb-kubernetes-operator`. ### Repository and Documentation Updates * Updated repository links in various files (e.g., `release.md`, `contributing.md`, `README.md`) to point to `https://github.com/mongodb/mongodb-kubernetes` instead of `https://github.com/mongodb/mongodb-enterprise-kubernetes`. [[1]](diffhunk://#diff-3287d0332561d9b3a3e49e6fbf359be8e64ea63948cb51644b2fd39a98a9e14cL13-R13) [[2]](diffhunk://#diff-2d3cf7d8624f3294812ec9b260038a65c6d07bb000112d7cd3c3c4fbab994870L7-R7) [[3]](diffhunk://#diff-dc7a1cff3b4f510d1ec11b6ea1fd9b47c58b84e85caf642c40b96099a70c5cf0L7-R7) * Adjusted references in `README.md` for the database Docker image to use `mongodb-kubernetes-database` in place of `mongodb-enterprise-database`. [[1]](diffhunk://#diff-f6b1e7c94eb10ecbe89d31e2ef44eeb2e619e0f4cbeaeaf7576b5806691370a6L4-R4) [[2]](diffhunk://#diff-f6b1e7c94eb10ecbe89d31e2ef44eeb2e619e0f4cbeaeaf7576b5806691370a6L18-R24) [[3]](diffhunk://#diff-f6b1e7c94eb10ecbe89d31e2ef44eeb2e619e0f4cbeaeaf7576b5806691370a6L42-R43) ### Dockerfile Adjustments * Updated Dockerfiles to copy licenses and binaries for `mongodb-kubernetes` instead of `mongodb-enterprise`. [[1]](diffhunk://#diff-fd294432ee408254a1b7e085778c6d37f5dda1559f9a00eb6a60032ded7ef23eL27-R33) [[2]](diffhunk://#diff-f120a790e38beeec71c14777de076fbfdc2ea4be538861e5773b32ea2fc04641L14-R14) [[3]](diffhunk://#diff-9fdf19780109f4e8f1cf96645e2433a28468805e74dd75a04046c6dbff7bc9caL55-R55) * Renamed directories and paths in Docker-related files to align with the `mongodb-kubernetes` naming convention. [[1]](diffhunk://#diff-2eabb1e65d9b4105e3d5fdd819682055cae2d9b6976e9a6be42f03a954bd86caL17-R20) [[2]](diffhunk://#diff-81b8af168263877468fa4e7b9b1e553e0a6535e0412db65e4566187718e14b9aL6-R13) ### Inventory and Image Naming * Updated image registry paths in inventory files (e.g., `database.yaml`, `test.yaml`) to use `mongodb-kubernetes` instead of `mongodb-enterprise`. [[1]](diffhunk://#diff-e24c4768fed13924984babc063731fa02b830bab12586a4d077ecf167ecd3eefL16-R16) [[2]](diffhunk://#diff-e24c4768fed13924984babc063731fa02b830bab12586a4d077ecf167ecd3eefL33-R33) [[3]](diffhunk://#diff-e24c4768fed13924984babc063731fa02b830bab12586a4d077ecf167ecd3eefL52-R52) [[4]](diffhunk://#diff-c3a9ac066cdb548a55140193dbaf6c1faab64db1b002c0db82bea289c77d5a98L14-R16) ### Miscellaneous * Modified the `generate_ssdlc_report.py` script to use `mongodb-kubernetes` for image names, except for "ops-manager" which retains its original naming convention. * Removed the unused `e2e-inventory.yaml` file from the `mongodb-community-operator` directory. These changes collectively ensure consistency in naming and branding across the project while removing outdated references to "mongodb-enterprise." ## Proof of Work - green ci ## Checklist - [x] Have you linked a jira ticket and/or is the ticket in the title? - [x] 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 --------- Co-authored-by: Mircea Cosbuc <[email protected]> Co-authored-by: Lucian Tosa <[email protected]>
1 parent 12d1b90 commit ccf22c8

File tree

58 files changed

+357
-1242
lines changed

Some content is hidden

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

58 files changed

+357
-1242
lines changed

.githooks/pre-commit

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ function generate_standalone_yaml() {
3939

4040
# generate normal public example
4141
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" ${HELM_OPTS[@]}
42-
cat "${FILES[@]}" >public/mongodb-enterprise.yaml
42+
cat "${FILES[@]}" >public/mongodb-kubernetes.yaml
4343
cat "helm_chart/crds/"* >public/crds.yaml
4444

4545
# generate openshift public example
4646
rm -rf "${charttmpdir:?}/*"
4747
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" --values helm_chart/values-openshift.yaml ${HELM_OPTS[@]}
48-
cat "${FILES[@]}" >public/mongodb-enterprise-openshift.yaml
48+
cat "${FILES[@]}" >public/mongodb-kubernetes-openshift.yaml
4949

5050
# generate openshift files for kustomize used for generating OLM bundle
5151
rm -rf "${charttmpdir:?}/*"
@@ -60,7 +60,7 @@ function generate_standalone_yaml() {
6060
# generate multi-cluster public example
6161
rm -rf "${charttmpdir:?}/*"
6262
helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" --values helm_chart/values-multi-cluster.yaml ${HELM_OPTS[@]}
63-
cat "${FILES[@]}" >public/mongodb-enterprise-multi-cluster.yaml
63+
cat "${FILES[@]}" >public/mongodb-kubernetes-multi-cluster.yaml
6464

6565
}
6666

.github/PULL_REQUEST_TEMPLATE/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refer to [Kubernetes Enterprise Operator Release Guide](https://wiki.corp.mongod
1010
## Project Tasks
1111

1212
- [ ] Update any finished ticket's `Fix Version` to this version.
13-
- [ ] Prepare release notes in [public repo](https://github.com/mongodb/mongodb-enterprise-kubernetes/releases/new).
13+
- [ ] Prepare release notes in [public repo](https://github.com/mongodb/mongodb-kubernetes/releases/new).
1414
- [ ] Prepare release notes in [DOCSP](https://jira.mongodb.org/secure/CreateIssueDetails!init.jspa?pid=14181&issuetype=3&summary=[MEKO]%20Kubernetes%20Enterprise%20Operator%20x.y.z%20Release%20Notes).
1515

1616
## Versioning

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/pkg/client
55
/vendor/
66
public/tools/multicluster/vendor
7-
docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator
7+
docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-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
@@ -49,7 +49,7 @@ 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-kubernetes-operator/content/mongodb-enterprise-operator.tar
52+
docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator.tar
5353
docker/mongodb-kubernetes-tests/helm_chart/
5454
docker/mongodb-kubernetes-tests/public/
5555
docker/mongodb-kubernetes-tests/requirements.txt

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-kubernetes-operator/content/mongodb-enterprise-operator main.go
302+
GOOS=linux GOARCH=amd64 go build -o docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator main.go
303303

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

RELEASE_NOTES.md

Lines changed: 249 additions & 249 deletions
Large diffs are not rendered by default.

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- -watch-resource=opsmanagers
3030
- -watch-resource=mongodbusers
3131
command:
32-
- /usr/local/bin/mongodb-enterprise-operator
32+
- /usr/local/bin/mongodb-kubernetes-operator
3333
resources:
3434
limits:
3535
cpu: 1100m

config/manifests/bases/mongodb-kubernetes.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ metadata:
1818
features.operators.openshift.io/token-auth-aws: "false"
1919
features.operators.openshift.io/token-auth-azure: "false"
2020
features.operators.openshift.io/token-auth-gcp: "false"
21-
repository: https://github.com/mongodb/mongodb-enterprise-kubernetes
21+
repository: https://github.com/mongodb/mongodb-kubernetes
2222
2323
name: mongodb-kubernetes.v0.0.0
2424
namespace: placeholder

docker/mongodb-kubernetes-database/Dockerfile.builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
## Contents
55
#
6-
# * licenses/mongodb-enterprise-database
6+
# * licenses/mongodb-kubernetes-database
77

88

99
FROM scratch
1010

1111

1212

13-
COPY LICENSE /data/licenses/mongodb-enterprise-database
13+
COPY LICENSE /data/licenses/mongodb-kubernetes-database

docker/mongodb-kubernetes-database/Dockerfile.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ USER 2000
5252
ENTRYPOINT ["sleep infinity"]
5353
{% endblock %}
5454

55-
COPY --from=base /data/licenses/mongodb-enterprise-database /licenses/mongodb-enterprise-database
55+
COPY --from=base /data/licenses/mongodb-kubernetes-database /licenses/mongodb-kubernetes-database
5656

5757
{% block healthcheck %}
5858
{% endblock %}

docker/mongodb-kubernetes-database/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MongoDB Enterprise Database
22

33
This directory hosts a Dockerfile that can be run locally for development purposes (see below) or
4-
as part of a Kubernetes deployment, using the [MongoDB Enterprise Kubernetes Operator](../mongodb-enterprise-operator).
4+
as part of a Kubernetes deployment, using the [MongoDB Enterprise Kubernetes Operator](../mongodb-kubernetes-operator).
55

66
### Running locally
77

@@ -15,13 +15,13 @@ For more details regarding the available options, run `make` or read the provide
1515
**See the status of all running Automation Agents:**
1616

1717
```bash
18-
for img in $(docker ps -a -f 'ancestor=dev/mongodb-enterprise-database' | tail -n +2 | awk '{print $1}'); do echo; echo "$img"; echo "---"; docker exec -t "$img" ps -ef; echo "---"; done
18+
for img in $(docker ps -a -f 'ancestor=dev/mongodb-kubernetes-database' | tail -n +2 | awk '{print $1}'); do echo; echo "$img"; echo "---"; docker exec -t "$img" ps -ef; echo "---"; done
1919
```
2020

2121
**Connect to a running container:**
2222

2323
```bash
24-
docker exec -it $(docker ps -a -f 'ancestor=dev/mongodb-enterprise-database' | tail -n +2 | awk '{print $1}') /bin/bash
24+
docker exec -it $(docker ps -a -f 'ancestor=dev/mongodb-kubernetes-database' | tail -n +2 | awk '{print $1}') /bin/bash
2525
```
2626

2727
## RHEL based Images
@@ -39,6 +39,6 @@ this images with.
3939
The dcar image needs to be built manually.
4040

4141
```bash
42-
docker build . -t 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-enterprise-database:1.5.3
43-
docker push 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-enterprise-database:1.5.3
42+
docker build . -t 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
43+
docker push 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
4444
```

0 commit comments

Comments
 (0)