Skip to content

Commit 13431e8

Browse files
nammnmongodb-kubernetes-gh-app[bot]MaciejKaraslsierantmircea-cosbuc
authored
Merge release 1.1.0 branch into master (#158)
# Summary Merging release branch 1.1.0 back into master --------- Co-authored-by: mongodb-kubernetes-gh-app[bot] <208647083+mongodb-kubernetes-gh-app[bot]@users.noreply.github.com> Co-authored-by: Maciej Karaś <[email protected]> Co-authored-by: Łukasz Sierant <[email protected]> Co-authored-by: mircea-cosbuc <[email protected]> Co-authored-by: Yavor Georgiev <[email protected]> Co-authored-by: Julien-Ben <[email protected]> Co-authored-by: Maciej Karaś <[email protected]> Co-authored-by: Anand <[email protected]> Co-authored-by: Evergreen <[email protected]>
1 parent b54da4f commit 13431e8

File tree

62 files changed

+1163
-289
lines changed

Some content is hidden

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

62 files changed

+1163
-289
lines changed

‎.evergreen-functions.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,20 @@ functions:
447447
aws_secret: ${enterprise_aws_secret_access_key}
448448
local_files_include_filter:
449449
- src/github.com/mongodb/mongodb-kubernetes/public/architectures/**/*.log
450+
- src/github.com/mongodb/mongodb-kubernetes/docs/**/*.log
451+
remote_file: logs/${task_id}/${execution}/
452+
bucket: operator-e2e-artifacts
453+
permissions: private
454+
visibility: signed
455+
content_type: text/plain
456+
- command: s3.put
457+
params:
458+
aws_key: ${enterprise_aws_access_key_id}
459+
aws_secret: ${enterprise_aws_secret_access_key}
460+
local_files_include_filter:
450461
- src/github.com/mongodb/mongodb-kubernetes/public/architectures/**/*.out
462+
- src/github.com/mongodb/mongodb-kubernetes/docs/**/*.out
463+
preserve_path: true
451464
remote_file: logs/${task_id}/${execution}/
452465
bucket: operator-e2e-artifacts
453466
permissions: private

‎.evergreen.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@ tasks:
587587
- func: clone
588588
- func: setup_aws
589589
- func: configure_docker_auth
590-
- func: quay_login
591590
- func: setup_prepare_openshift_bundles
592591
- func: prepare_openshift_bundles
593592
- func: update_evergreen_expansions
@@ -1840,13 +1839,30 @@ buildvariants:
18401839

18411840
- name: private_kind_code_snippets
18421841
display_name: private_kind_code_snippets
1843-
allowed_requesters: ["patch"]
1842+
tags: [ "e2e_test_suite" ]
1843+
allowed_requesters: ["patch", "github_pr"]
18441844
run_on:
18451845
- ubuntu2204-large
18461846
<<: *base_om8_dependency
18471847
tasks:
18481848
- name: kind_code_snippets_task_group
18491849

1850+
- name: prerelease_kind_code_snippets
1851+
display_name: prerelease_kind_code_snippets
1852+
allowed_requesters: ["patch"]
1853+
run_on:
1854+
- ubuntu2204-large
1855+
tasks:
1856+
- name: kind_code_snippets_task_group
1857+
1858+
- name: public_kind_code_snippets
1859+
display_name: public_kind_code_snippets
1860+
allowed_requesters: ["patch"]
1861+
run_on:
1862+
- ubuntu2204-large
1863+
tasks:
1864+
- name: kind_code_snippets_task_group
1865+
18501866
### Build variants for manual patch only
18511867

18521868
- name: publish_om60_images

‎config/manager/manager.yaml

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
serviceAccountName: mongodb-kubernetes-operator
2323
containers:
2424
- name: mongodb-kubernetes-operator
25-
image: "quay.io/mongodb/mongodb-kubernetes:1.0.1"
25+
image: "quay.io/mongodb/mongodb-kubernetes:1.1.0"
2626
imagePullPolicy: Always
2727
args:
2828
- -watch-resource=mongodb
@@ -68,21 +68,21 @@ spec:
6868
- name: INIT_DATABASE_IMAGE_REPOSITORY
6969
value: quay.io/mongodb/mongodb-kubernetes-init-database
7070
- name: INIT_DATABASE_VERSION
71-
value: 1.0.1
71+
value: 1.1.0
7272
- name: DATABASE_VERSION
73-
value: 1.0.1
73+
value: 1.1.0
7474
# Ops Manager
7575
- name: OPS_MANAGER_IMAGE_REPOSITORY
7676
value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
7777
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
7878
value: quay.io/mongodb/mongodb-kubernetes-init-ops-manager
7979
- name: INIT_OPS_MANAGER_VERSION
80-
value: 1.0.1
80+
value: 1.1.0
8181
# AppDB
8282
- name: INIT_APPDB_IMAGE_REPOSITORY
8383
value: quay.io/mongodb/mongodb-kubernetes-init-appdb
8484
- name: INIT_APPDB_VERSION
85-
value: 1.0.1
85+
value: 1.1.0
8686
- name: OPS_MANAGER_IMAGE_PULL_POLICY
8787
value: Always
8888
- name: AGENT_IMAGE
@@ -121,26 +121,30 @@ spec:
121121
- name: MDB_COMMUNITY_IMAGE_TYPE
122122
value: "ubi8"
123123
# Community Env Vars End
124-
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_0_1
125-
value: "quay.io/mongodb/mongodb-kubernetes-database:1.0.1"
126-
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_0_1
127-
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.0.1"
128-
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_0_1
129-
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.0.1"
130-
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_0_1
131-
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.0.1"
124+
- name: RELATED_IMAGE_MONGODB_ENTERPRISE_DATABASE_IMAGE_1_1_0
125+
value: "quay.io/mongodb/mongodb-kubernetes-database:1.1.0"
126+
- name: RELATED_IMAGE_INIT_DATABASE_IMAGE_REPOSITORY_1_1_0
127+
value: "quay.io/mongodb/mongodb-kubernetes-init-database:1.1.0"
128+
- name: RELATED_IMAGE_INIT_OPS_MANAGER_IMAGE_REPOSITORY_1_1_0
129+
value: "quay.io/mongodb/mongodb-kubernetes-init-ops-manager:1.1.0"
130+
- name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_1_0
131+
value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.1.0"
132132
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
133133
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
134134
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_0
135135
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.0"
136136
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_0_1
137137
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.0.1"
138+
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1_1_1_0
139+
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1_1.1.0"
138140
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
139141
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
140142
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_0
141143
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.0"
142144
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_0_1
143145
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.0.1"
146+
- name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1_1_1_0
147+
value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1_1.1.0"
144148
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
145149
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
146150
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
@@ -149,42 +153,56 @@ spec:
149153
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.0"
150154
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_0_1
151155
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.0.1"
156+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1_1_1_0
157+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1_1.1.0"
152158
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
153159
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
154160
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_0
155161
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.0"
156162
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_0_1
157163
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.0.1"
164+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1_1_1_0
165+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1_1.1.0"
158166
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
159167
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
160168
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_0
161169
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.0"
162170
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_0_1
163171
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.0.1"
172+
- name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1_1_1_0
173+
value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1_1.1.0"
164174
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1
165175
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1"
166176
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_0
167177
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.0"
168178
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_0_1
169179
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.0.1"
180+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_33_7866_1_1_1_0
181+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.33.7866-1_1.1.0"
170182
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
171183
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
172184
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_0
173185
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.0"
174186
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_0_1
175187
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.0.1"
188+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1_1_1_0
189+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1_1.1.0"
176190
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
177191
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
178192
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_0
179193
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.0"
180194
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_0_1
181195
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.0.1"
196+
- name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1_1_1_0
197+
value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1_1.1.0"
182198
- name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1
183199
value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1"
184200
- name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1_1_0_0
185201
value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1_1.0.0"
186202
- name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1_1_0_1
187203
value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1_1.0.1"
204+
- name: RELATED_IMAGE_AGENT_IMAGE_13_34_0_9465_1_1_1_0
205+
value: "quay.io/mongodb/mongodb-agent-ubi:13.34.0.9465-1_1.1.0"
188206
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_25
189207
value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.25"
190208
- name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26

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

Lines changed: 2 additions & 2 deletions
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:1.0.1
9+
containerImage: quay.io/mongodb/mongodb-kubernetes:1.1.0
1010
createdAt: ""
1111
description: The MongoDB Controllers for Kubernetes enable easy deploys of MongoDB
1212
into Kubernetes clusters, using our management, monitoring and backup platforms,
@@ -452,4 +452,4 @@ spec:
452452
provider:
453453
name: MongoDB, Inc
454454
version: 0.0.0
455-
replaces: mongodb-kubernetes.v1.0.0
455+
replaces: mongodb-kubernetes.v1.0.1

‎docs/community-search/quick-start/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ First, add the MongoDB Helm repository. This repository contains the Helm chart
5353
```shell copy
5454
helm repo add mongodb https://mongodb.github.io/helm-charts
5555
helm repo update mongodb
56-
if [[ "${OPERATOR_HELM_CHART}" != "helm_chart" ]]; then helm search repo "${OPERATOR_HELM_CHART}"; fi;
57-
```
58-
After adding the repository, update your local Helm chart repository cache:
59-
```shell
60-
helm repo update
56+
helm search repo mongodb/mongodb-kubernetes
6157
```
6258

6359
### 3. Install MongoDB Kubernetes Operator

‎docs/community-search/quick-start/README.md.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ First, add the MongoDB Helm repository. This repository contains the Helm chart
3838
```shell copy
3939
{% include "code_snippets/090_helm_add_mogodb_repo.sh" %}
4040
```
41-
After adding the repository, update your local Helm chart repository cache:
42-
```shell
43-
helm repo update
44-
```
4541

4642
### 3. Install MongoDB Kubernetes Operator
4743

‎docs/community-search/quick-start/code_snippets/0210_verify_community_search_pullsecret.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
echo "Verifying mongodb-kubernetes-database-pods contains proper pull secret"
1+
echo "Verifying mongodb-kubernetes-database-pods service account contains proper pull secret"
22
if ! kubectl get --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}" -o json \
33
sa mongodb-kubernetes-database-pods -o=jsonpath='{.imagePullSecrets[*]}' | \
44
grep community-private-preview-pullsecret; then
@@ -7,3 +7,4 @@ if ! kubectl get --context "${K8S_CLUSTER_0_CONTEXT_NAME}" -n "${MDB_NAMESPACE}"
77
sa mongodb-kubernetes-database-pods -o=yaml
88
return 1
99
fi
10+
echo "SUCCESS: mongodb-kubernetes-database-pods service account contains proper pull secret"

