Skip to content

Commit 587addc

Browse files
committed
(DOCSP-38847): Backport DOCSP-35731 to v1.9. (#60)
* (DOCSP-35731): Fixed breaking changes. * (DOCSP-35731): Incorporated feedback. * (DOCSP-35731): Incorporated Sergiusz's feedback. * (DOCSP-35731): Incorporated Roo's feedback.
1 parent 83f0e41 commit 587addc

8 files changed

+16
-18
lines changed

source/ak8so-alert-configurations.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ To configure project alerts, configure the
9393
connectionSecretRef:
9494
name: my-atlas-key
9595
projectIpAccessList:
96-
- ipAddress: "0.0.0.0/1"
96+
- cidrBlock: "0.0.0.0/1"
9797
comment: "Everyone has access. For test purposes only."
98-
- ipAddress: "128.0.0.0/1"
98+
- cidrBlock: "128.0.0.0/1"
9999
comment: "Everyone has access. For test purposes only."
100100
alertConfigurations:
101101
- eventTypeName: "REPLICATION_OPLOG_WINDOW_RUNNING_OUT",

source/ak8so-configure-audit-logs.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ in the :ref:`atlasproject-custom-resource`.
5151
connectionSecretRef:
5252
name: my-atlas-key
5353
projectIpAccessList:
54-
- ipAddress: "0.0.0.0/1"
54+
- cidrBlock: "0.0.0.0/1"
5555
comment: "Everyone has access. For test purposes only."
56-
- ipAddress: "128.0.0.0/1"
56+
- cidrBlock: "128.0.0.0/1"
5757
comment: "Everyone has access. For test purposes only."
5858
auditing:
5959
enabled: true
@@ -93,9 +93,9 @@ setting, you must set :setting:`spec.auditing.enabled` to ``true``.
9393
connectionSecretRef:
9494
name: my-atlas-key
9595
projectIpAccessList:
96-
- ipAddress: "0.0.0.0/1"
96+
- cidrBlock: "0.0.0.0/1"
9797
comment: "Everyone has access. For test purposes only."
98-
- ipAddress: "128.0.0.0/1"
98+
- cidrBlock: "128.0.0.0/1"
9999
comment: "Everyone has access. For test purposes only."
100100
auditing:
101101
enabled: true

source/ak8so-integrate-third-party.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ To integrate |service| with a third-party service, configure the
5151
connectionSecretRef:
5252
name: my-atlas-key
5353
projectIpAccessList:
54-
- ipAddress: "0.0.0.0/1"
54+
- cidrBlock: "0.0.0.0/1"
5555
comment: "Everyone has access. For test purposes only."
56-
- ipAddress: "128.0.0.0/1"
56+
- cidrBlock: "128.0.0.0/1"
5757
comment: "Everyone has access. For test purposes only."
5858
integrations:
5959
- type: "DATADOG"

source/ak8so-x509.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Procedure
160160
projectIpAccessList:
161161
- ipAddress: "192.0.2.15"
162162
comment: "IP address for Application Server A"
163-
- ipAddress: "203.0.113.0/24"
163+
- cidrBlock: "203.0.113.0/24"
164164
comment: "CIDR block for Application Servers B - D"
165165
x509CertRef:
166166
name: my-x509-cert

source/atlasdeployment-custom-resource.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,8 +1135,7 @@ documentation to customize your specifications.
11351135
exceed 1024 bytes. If you set this to ``false``, |mongod| writes
11361136
documents that exceed this limit, but *doesn't* index them.
11371137

1138-
This option corresponds to the
1139-
:parameter:`failIndexKeyTooLong <param.failIndexKeyTooLong>`
1138+
This option corresponds to the ``param.failIndexKeyTooLong``
11401139
|mongod| parameter.
11411140

11421141
.. setting:: spec.processArgs.javascriptEnabled

source/atlasproject-custom-resource.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ specification:
111111
name: my-atlas-key
112112
label: atlas.mongodb.com/type=credentials
113113
projectIpAccessList:
114-
- ipAddress: "192.0.2.15"
115-
comment: "IP address for Application Server A"
116114
- cidrBlock: "203.0.113.0/24"
117115
comment: "CIDR block for Application Server B - D"
118116

@@ -137,9 +135,9 @@ specification that integrates with Prometheus:
137135
connectionSecretRef:
138136
name: my-atlas-key
139137
projectIpAccessList:
140-
- ipAddress: "0.0.0.0/1"
138+
- cidrBlock: "0.0.0.0/1"
141139
comment: "Everyone has access. For test purposes only."
142-
- ipAddress: "128.0.0.0/1"
140+
- cidrBlock: "128.0.0.0/1"
143141
comment: "Everyone has access. For test purposes only."
144142
integrations:
145143
- type: "PROMETHEUS"

source/includes/steps-ak8so-helm-quick-start.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ content: |
6767
project: # Project custom values
6868
atlasProjectName: "My Project"
6969
projectIpAccessList:
70-
- ipAddress: "0.0.0.0"
70+
- cidrBlock: "0.0.0.0/0"
7171
7272
users: # Custom database users
7373
- username: dbadmin

source/includes/steps-ak8so-quick-start.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ content: |
104104
spec:
105105
name: Test Atlas Operator Project
106106
projectIpAccessList:
107-
- ipAddress: "0.0.0.0/0"
107+
- cidrBlock: "0.0.0.0/0"
108108
comment: "Allowing access to database from everywhere (only for Demo!)"
109109
EOF
110110
111111
.. warning::
112112
113-
The IP address in the example, ``0.0.0.0/0``, allows any client to
113+
The CIDR block in the example, ``0.0.0.0/0``, allows any client to
114114
connect to the |service| cluster. Do not use this IP address in
115115
production.
116116
@@ -136,6 +136,7 @@ content: |
136136
projectRef:
137137
name: my-project
138138
deploymentSpec:
139+
clusterType: REPLICASET
139140
name: "Test-cluster"
140141
tags:
141142
- key: "environment",

0 commit comments

Comments
 (0)