Skip to content

Commit a701922

Browse files
lsierantjwilliams-mongo
lsierant
authored and
jwilliams-mongo
committed
Update sample files from MEKO (#1784)
1 parent 8cdae0c commit a701922

14 files changed

+73
-47
lines changed

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0011_gcloud_set_current_project.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gcloud config set project "${MDB_GKE_PROJECT}"

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0020_get_gke_credentials.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
gcloud container clusters get-credentials "${K8S_CLUSTER_0}" --zone="${K8S_CLUSTER_0_ZONE}"
23
gcloud container clusters get-credentials "${K8S_CLUSTER_1}" --zone="${K8S_CLUSTER_1_ZONE}"
34
gcloud container clusters get-credentials "${K8S_CLUSTER_2}" --zone="${K8S_CLUSTER_2_ZONE}"

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0205_helm_configure_repo.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
helm repo add mongodb https://mongodb.github.io/helm-charts
2+
helm repo update mongodb
3+
helm search repo "${OFFICIAL_OPERATOR_HELM_CHART}"
4+

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0250_generate_certs.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ default_bits = 2048
66
prompt = no
77
default_md = sha256
88
distinguished_name = dn
9+
x509_extensions = v3_ca
910
1011
[ dn ]
1112
C=US
@@ -14,6 +15,12 @@ L=New York
1415
O=Example Company
1516
OU=IT Department
1617
CN=exampleCA
18+
19+
[ v3_ca ]
20+
basicConstraints = CA:TRUE
21+
keyUsage = critical, keyCertSign, cRLSign
22+
subjectKeyIdentifier = hash
23+
authorityKeyIdentifier = keyid:always,issuer
1724
EOF
1825

1926
cat <<EOF >certs/om.cnf

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/0400_install_minio_s3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
kustomize build "github.com/minio/operator/resources/?timeout=120&ref=v5.0.12" | \
1+
kubectl kustomize "github.com/minio/operator/resources/?timeout=120&ref=v5.0.12" | \
22
kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" apply -f -
33

4-
kustomize build "github.com/minio/operator/examples/kustomization/tenant-tiny?timeout=120&ref=v5.0.12" | \
4+
kubectl kustomize "github.com/minio/operator/examples/kustomization/tenant-tiny?timeout=120&ref=v5.0.12" | \
55
kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" apply -f -
66

77
# add two buckets to the tenant config

‎source/includes/code-examples/ops-manager-multi-cluster/code_snippets/9000_delete_namespaces.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" delete ns "${NAMESPACE}" &
22
kubectl --context "${K8S_CLUSTER_1_CONTEXT_NAME}" delete ns "${NAMESPACE}" &
33
kubectl --context "${K8S_CLUSTER_2_CONTEXT_NAME}" delete ns "${NAMESPACE}" &
44
kubectl --context "${K8S_CLUSTER_0_CONTEXT_NAME}" delete ns "${OPERATOR_NAMESPACE}" &
5+
kubectl --context "${K8S_CLUSTER_1_CONTEXT_NAME}" delete ns "${OPERATOR_NAMESPACE}" &
6+
kubectl --context "${K8S_CLUSTER_2_CONTEXT_NAME}" delete ns "${OPERATOR_NAMESPACE}" &
57
wait

‎source/includes/code-examples/ops-manager-multi-cluster/env_variables.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ export S3_ENDPOINT="minio.tenant-tiny.svc.cluster.local"
3838
export S3_ACCESS_KEY="console"
3939
export S3_SECRET_KEY="console123"
4040

41-
export OPERATOR_HELM_CHART="mongodb/enterprise-operator"
41+
export OFFICIAL_OPERATOR_HELM_CHART="mongodb/enterprise-operator"
42+
export OPERATOR_HELM_CHART="${OFFICIAL_OPERATOR_HELM_CHART}"
4243

4344
# (Optional) Change the following setting when using the external URL.
4445
# This env variable is used in OpenSSL configuration to generate

‎source/includes/code-examples/ops-manager-multi-cluster/output/0030_verify_access_to_clusters.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Nodes in cluster gke_scratch-kubernetes-team_europe-central2-a_k8s-mdb-0
22
NAME STATUS ROLES AGE VERSION
3-
gke-k8s-mdb-0-default-pool-d0f98a43-dtlc Ready <none> 65s v1.28.7-gke.1026000
4-
gke-k8s-mdb-0-default-pool-d0f98a43-q9sf Ready <none> 65s v1.28.7-gke.1026000
5-
gke-k8s-mdb-0-default-pool-d0f98a43-zn8x Ready <none> 64s v1.28.7-gke.1026000
3+
gke-k8s-mdb-0-default-pool-679a9e59-43mm Ready <none> 33s v1.29.4-gke.1043004
4+
gke-k8s-mdb-0-default-pool-679a9e59-cqfm Ready <none> 33s v1.29.4-gke.1043004
5+
gke-k8s-mdb-0-default-pool-679a9e59-vrt4 Ready <none> 33s v1.29.4-gke.1043004
66

77
Nodes in cluster gke_scratch-kubernetes-team_europe-central2-b_k8s-mdb-1
8-
NAME STATUS ROLES AGE VERSION
9-
gke-k8s-mdb-1-default-pool-37ea602a-0qgw Ready <none> 111s v1.28.7-gke.1026000
10-
gke-k8s-mdb-1-default-pool-37ea602a-k4qk Ready <none> 114s v1.28.7-gke.1026000
11-
gke-k8s-mdb-1-default-pool-37ea602a-p2g7 Ready <none> 113s v1.28.7-gke.1026000
8+
NAME STATUS ROLES AGE VERSION
9+
gke-k8s-mdb-1-default-pool-277e5173-2nd7 Ready <none> 29s v1.29.4-gke.1043004
10+
gke-k8s-mdb-1-default-pool-277e5173-73nh Ready <none> 30s v1.29.4-gke.1043004
11+
gke-k8s-mdb-1-default-pool-277e5173-9pfb Ready <none> 29s v1.29.4-gke.1043004
1212

1313
Nodes in cluster gke_scratch-kubernetes-team_europe-central2-c_k8s-mdb-2
1414
NAME STATUS ROLES AGE VERSION
15-
gke-k8s-mdb-2-default-pool-4b459a09-t1v9 Ready <none> 29s v1.28.7-gke.1026000
15+
gke-k8s-mdb-2-default-pool-7611c9f2-5dc8 Ready <none> 60s v1.29.4-gke.1043004

‎source/includes/code-examples/ops-manager-multi-cluster/output/0205_helm_configure_repo.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"mongodb" already exists with the same configuration, skipping
2+
Hang tight while we grab the latest from your chart repositories...
3+
...Successfully got an update from the "mongodb" chart repository
4+
Update Complete. ⎈Happy Helming!⎈
5+
NAME CHART VERSION APP VERSION DESCRIPTION
6+
mongodb/enterprise-operator 1.26.0 MongoDB Kubernetes Enterprise Operator

‎source/includes/code-examples/ops-manager-multi-cluster/output/0210_helm_install_operator.out

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Release "mongodb-enterprise-operator-multi-cluster" does not exist. Installing it now.
22
NAME: mongodb-enterprise-operator-multi-cluster
3-
LAST DEPLOYED: Tue Apr 30 19:40:26 2024
3+
LAST DEPLOYED: Mon Jul 8 08:59:01 2024
44
NAMESPACE: mongodb-operator
55
STATUS: deployed
66
REVISION: 1
@@ -26,17 +26,17 @@ agent:
2626
version: 107.0.0.8502-1
2727
database:
2828
name: mongodb-enterprise-database-ubi
29-
version: 1.25.0
29+
version: 1.26.0
3030
dummy: value
3131
initAppDb:
3232
name: mongodb-enterprise-init-appdb-ubi
33-
version: 1.25.0
33+
version: 1.26.0
3434
initDatabase:
3535
name: mongodb-enterprise-init-database-ubi
36-
version: 1.25.0
36+
version: 1.26.0
3737
initOpsManager:
3838
name: mongodb-enterprise-init-ops-manager-ubi
39-
version: 1.25.0
39+
version: 1.26.0
4040
managedSecurityContext: false
4141
mongodb:
4242
appdbAssumeOldFormat: false
@@ -62,6 +62,7 @@ operator:
6262
createResourcesServiceAccountsAndRoles: false
6363
deployment_name: mongodb-enterprise-operator
6464
env: prod
65+
maxConcurrentReconciles: 1
6566
mdbDefaultArchitecture: non-static
6667
name: mongodb-enterprise-operator-multi-cluster
6768
namespace: mongodb-operator
@@ -79,13 +80,14 @@ operator:
7980
vaultSecretBackend:
8081
enabled: false
8182
tlsSecretRef: ""
82-
version: 1.25.0
83+
version: 1.26.0
8384
watchNamespace: mongodb
8485
watchedResources:
8586
- mongodb
8687
- opsmanagers
8788
- mongodbusers
8889
webhook:
90+
installClusterRole: true
8991
registerConfiguration: true
9092
opsManager:
9193
name: mongodb-enterprise-ops-manager-ubi
@@ -172,7 +174,7 @@ spec:
172174
runAsUser: 2000
173175
containers:
174176
- name: mongodb-enterprise-operator-multi-cluster
175-
image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:1.25.0"
177+
image: "quay.io/mongodb/mongodb-enterprise-operator-ubi:1.26.0"
176178
imagePullPolicy: Always
177179
args:
178180
- -watch-resource=mongodb
@@ -212,21 +214,21 @@ spec:
212214
- name: INIT_DATABASE_IMAGE_REPOSITORY
213215
value: quay.io/mongodb/mongodb-enterprise-init-database-ubi
214216
- name: INIT_DATABASE_VERSION
215-
value: 1.25.0
217+
value: 1.26.0
216218
- name: DATABASE_VERSION
217-
value: 1.25.0
219+
value: 1.26.0
218220
# Ops Manager
219221
- name: OPS_MANAGER_IMAGE_REPOSITORY
220222
value: quay.io/mongodb/mongodb-enterprise-ops-manager-ubi
221223
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
222224
value: quay.io/mongodb/mongodb-enterprise-init-ops-manager-ubi
223225
- name: INIT_OPS_MANAGER_VERSION
224-
value: 1.25.0
226+
value: 1.26.0
225227
# AppDB
226228
- name: INIT_APPDB_IMAGE_REPOSITORY
227229
value: quay.io/mongodb/mongodb-enterprise-init-appdb-ubi
228230
- name: INIT_APPDB_VERSION
229-
value: 1.25.0
231+
value: 1.26.0
230232
- name: OPS_MANAGER_IMAGE_PULL_POLICY
231233
value: Always
232234
- name: AGENT_IMAGE
@@ -241,6 +243,8 @@ spec:
241243
value: ubi8
242244
- name: PERFORM_FAILOVER
243245
value: 'true'
246+
- name: MDB_MAX_CONCURRENT_RECONCILES
247+
value: "1"
244248
volumes:
245249
- name: kube-config-volume
246250
secret:

0 commit comments

Comments
 (0)