standardize references from "mongodb-enterprise" to "mongodb-kubernetes

.githooks/pre-commit

@@ -39,7 +39,7 @@ function generate_standalone_yaml() {
 
  # generate normal public example
  helm template --namespace mongodb -f helm_chart/values.yaml helm_chart --output-dir "${charttmpdir}" ${HELM_OPTS[@]}
- cat "${FILES[@]}" >public/mongodb-enterprise.yaml
+ cat "${FILES[@]}" >public/mongodb-kubernetes.yaml
  cat "helm_chart/crds/"* >public/crds.yaml
 
  # generate openshift public example

.github/PULL_REQUEST_TEMPLATE/release.md

@@ -10,7 +10,7 @@ refer to [Kubernetes Enterprise Operator Release Guide](https://wiki.corp.mongod
 ## Project Tasks
 
 - [ ] Update any finished ticket's `Fix Version` to this version.
-- [ ] Prepare release notes in [public repo](https://github.com/mongodb/mongodb-enterprise-kubernetes/releases/new).
+- [ ] Prepare release notes in [public repo](https://github.com/mongodb/mongodb-kubernetes/releases/new).
 - [ ] 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).
 
 ## Versioning

.gitignore

@@ -4,10 +4,10 @@
 /pkg/client
 /vendor/
 public/tools/multicluster/vendor
-docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator
+docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator
 docker/mongodb-kubernetes-database/content/mongodb-mms-automation-agent-version.properties
 docker/mongodb-kubernetes-database/content/readinessprobe
-docker/mongodb-enterprise-ops-manager/scripts/mmsconfiguration
+cdocker/mongodb-enterprise-ops-manager/scripts/mmsconfiguration
 docker/mongodb-kubernetes-tests/public
 
 my-*
@@ -46,10 +46,10 @@ docker/mongodb-kubernetes-appdb/content/readinessprobe
 mongodb-kubernetes
 docker/mongodb-kubernetes-operator/Dockerfile
 docker/mongodb-kubernetes-database/Dockerfile
-docker/mongodb-enterprise-ops-manager/Dockerfile
+docker/mongodb-kubernetes-ops-manager/Dockerfile
 docker/mongodb-kubernetes-init-database/Dockerfile
 docker/mongodb-kubernetes-init-ops-manager/Dockerfile
-docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator.tar
+docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator.tar
 docker/mongodb-kubernetes-tests/helm_chart/
 docker/mongodb-kubernetes-tests/public/
 docker/mongodb-kubernetes-tests/requirements.txt

Makefile

@@ -299,7 +299,7 @@ all-tests: test python-tests
 
 # Build manager binary
 manager: generate fmt vet
-GOOS=linux GOARCH=amd64 go build -o docker/mongodb-kubernetes-operator/content/mongodb-enterprise-operator main.go
+GOOS=linux GOARCH=amd64 go build -o docker/mongodb-kubernetes-operator/content/mongodb-kubernetes-operator main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet manifests

config/manager/manager.yaml

@@ -29,7 +29,7 @@ spec:
  - -watch-resource=opsmanagers
  - -watch-resource=mongodbusers
  command:
- - /usr/local/bin/mongodb-enterprise-operator
+ - /usr/local/bin/mongodb-kubernetes-operator
  resources:
  limits:
  cpu: 1100m

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

@@ -18,7 +18,7 @@ metadata:
  features.operators.openshift.io/token-auth-aws: "false"
  features.operators.openshift.io/token-auth-azure: "false"
  features.operators.openshift.io/token-auth-gcp: "false"
- repository: https://github.com/mongodb/mongodb-enterprise-kubernetes
+ repository: https://github.com/mongodb/mongodb-kubernetes
  support: support@mongodb.com
  name: mongodb-kubernetes.v0.0.0
  namespace: placeholder

docker/mongodb-enterprise-ops-manager/Dockerfile.builder

@@ -14,7 +14,7 @@ COPY --from=readiness_builder /data/scripts/mmsconfiguration /data/scripts/mmsco
 COPY --from=readiness_builder /data/scripts/backup-daemon-readiness-probe /data/scripts/backup-daemon-readiness-probe
 
 # After v2.0, when non-Static Agent images will be removed, please ensure to copy those files
-# into ./docker/mongodb-enterprise-ops-manager directory. Leaving it this way will make the maintenance easier.
+# into ./docker/mongodb-kubernetes-ops-manager directory. Leaving it this way will make the maintenance easier.
 COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/docker-entry-point.sh /data/scripts
 COPY ./docker/mongodb-kubernetes-init-ops-manager/scripts/backup-daemon-liveness-probe.sh /data/scripts
-COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-enterprise-ops-manager
+COPY ./docker/mongodb-kubernetes-init-ops-manager/LICENSE /data/licenses/mongodb-kubernetes-ops-manager

docker/mongodb-kubernetes-database/Dockerfile.builder

@@ -3,11 +3,11 @@
 #
 ## Contents
 #
-# * licenses/mongodb-enterprise-database
+# * licenses/mongodb-kubernetes-database
 
 
 FROM scratch
 
 
 
-COPY LICENSE /data/licenses/mongodb-enterprise-database
+COPY LICENSE /data/licenses/mongodb-kubernetes-database

docker/mongodb-kubernetes-database/Dockerfile.template

@@ -52,7 +52,7 @@ USER 2000
 ENTRYPOINT ["sleep infinity"]
 {% endblock %}
 
-COPY --from=base /data/licenses/mongodb-enterprise-database /licenses/mongodb-enterprise-database
+COPY --from=base /data/licenses/mongodb-kubernetes-database /licenses/mongodb-kubernetes-database
 
 {% block healthcheck %}
 {% endblock %}

docker/mongodb-kubernetes-database/README.md

@@ -1,7 +1,7 @@
 # MongoDB Enterprise Database
 
 This directory hosts a Dockerfile that can be run locally for development purposes (see below) or
-as part of a Kubernetes deployment, using the [MongoDB Enterprise Kubernetes Operator](../mongodb-enterprise-operator).
+as part of a Kubernetes deployment, using the [MongoDB Enterprise Kubernetes Operator](../mongodb-kubernetes-operator).
 
 ### Running locally
 
@@ -15,13 +15,13 @@ For more details regarding the available options, run `make` or read the provide
 **See the status of all running Automation Agents:**
 
 ```bash
-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
+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
 ```
 
 **Connect to a running container:**
 
 ```bash
-docker exec -it $(docker ps -a -f 'ancestor=dev/mongodb-enterprise-database' | tail -n +2 | awk '{print $1}') /bin/bash
+docker exec -it $(docker ps -a -f 'ancestor=dev/mongodb-kubernetes-database' | tail -n +2 | awk '{print $1}') /bin/bash
 ```
 
 ## RHEL based Images
@@ -39,6 +39,6 @@ this images with.
 The dcar image needs to be built manually.
 
 ```bash
-docker build . -t 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-enterprise-database:1.5.3
-docker push 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-enterprise-database:1.5.3
+docker build . -t 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
+docker push 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/usaf/mongodb-kubernetes-database:1.5.3
 ```

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

@@ -11,4 +11,4 @@ RUN CGO_ENABLED=0 go build -a -buildvcs=false -o /data/scripts/backup-daemon-rea
 COPY scripts/docker-entry-point.sh /data/scripts/
 COPY scripts/backup-daemon-liveness-probe.sh /data/scripts/
 
-COPY LICENSE /data/licenses/mongodb-enterprise-ops-manager
+COPY LICENSE /data/licenses/mongodb-kubernetes-ops-manager

docker/mongodb-kubernetes-operator/Dockerfile.template

@@ -24,13 +24,13 @@ LABEL name="MongoDB Kubernetes Operator" \
 {% endblock %}
 
 
-COPY --from=base /data/mongodb-enterprise-operator /usr/local/bin/mongodb-enterprise-operator
+COPY --from=base /data/mongodb-enterprise-operator /usr/local/bin/mongodb-kubernetes-operator
 COPY --from=base /data/om_version_mapping.json /usr/local/om_version_mapping.json
 COPY --from=base /data/licenses /licenses/
 
 USER 2000
 
-ENTRYPOINT exec /usr/local/bin/mongodb-enterprise-operator
+ENTRYPOINT exec /usr/local/bin/mongodb-kubernetes-operator
 
 {% block healthcheck %}
 {% endblock %}

docs/mongodbcommunity/contributing.md

@@ -4,7 +4,7 @@ First you need to get familiar with the [Architecture guide](architecture.md), w
 from a high perspective how everything works together.
 
 After our experience building the [Enterprise MongoDB Kubernetes
-Operator](https://github.com/mongodb/mongodb-enterprise-kubernetes), we have
+Operator](https://github.com/mongodb/mongodb-kubernetes), we have
 realized that it is very important to have a clean environment to work, and as such we have
 adopted a strategy that makes it easier for everyone to contribute.
 
@@ -176,7 +176,7 @@ make test
 ### E2E Tests
 
 If this is the first time running E2E tests, you will need to ensure that you have built and pushed
-all images required by the E2E tests. You can do this by running the following command, 
+all images required by the E2E tests. You can do this by running the following command,
 or with the additional `IMG_BUILD_ARGS=--insecure` described above.
 
 ```sh

generate_ssdlc_report.py

@@ -120,8 +120,14 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]:
 
 def convert_to_image_names(supported_images: Dict[str, SupportedImage]):
  for supported_image in supported_images:
- supported_images[supported_image].image_pull_spec = f"quay.io/mongodb/mongodb-enterprise-{supported_image}-ubi"
- supported_images[supported_image].name = f"mongodb-enterprise-{supported_image}-ubi"
+ if supported_image == "ops-manager":
+ supported_images[supported_image].image_pull_spec = (
+ f"quay.io/mongodb/mongodb-enterprise-{supported_image}-ubi"
+ )
+ supported_images[supported_image].name = f"mongodb-enterprise-{supported_image}-ubi"
+ else:
+ supported_images[supported_image].image_pull_spec = f"quay.io/mongodb/mongodb-kubernetes-{supported_image}"
+ supported_images[supported_image].name = f"mongodb-kubernetes-{supported_image}"
  return supported_images
 
 

generate_ssdlc_report_test.py

@@ -25,7 +25,7 @@ def test_report_generation():
  # For example, when we release a new Ops Manager or Agent image, we upload the corresponding SBOM Lite
  # on d+1. Then on d+2 we have the Augmented SBOM available for download. This situation is perfectly normal
  # but causes this test to fail. Therefore, we ignore these errors here.
- generate_ssdlc_report.generate_ssdlc_report(True)
+ generate_ssdlc_report.generate_ssdlc_report(ignore_sbom_download_errors=True)
 
  # Then
  assert os.path.exists(f"{current_directory}/ssdlc-report/MEKO-{current_version}")

helm_chart/templates/operator.yaml

@@ -57,7 +57,7 @@ spec:
  - {{ . }}
  {{- end }}
  command:
- - /usr/local/bin/mongodb-enterprise-operator
+ - /usr/local/bin/mongodb-kubernetes-operator
  {{- end }}
  {{- if .Values.multiCluster.clusters }}
  volumeMounts:

inventories/database.yaml

@@ -13,7 +13,7 @@ images:
  task_type: docker_build
  dockerfile: Dockerfile.builder
  output:
- - registry: $(inputs.params.registry)/mongodb-enterprise-database-context
+ - registry: $(inputs.params.registry)/mongodb-kubernetes-database-context
  tag: $(inputs.params.version_id)
 
  - name: init-appdb-template-ubi
@@ -30,7 +30,7 @@ images:
  dockerfile: $(stages['init-appdb-template-ubi'].outputs[0].dockerfile)
  tags: ["ubi"]
  buildargs:
- imagebase: $(inputs.params.registry)/mongodb-enterprise-database-context:$(inputs.params.version_id)
+ imagebase: $(inputs.params.registry)/mongodb-kubernetes-database-context:$(inputs.params.version_id)
  output:
  - registry: $(inputs.params.registry)/mongodb-kubernetes-database
  tag: $(inputs.params.version_id)
@@ -49,7 +49,7 @@ images:
  task_type: tag_image
  tags: ["release"]
  source:
- registry: $(inputs.params.registry)/mongodb-enterprise-database-context
+ registry: $(inputs.params.registry)/mongodb-kubernetes-database-context
  tag: $(inputs.params.version_id)
  destination:
  - registry: $(inputs.params.quay_registry)

inventories/test.yaml

@@ -11,7 +11,7 @@ images:
  buildargs:
  PYTHON_VERSION: $(inputs.params.python_version)
  output:
- - registry: $(inputs.params.registry)/mongodb-enterprise-tests
+ - registry: $(inputs.params.registry)/mongodb-kubernetes-tests
  tag: latest
- - registry: $(inputs.params.registry)/mongodb-enterprise-tests
+ - registry: $(inputs.params.registry)/mongodb-kubernetes-tests
  tag: $(inputs.params.version_id)

mongodb-community-operator/README.md

@@ -4,7 +4,7 @@
 
 This is a [Kubernetes Operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) which deploys MongoDB Community into Kubernetes clusters.
 
-If you are a MongoDB Enterprise customer, or need Enterprise features such as Backup, you can use the [MongoDB Enterprise Operator for Kubernetes](https://github.com/mongodb/mongodb-enterprise-kubernetes).
+If you are a MongoDB Enterprise customer, or need Enterprise features such as Backup, you can use the [MongoDB Enterprise Operator for Kubernetes](https://github.com/mongodb/mongodb-kubernetes).
 
 Here is a talk from MongoDB Live 2020 about the Community Operator:
 * [Run it in Kubernetes! Community and Enterprise MongoDB in Containers](https://www.youtube.com/watch?v=2Xszdg-4T6A&t=1368s)