diff --git a/.evergreen.yml b/.evergreen.yml index 209bf152a..c37ccb7e3 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -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 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index c2164c4f1..347d98264 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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 @@ -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 diff --git a/docker/mongodb-kubernetes-tests/tests/common/ops_manager/multi_cluster.py b/docker/mongodb-kubernetes-tests/tests/common/ops_manager/multi_cluster.py index bbaae3e7e..353620226 100644 --- a/docker/mongodb-kubernetes-tests/tests/common/ops_manager/multi_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/common/ops_manager/multi_cluster.py @@ -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 @@ -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 diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py index e612d4127..f827211bf 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py @@ -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 ( @@ -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 diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py index 6c443c276..76ece4f07 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py @@ -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 @@ -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 @@ -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() diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml index 1177428c2..ee69e48ee 100644 --- a/helm_chart/values-openshift.yaml +++ b/helm_chart/values-openshift.yaml @@ -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 @@ -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 diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index 52bec8aca..c8e73652b 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -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 @@ -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 diff --git a/release.json b/release.json index bd31a2d45..3b03c9ada 100644 --- a/release.json +++ b/release.json @@ -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", @@ -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"