Skip to content

CLOUDP-329266: Bump Ops Manager Container Image version to 7.0.16 #223

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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 .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include:
variables:
- &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change

- &ops_manager_70_latest 7.0.15 # The order/index is important, since these are anchors. Please do not change
- &ops_manager_70_latest 7.0.16 # The order/index is important, since these are anchors. Please do not change

- &ops_manager_80_latest 8.0.11 # The order/index is important, since these are anchors. Please do not change

Expand Down
10 changes: 10 additions & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_0_1
Expand Down Expand Up @@ -274,6 +282,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_16
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.16"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import kubernetes
from kubetester.awss3client import s3_endpoint
from kubetester.kubetester import KubernetesTester
from kubetester.kubetester import fixture as yaml_fixture
from kubetester.opsmanager import MongoDBOpsManager
from tests.common.constants import S3_BLOCKSTORE_NAME, S3_OPLOG_NAME
Expand All @@ -22,13 +23,13 @@ def ops_manager_multi_cluster_with_tls_s3_backups(
resource.set_appdb_version(custom_appdb_version)

# configure S3 Blockstore
resource["spec"]["backup"]["s3Stores"][0]["name"] = S3_BLOCKSTORE_NAME
resource["spec"]["backup"]["s3Stores"][0]["name"] = KubernetesTester.random_k8s_name(S3_BLOCKSTORE_NAME)
resource["spec"]["backup"]["s3Stores"][0]["s3SecretRef"]["name"] = S3_BLOCKSTORE_NAME + "-secret"
resource["spec"]["backup"]["s3Stores"][0]["s3BucketEndpoint"] = s3_endpoint(AWS_REGION)
resource["spec"]["backup"]["s3Stores"][0]["s3BucketName"] = s3_bucket_blockstore
resource["spec"]["backup"]["s3Stores"][0]["s3RegionOverride"] = AWS_REGION
# configure S3 Oplog
resource["spec"]["backup"]["s3OpLogStores"][0]["name"] = S3_OPLOG_NAME
resource["spec"]["backup"]["s3OpLogStores"][0]["name"] = KubernetesTester.random_k8s_name(S3_OPLOG_NAME)
resource["spec"]["backup"]["s3OpLogStores"][0]["s3SecretRef"]["name"] = S3_OPLOG_NAME + "-secret"
resource["spec"]["backup"]["s3OpLogStores"][0]["s3BucketEndpoint"] = s3_endpoint(AWS_REGION)
resource["spec"]["backup"]["s3OpLogStores"][0]["s3BucketName"] = s3_bucket_oplog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
from kubetester.omtester import OMTester
from kubetester.opsmanager import MongoDBOpsManager
from kubetester.phase import Phase
from pymongo.errors import ServerSelectionTimeoutError
from pytest import fixture, mark
from tests.common.constants import (
MONGODB_PORT,
S3_BLOCKSTORE_NAME,
S3_OPLOG_NAME,
TEST_DATA,
)
from tests.common.ops_manager.multi_cluster import (
Expand Down Expand Up @@ -143,9 +140,12 @@ def test_om_s3_stores(
ops_manager: MongoDBOpsManager,
central_cluster_client: kubernetes.client.ApiClient,
):
s3_blockstore_name = ops_manager["spec"]["backup"]["s3Stores"][0]["name"]
s3_oplog_name = ops_manager["spec"]["backup"]["s3OpLogStores"][0]["name"]

om_tester = ops_manager.get_om_tester(api_client=central_cluster_client)
om_tester.assert_s3_stores([{"id": S3_BLOCKSTORE_NAME, "s3RegionOverride": AWS_REGION}])
om_tester.assert_oplog_s3_stores([{"id": S3_OPLOG_NAME, "s3RegionOverride": AWS_REGION}])
om_tester.assert_s3_stores([{"id": s3_blockstore_name, "s3RegionOverride": AWS_REGION}])
om_tester.assert_oplog_s3_stores([{"id": s3_oplog_name, "s3RegionOverride": AWS_REGION}])


@mark.e2e_multi_cluster_appdb_s3_based_backup_restore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from kubetester import create_or_update_secret, try_load
from kubetester.awss3client import AwsS3Client, s3_endpoint
from kubetester.kubetester import KubernetesTester
from kubetester.kubetester import fixture as yaml_fixture
from kubetester.opsmanager import MongoDBOpsManager
from kubetester.phase import Phase
Expand Down Expand Up @@ -77,13 +78,13 @@ def ops_manager(

custom_certificate = {"name": S3_NOT_WORKING_CA, "key": "ca-pem"}

resource["spec"]["backup"]["s3Stores"][0]["name"] = S3_BLOCKSTORE_NAME
resource["spec"]["backup"]["s3Stores"][0]["name"] = KubernetesTester.random_k8s_name(S3_BLOCKSTORE_NAME)
resource["spec"]["backup"]["s3Stores"][0]["s3SecretRef"]["name"] = S3_BLOCKSTORE_NAME + "-secret"
resource["spec"]["backup"]["s3Stores"][0]["s3BucketEndpoint"] = s3_endpoint(AWS_REGION)
resource["spec"]["backup"]["s3Stores"][0]["s3BucketName"] = s3_bucket_blockstore
resource["spec"]["backup"]["s3Stores"][0]["s3RegionOverride"] = AWS_REGION
resource["spec"]["backup"]["s3Stores"][0]["customCertificateSecretRefs"] = [custom_certificate]
resource["spec"]["backup"]["s3OpLogStores"][0]["name"] = S3_OPLOG_NAME
resource["spec"]["backup"]["s3OpLogStores"][0]["name"] = KubernetesTester.random_k8s_name(S3_OPLOG_NAME)
resource["spec"]["backup"]["s3OpLogStores"][0]["s3SecretRef"]["name"] = S3_OPLOG_NAME + "-secret"
resource["spec"]["backup"]["s3OpLogStores"][0]["s3BucketEndpoint"] = s3_endpoint(AWS_REGION)
resource["spec"]["backup"]["s3OpLogStores"][0]["s3BucketName"] = s3_bucket_oplog
Expand Down Expand Up @@ -138,9 +139,12 @@ def test_om_s3_stores(
self,
ops_manager: MongoDBOpsManager,
):
s3_blockstore_name = ops_manager["spec"]["backup"]["s3Stores"][0]["name"]
s3_oplog_name = ops_manager["spec"]["backup"]["s3OpLogStores"][0]["name"]

om_tester = ops_manager.get_om_tester()
om_tester.assert_s3_stores([{"id": S3_BLOCKSTORE_NAME, "s3RegionOverride": AWS_REGION}])
om_tester.assert_oplog_s3_stores([{"id": S3_OPLOG_NAME, "s3RegionOverride": AWS_REGION}])
om_tester.assert_s3_stores([{"id": s3_blockstore_name, "s3RegionOverride": AWS_REGION}])
om_tester.assert_oplog_s3_stores([{"id": s3_oplog_name, "s3RegionOverride": AWS_REGION}])

# verify that we were able to setup (and no error) certificates
a = om_tester.get_s3_stores()
Expand Down
5 changes: 5 additions & 0 deletions helm_chart/values-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ relatedImages:
- 7.0.13
- 7.0.14
- 7.0.15
- 7.0.16
- 8.0.0
- 8.0.1
- 8.0.2
Expand Down Expand Up @@ -114,6 +115,10 @@ relatedImages:
- 107.0.15.8741-1_1.0.1
- 107.0.15.8741-1_1.1.0
- 107.0.15.8741-1_1.2.0
- 107.0.16.8756-1
- 107.0.16.8756-1_1.0.1
- 107.0.16.8756-1_1.1.0
- 107.0.16.8756-1_1.2.0
- 108.0.0.8694-1
- 108.0.0.8694-1_1.0.1
- 108.0.0.8694-1_1.1.0
Expand Down
10 changes: 10 additions & 0 deletions public/mongodb-kubernetes-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,14 @@ spec:
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_0_1
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.0.1"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_1_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.1.0"
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_16_8756_1_1_2_0
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.16.8756-1_1.2.0"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1_1_0_1
Expand Down Expand Up @@ -578,6 +586,8 @@ spec:
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.14"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_15
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.15"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_16
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.16"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0"
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1
Expand Down
5 changes: 5 additions & 0 deletions release.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"7.0.13",
"7.0.14",
"7.0.15",
"7.0.16",
"8.0.0",
"8.0.1",
"8.0.2",
Expand Down Expand Up @@ -140,6 +141,10 @@
"agent_version": "107.0.15.8741-1",
"tools_version": "100.11.0"
},
"7.0.16": {
"agent_version": "107.0.16.8756-1",
"tools_version": "100.12.2"
},
"8.0.0": {
"agent_version": "108.0.0.8694-1",
"tools_version": "100.10.0"
Expand Down