‎docs/community-search/quick-start/code_snippets/090_helm_add_mogodb_repo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
helm repo add mongodb https://mongodb.github.io/helm-charts
22
helm repo update mongodb
3-
if [[ "${OPERATOR_HELM_CHART}" != "helm_chart" ]]; then helm search repo "${OPERATOR_HELM_CHART}"; fi;
3+
helm search repo mongodb/mongodb-kubernetes

‎docs/community-search/quick-start/env_variables_e2e_prerelease.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export K8S_CLUSTER_0_CONTEXT_NAME="${CLUSTER_NAME}"
2+
3+
export PRIVATE_PREVIEW_IMAGE_PULLSECRET="${COMMUNITY_PRIVATE_PREVIEW_PULLSECRET_DOCKERCONFIGJSON}"
4+
5+
export OPERATOR_ADDITIONAL_HELM_VALUES=""
6+
export OPERATOR_HELM_CHART="${PROJECT_DIR}/helm_chart"

‎docs/community-search/quick-start/env_variables_e2e_public.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export K8S_CLUSTER_0_CONTEXT_NAME="${CLUSTER_NAME}"
2+
export PRIVATE_PREVIEW_IMAGE_PULLSECRET="${COMMUNITY_PRIVATE_PREVIEW_PULLSECRET_DOCKERCONFIGJSON}"

0 commit comments

Comments
 (0)