Skip to content

Commit a0b99f1

Browse files
nammnJulien-Benmircea-cosbucEvergreen
authored
release mck 1.0.0 (#71)
# Summary Merge branch back to master from `release-1.0.0` ## Proof of Work <!-- Enter your proof that it works here.--> ## 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? - [ ] 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: Julien Benhaim <[email protected]> Co-authored-by: mircea-cosbuc <[email protected]> Co-authored-by: Mircea Cosbuc <[email protected]> Co-authored-by: Julien-Ben <[email protected]> Co-authored-by: Evergreen <[email protected]>
1 parent 105450c commit a0b99f1

File tree

88 files changed

+2535
-397
lines changed

Some content is hidden

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

88 files changed

+2535
-397
lines changed

‎.evergreen-functions.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -393,17 +393,6 @@ functions:
393393
echo "Enabling QEMU building for Docker"
394394
docker run --rm --privileged 268558157000.dkr.ecr.eu-west-1.amazonaws.com/docker-hub-mirrors/multiarch/qemu-user-static --reset -p yes
395395
396-
upload_dockerfiles:
397-
- command: s3.put
398-
params:
399-
aws_key: ${enterprise_aws_access_key_id}
400-
aws_secret: ${enterprise_aws_secret_access_key}
401-
local_file: src/github.com/mongodb/mongodb-kubernetes/public/dockerfiles-${triggered_by_git_tag}.tgz
402-
remote_file: bundles/dockerfiles-${triggered_by_git_tag}.tgz
403-
bucket: operator-e2e-bundles
404-
permissions: public-read
405-
content_type: application/x-binary
406-
407396
# upload_e2e_logs has the responsibility of dumping as much information as
408397
# possible into the S3 bucket that corresponds to this ${version}. The
409398
# Kubernetes cluster where the test finished running, should still be

‎.evergreen.yml‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -312,19 +312,11 @@ tasks:
312312
- func: clone
313313
- func: setup_building_host
314314
- func: quay_login
315+
- func: setup_docker_sbom
315316
- func: pipeline
316317
vars:
317318
image_name: agent
318319

319-
- name: upload_dockerfiles
320-
tags: [ "image_release" ]
321-
allowed_requesters: [ "patch", "github_tag" ]
322-
commands:
323-
- func: clone
324-
- func: setup_building_host
325-
- func: build-dockerfiles
326-
- func: upload_dockerfiles
327-
328320
# pct only triggers this variant once a new agent image is out
329321
- name: release_agent
330322
# this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
@@ -1372,8 +1364,6 @@ buildvariants:
13721364
- name: e2e_operator_race_with_telemetry_task_group
13731365

13741366
- name: e2e_smoke
1375-
# TODO: CLOUDP-310820 - After 1.0.0 release we need re-enabled this
1376-
disable: true
13771367
display_name: e2e_smoke
13781368
tags: [ "e2e_test_suite" ]
13791369
run_on:
@@ -1385,8 +1375,6 @@ buildvariants:
13851375
- name: e2e_smoke_task_group
13861376

13871377
- name: e2e_static_smoke
1388-
# TODO: CLOUDP-310820 - After 1.0.0 release we need re-enabled this
1389-
disable: true
13901378
display_name: e2e_static_smoke
13911379
tags: [ "e2e_test_suite" ]
13921380
run_on:
@@ -1782,20 +1770,6 @@ buildvariants:
17821770
tasks:
17831771
- name: run_conditionally_prepare_and_upload_openshift_bundles
17841772

1785-
- name: upload_dockerfiles
1786-
display_name: upload_dockerfiles
1787-
tags: [ "release" ]
1788-
allowed_requesters: [ "patch", "github_tag" ]
1789-
# CLOUDP-182323 This ensures that there will be Operator Dockerfile available in S3 before
1790-
# syncing and uploading the bundle TAR archive.
1791-
depends_on:
1792-
- name: release_operator
1793-
variant: release_images
1794-
run_on:
1795-
- ubuntu2204-small
1796-
tasks:
1797-
- name: upload_dockerfiles
1798-
17991773
# It will be called by pct while bumping the agent cloud manager image
18001774
- name: release_agent
18011775
display_name: (Static Containers) Release Agent matrix

‎.githooks/pre-commit‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mkdir -p "$(go env GOPATH)/bin"
1818

1919
function update_mco_tests() {
2020
echo "Regenerating MCO evergreen tests configuration"
21-
python scripts/evergreen/e2e/mco/create_mco_tests.py > .evergreen-mco.yml
21+
python scripts/evergreen/e2e/mco/create_mco_tests.py >.evergreen-mco.yml
2222
git add .evergreen-mco.yml
2323
}
2424

@@ -156,8 +156,8 @@ run_shellcheck() {
156156
local file="$1"
157157
echo "Running shellcheck on $file"
158158
if ! shellcheck -x "$file" -e SC2154 -e SC1091 -e SC1090 -e SC2148 -o require-variable-braces -P "scripts"; then
159-
echo "shellcheck failed on $file"
160-
exit 1
159+
echo "shellcheck failed on $file"
160+
exit 1
161161
fi
162162
}
163163

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
256256
BUNDLE_IMG ?= controller-bundle:$(VERSION)
257257

258258
# Image URL to use all building/pushing image targets
259-
IMG ?= mongodb-enterprise-operator:latest
259+
IMG ?= mongodb-kubernetes-operator:latest
260260
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
261261
CRD_OPTIONS ?= "crd"
262262

‎config/manager/manager.yaml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ spec:
2222
serviceAccountName: mongodb-kubernetes-operator
2323
containers:
2424
- name: mongodb-kubernetes-operator
25-
image: "quay.io/mongodb/mongodb-kubernetes:0.1.0"
25+
image: "quay.io/mongodb/mongodb-kubernetes:1.0.0"
2626
imagePullPolicy: Always
2727
args:
2828
- -watch-resource=mongodb
2929
- -watch-resource=opsmanagers
3030
- -watch-resource=mongodbusers
31+
- -watch-resource=mongodbcommunity
3132
command:
3233
- /usr/local/bin/mongodb-kubernetes-operator
3334
resources:
@@ -66,21 +67,21 @@ spec:
6667
- name: INIT_DATABASE_IMAGE_REPOSITORY
6768
value: quay.io/mongodb/mongodb-kubernetes-init-database
6869
- name: INIT_DATABASE_VERSION
69-
value: 0.1.0
70+
value: 1.0.0
7071
- name: DATABASE_VERSION
71-
value: 0.1.0
72+
value: 1.0.0
7273
# Ops Manager
7374
- name: OPS_MANAGER_IMAGE_REPOSITORY
7475
value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
7576
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
7677
value: quay.io/mongodb/mongodb-kubernetes-init-ops-manager
7778
- name: INIT_OPS_MANAGER_VERSION
78-
value: 0.1.0
79+
value: 1.0.0
7980
# AppDB
8081
- name: INIT_APPDB_IMAGE_REPOSITORY
8182
value: quay.io/mongodb/mongodb-kubernetes-init-appdb
8283
- name: INIT_APPDB_VERSION
83-
value: 0.1.0
84+
value: 1.0.0
8485
- name: OPS_MANAGER_IMAGE_PULL_POLICY
8586
value: Always
8687
- name: AGENT_IMAGE
@@ -119,48 +120,48 @@ spec:
119120
- name: MDB_COMMUNITY_IMAGE_TYPE
120121
value: "ubi8"
121122
# Community Env Vars End
122-
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_0_1_0
123-
value: "quay.io/mongodb/mongodb-kubernetes-database:0.1.0"
124-
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_0_1_0
125-
value: "quay.io/mongodb/mongodb-kubernetes-init-database:0.1.0"
126-
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_0_1_0
127-
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:0.1.0"
128-
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_0_1_0
129-
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:0.1.0"
123+
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_0_0
124+
value: "quay.io/mongodb/mongodb-kubernetes-database:1.0.0"
125+
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_0_0
126+
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.0.0"
127+
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_0_0
128+
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.0.0"
129+
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_0_0
130+
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.0.0"
130131
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
131132
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
132-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_0_1_0
133-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_0.1.0"
133+
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_0
134+
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.0"
134135
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
135136
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
136-
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_0_1_0
137-
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_0.1.0"
137+
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_0
138+
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.0"
138139
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
139140
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
140141
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
141142
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
142-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_0_1_0
143-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_0.1.0"
143+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_0
144+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.0"
144145
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
145146
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
146-
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_0_1_0
147-
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_0.1.0"
147+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_0
148+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.0"
148149
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
149150
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
150-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_0_1_0
151-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_0.1.0"
151+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_0
152+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.0"
152153
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
153154
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
154-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_0_1_0
155-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_0.1.0"
155+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_0
156+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.0"
156157
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
157158
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
158-
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_0_1_0
159-
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_0.1.0"
159+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_0
160+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.0"
160161
- name: RELATED_IMAGE_AGENT_IMAGE_13_33_0_9442_1
161162
value: "quay.io/mongodb/mongodb-agent-ubi:13.33.0.9442-1"
162-
- name: RELATED_IMAGE_AGENT_IMAGE_13_33_0_9442_1_0_1_0
163-
value: "quay.io/mongodb/mongodb-agent-ubi:13.33.0.9442-1_0.1.0"
163+
- name: RELATED_IMAGE_AGENT_IMAGE_13_33_0_9442_1_1_0_0
164+
value: "quay.io/mongodb/mongodb-agent-ubi:13.33.0.9442-1_1.0.0"
164165
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
165166
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
166167
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
capabilities: Deep Insights
77
categories: Database
88
certified: "true"
9-
containerImage: quay.io/mongodb/mongodb-kubernetes:0.1.0
9+
containerImage: quay.io/mongodb/mongodb-kubernetes:1.0.0
1010
createdAt: ""
1111
description: The MongoDB Enterprise Kubernetes Operator enables easy deploys of
1212
MongoDB into Kubernetes clusters, using our management, monitoring and backup

‎docker/mongodb-kubernetes-tests/tests/upgrades/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def downscale_operator_deployment(deployment_name: str, namespace: str):
4141
return
4242
except ApiException as e:
4343
if e.status == 404:
44-
logger.warning(f"'{deployment_name}' not found while waiting for downscale")
45-
return
44+
logger.error(f"'{deployment_name}' not found while waiting for downscale")
45+
raise
4646
else:
4747
logger.error(f"Error while waiting for downscale: {e}")
4848
raise

‎docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_appdb_tls.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from kubetester.opsmanager import MongoDBOpsManager
77
from pytest import fixture, mark
88
from tests.conftest import (
9+
LEGACY_MULTI_CLUSTER_OPERATOR_NAME,
910
LEGACY_OPERATOR_NAME,
1011
create_appdb_certs,
1112
install_official_operator,
@@ -116,7 +117,8 @@ def test_create_om_non_tls(ops_manager_non_tls: MongoDBOpsManager):
116117
def test_downscale_latest_official_operator(namespace: str):
117118
# Scale down the existing operator deployment to 0. This is needed as long as the
118119
# `official_operator` fixture installs the MEKO operator.
119-
downscale_operator_deployment(deployment_name=LEGACY_OPERATOR_NAME, namespace=namespace)
120+
deployment_name = LEGACY_MULTI_CLUSTER_OPERATOR_NAME if is_multi_cluster() else LEGACY_OPERATOR_NAME
121+
downscale_operator_deployment(deployment_name=deployment_name, namespace=namespace)
120122

121123

122124
@mark.e2e_operator_upgrade_appdb_tls

‎docs/migration/community-operator-migration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ kubectl scale deployment mongodb-community-operator --replicas=0
7575
Deploy the new MCK Helm release with your updated values:
7676

7777
```bash
78-
helm install mongodb-kubernetes-operator mongodb/enterprise-operator -f values.yaml
78+
helm install mongodb-kubernetes-operator mongodb/mongodb-kubernetes -f values.yaml
7979
```
8080

8181
⚠️ Warning: Ensure the MCK chart is installed with a different release name than the prior community operator chart. By default, the new MCK chart uses a different `operator.name`, which differs from the community operator.

‎generate_ssdlc_report.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]:
104104
Subreport.AGENT,
105105
)
106106

