Skip to content

Commit bc659eb

Browse files
committed
(DOCSP-38844): Backport DOCSP-35731 to v2.2. (#60)
* (DOCSP-35731): Fixed breaking changes. * (DOCSP-35731): Incorporated feedback. * (DOCSP-35731): Incorporated Sergiusz's feedback. * (DOCSP-35731): Incorporated Roo's feedback.
1 parent ddf2a71 commit bc659eb

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
@@ -91,9 +91,9 @@ To configure project alerts, configure the
9191
connectionSecretRef:
9292
name: my-atlas-key
9393
projectIpAccessList:
94-
- ipAddress: "0.0.0.0/1"
94+
- cidrBlock: "0.0.0.0/1"
9595
comment: "Everyone has access. For test purposes only."
96-
- ipAddress: "128.0.0.0/1"
96+
- cidrBlock: "128.0.0.0/1"
9797
comment: "Everyone has access. For test purposes only."
9898
alertConfigurations:
9999
- 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
@@ -49,9 +49,9 @@ in the :ref:`atlasproject-custom-resource`.
4949
connectionSecretRef:
5050
name: my-atlas-key
5151
projectIpAccessList:
52-
- ipAddress: "0.0.0.0/1"
52+
- cidrBlock: "0.0.0.0/1"
5353
comment: "Everyone has access. For test purposes only."
54-
- ipAddress: "128.0.0.0/1"
54+
- cidrBlock: "128.0.0.0/1"
5555
comment: "Everyone has access. For test purposes only."
5656
auditing:
5757
enabled: true
@@ -89,9 +89,9 @@ setting, you must set :setting:`spec.auditing.enabled` to ``true``.
8989
connectionSecretRef:
9090
name: my-atlas-key
9191
projectIpAccessList:
92-
- ipAddress: "0.0.0.0/1"
92+
- cidrBlock: "0.0.0.0/1"
9393
comment: "Everyone has access. For test purposes only."
94-
- ipAddress: "128.0.0.0/1"
94+
- cidrBlock: "128.0.0.0/1"
9595
comment: "Everyone has access. For test purposes only."
9696
auditing:
9797
enabled: true

source/ak8so-integrate-third-party.txt

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

source/ak8so-x509.txt

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

source/atlasdeployment-custom-resource.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,8 +1048,7 @@ examples, and the |api| documentation.
10481048
exceed 1024 bytes. If you set this to ``false``, |mongod| writes
10491049
documents that exceed this limit, but *doesn't* index them.
10501050

1051-
This option corresponds to the
1052-
:parameter:`failIndexKeyTooLong <param.failIndexKeyTooLong>`
1051+
This option corresponds to the ``param.failIndexKeyTooLong``
10531052
|mongod| parameter.
10541053

10551054
.. setting:: spec.processArgs.javascriptEnabled

source/atlasproject-custom-resource.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ specification:
108108
connectionSecretRef:
109109
name: my-atlas-key
110110
projectIpAccessList:
111-
- ipAddress: "192.0.2.15"
112-
comment: "IP address for Application Server A"
113111
- cidrBlock: "203.0.113.0/24"
114112
comment: "CIDR block for Application Server B - D"
115113

@@ -132,9 +130,9 @@ specification that integrates with Prometheus:
132130
connectionSecretRef:
133131
name: my-atlas-key
134132
projectIpAccessList:
135-
- ipAddress: "0.0.0.0/1"
133+
- cidrBlock: "0.0.0.0/1"
136134
comment: "Everyone has access. For test purposes only."
137-
- ipAddress: "128.0.0.0/1"
135+
- cidrBlock: "128.0.0.0/1"
138136
comment: "Everyone has access. For test purposes only."
139137
integrations:
140138
- 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
@@ -102,13 +102,13 @@ content: |
102102
spec:
103103
name: Test Atlas Operator Project
104104
projectIpAccessList:
105-
- ipAddress: "0.0.0.0/0"
105+
- cidrBlock: "0.0.0.0/0"
106106
comment: "Allowing access to database from everywhere (only for Demo!)"
107107
EOF
108108
109109
.. warning::
110110
111-
The IP address in the example, ``0.0.0.0/0``, allows any client to
111+
The CIDR block in the example, ``0.0.0.0/0``, allows any client to
112112
connect to the |service| cluster. Do not use this IP address in
113113
production.
114114
@@ -132,6 +132,7 @@ content: |
132132
projectRef:
133133
name: my-project
134134
deploymentSpec:
135+
clusterType: REPLICASET
135136
name: "Test-cluster"
136137
tags:
137138
- key: "environment"

0 commit comments

Comments
 (0)