107-
supported_images["mongodb-enterprise-cli"] = SupportedImage(
107+
supported_images["mongodb-kubernetes-cli"] = SupportedImage(
108108
[release["mongodbOperator"]],
109-
"mongodb-enterprise-cli",
110-
"mongodb-enterprise-cli",
109+
"mongodb-kubernetes-cli",
110+
"mongodb-kubernetes-cli",
111111
"MongoDB Kubernetes Kubernetes Operator CLI",
112112
list(),
113113
["linux/amd64", "linux/arm64", "darwin/amd64", "darwin/arm64"],
@@ -125,6 +125,9 @@ def convert_to_image_names(supported_images: Dict[str, SupportedImage]):
125125
f"quay.io/mongodb/mongodb-enterprise-{supported_image}-ubi"
126126
)
127127
supported_images[supported_image].name = f"mongodb-enterprise-{supported_image}-ubi"
128+
elif supported_image == "mongodb-kubernetes":
129+
supported_images[supported_image].image_pull_spec = f"quay.io/mongodb/{supported_image}"
130+
supported_images[supported_image].name = supported_image
128131
else:
129132
supported_images[supported_image].image_pull_spec = f"quay.io/mongodb/mongodb-kubernetes-{supported_image}"
130133
supported_images[supported_image].name = f"mongodb-kubernetes-{supported_image}"

0 commit comments

Comments
 (0)