Skip to content

Commit 85ffcbe

Browse files
davidhou17igor-karpukhin
authored andcommitted
(DOCSP-38432): Backport DOCSP-37169 to v2.1 (#32)
* various updates to AKO resource examples * remove outdated label * Move providerSettings to correct section * Update providerSettings in other resource examples * remove remaining outdated labels * Apply Igor's suggestions Co-authored-by: Igor Karpukhin <[email protected]> * Igor's suggestions (updated) Co-authored-by: Igor Karpukhin <[email protected]> * Remove providerSettings and providerSettings.instanceSizeName --------- Co-authored-by: Igor Karpukhin <[email protected]>
1 parent 085cea5 commit 85ffcbe

23 files changed

+120
-239
lines changed

source/ak8so-alert-configurations.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ To configure project alerts, configure the
8686
kind: AtlasProject
8787
metadata:
8888
name: my-project
89-
labels:
90-
app.kubernetes.io/version: 1.6.0
9189
spec:
9290
name: TestAlertConfig
9391
connectionSecretRef:

source/ak8so-back-up-deployment.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ Follow these steps to enable {+cloud-backup+} for your |ak8so|-managed
118118
kind: AtlasBackupPolicy
119119
metadata:
120120
name: "atlas-default-backuppolicy"
121-
labels:
122-
app.kubernetes.io/version: 1.6.0
123121
spec:
124122
items:
125123
frequencyType: "weekly"
@@ -146,9 +144,7 @@ Follow these steps to enable {+cloud-backup+} for your |ak8so|-managed
146144
apiVersion: atlas.mongodb.com/v1
147145
kind: AtlasBackupSchedule
148146
metadata:
149-
name: "atlas-default-backupschedule"
150-
labels:
151-
app.kubernetes.io/version: 1.6.0
147+
name: "atlas-default-backupschedule"
152148
spec:
153149
autoExportEnabled: true
154150
copySettings:
@@ -181,9 +177,7 @@ Follow these steps to enable {+cloud-backup+} for your |ak8so|-managed
181177
apiVersion: atlas.mongodb.com/v1
182178
kind: AtlasDeployment
183179
metadata:
184-
name: my-atlas-cluster
185-
labels:
186-
app.kubernetes.io/version: 1.6.0
180+
name: my-atlas-cluster
187181
spec:
188182
backupRef:
189183
name: atlas-default-backupschedule

source/ak8so-changelog.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,12 @@ New Features
549549
{+database-deployments+}.
550550
- Supports upgrading ``M0``, ``M2``, and ``M5`` {+clusters+} to
551551
``M10+`` {+clusters+} via the
552-
:setting:`spec.deploymentSpec.providerSettings.instanceSizeName`
552+
:setting:`spec.deploymentSpec.replicationSpecs.regionConfigs.electableSpecs.instanceSize`
553553
parameter.
554554
- Supports :ref:`advanced options <ak8so-advanced-options>` via the
555555
:setting:`spec.processArgs` object.
556556
- Supports omitting the
557-
:setting:`spec.deploymentSpec.providerSettings.providerName` field for
557+
:setting:`spec.deploymentSpec.replicationSpecs.regionConfigs.providerName` field for
558558
``M0``, ``M2``, and ``M5`` {+clusters+}.
559559
- Supports omitting the
560560
:setting:`spec.serverlessSpec.providerSettings.providerName` field for

source/ak8so-configure-audit-logs.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ in the :ref:`atlasproject-custom-resource`.
4444
kind: AtlasProject
4545
metadata:
4646
name: my-project
47-
labels:
48-
app.kubernetes.io/version: 1.6.0
4947
spec:
5048
name: TestAuditing
5149
connectionSecretRef:
@@ -86,8 +84,6 @@ setting, you must set :setting:`spec.auditing.enabled` to ``true``.
8684
kind: AtlasProject
8785
metadata:
8886
name: my-project
89-
labels:
90-
app.kubernetes.io/version: 1.6.0
9187
spec:
9288
name: TestAuditing
9389
connectionSecretRef:

source/ak8so-configure-custom-database-roles.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ To create or update a custom database role, specify the
3030
kind: AtlasProject
3131
metadata:
3232
name: my-project
33-
labels:
34-
app.kubernetes.io/version: 1.6.0
3533
spec:
3634
name: Test Atlas Operator Project
3735
connectionSecretRef:

source/ak8so-configure-teams.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ projects:
9292
kind: AtlasTeam
9393
metadata:
9494
name: green-leaf-team
95-
labels:
96-
app.kubernetes.io/version: 1.6.0
9795
spec:
9896
name: "greenLeafTeam"
9997
usernames:
@@ -126,9 +124,7 @@ projects:
126124
apiVersion: atlas.mongodb.com/v1
127125
kind: AtlasProject
128126
metadata:
129-
name: my-project
130-
labels:
131-
app.kubernetes.io/version: 1.6.0
127+
name: my-project
132128
spec:
133129
name: Test project
134130
teams:

source/ak8so-integrate-third-party.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ To integrate |service| with a third-party service, configure the
4444
kind: AtlasProject
4545
metadata:
4646
name: my-project
47-
labels:
48-
app.kubernetes.io/version: 1.6.0
4947
spec:
5048
name: TestDatadogIntegration
5149
connectionSecretRef:

source/ak8so-private-link-dedicated.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ private endpoints:
6060
kind: AtlasProject
6161
metadata:
6262
name: my-project
63-
labels:
64-
app.kubernetes.io/version: 1.6.0
6563
spec:
6664
name: Test Atlas Operator Project
6765
privateEndpoints:
@@ -173,8 +171,6 @@ private endpoints:
173171
kind: AtlasProject
174172
metadata:
175173
name: my-project
176-
labels:
177-
app.kubernetes.io/version: 1.6.0
178174
spec:
179175
name: Test Atlas Operator Project
180176
privateEndpoints:
@@ -218,8 +214,6 @@ private endpoints:
218214
kind: AtlasProject
219215
metadata:
220216
name: my-project
221-
labels:
222-
app.kubernetes.io/version: 1.6.0
223217
spec:
224218
name: Test Atlas Operator Project
225219
privateEndpoints:
@@ -372,8 +366,6 @@ private endpoints:
372366
kind: AtlasProject
373367
metadata:
374368
name: my-project
375-
labels:
376-
app.kubernetes.io/version: 1.6.0
377369
spec:
378370
name: Test Atlas Operator Project
379371
privateEndpoints:
@@ -418,8 +410,6 @@ private endpoints:
418410
kind: AtlasProject
419411
metadata:
420412
name: my-project
421-
labels:
422-
app.kubernetes.io/version: 1.6.0
423413
spec:
424414
name: Test Atlas Operator Project
425415
privateEndpoints:
@@ -593,8 +583,6 @@ private endpoints:
593583
kind: AtlasProject
594584
metadata:
595585
name: my-project
596-
labels:
597-
app.kubernetes.io/version: 1.6.0
598586
spec:
599587
name: Test Atlas Operator Project
600588
privateEndpoints:

source/ak8so-private-link-serverless.txt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ using private endpoints:
6161
kind: AtlasDeployment
6262
metadata:
6363
name: atlas-deployment-serverless
64-
labels:
65-
app.kubernetes.io/version: 1.6.0
6664
spec:
6765
projectRef:
6866
name: my-project
6967
serverlessSpec:
7068
name: serverless-instance
7169
tags:
72-
- key: "environment",
70+
- key: "environment"
7371
value: "production"
7472
providerSettings:
7573
providerName: SERVERLESS
@@ -184,15 +182,13 @@ using private endpoints:
184182
kind: AtlasDeployment
185183
metadata:
186184
name: atlas-deployment-serverless
187-
labels:
188-
app.kubernetes.io/version: 1.6.0
189185
spec:
190186
projectRef:
191187
name: my-project
192188
serverlessSpec:
193189
name: serverless-instance
194190
tags:
195-
- key: "environment",
191+
- key: "environment"
196192
value: "production"
197193
providerSettings:
198194
providerName: SERVERLESS
@@ -236,15 +232,13 @@ using private endpoints:
236232
kind: AtlasDeployment
237233
metadata:
238234
name: atlas-deployment-serverless
239-
labels:
240-
app.kubernetes.io/version: 1.6.0
241235
spec:
242236
projectRef:
243237
name: my-project
244238
serverlessSpec:
245239
name: serverless-instance
246240
tags:
247-
- key: "environment",
241+
- key: "environment"
248242
value: "production"
249243
providerSettings:
250244
providerName: SERVERLESS
@@ -399,15 +393,13 @@ using private endpoints:
399393
kind: AtlasDeployment
400394
metadata:
401395
name: atlas-deployment-serverless
402-
labels:
403-
app.kubernetes.io/version: 1.6.0
404396
spec:
405397
projectRef:
406398
name: my-project
407399
serverlessSpec:
408400
name: serverless-instance
409401
tags:
410-
- key: "environment",
402+
- key: "environment"
411403
value: "production"
412404
providerSettings:
413405
providerName: SERVERLESS

source/ak8so-unified-access.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ Procedure
4949
apiVersion: atlas.mongodb.com/v1
5050
kind: AtlasProject
5151
metadata:
52-
name: my-project
53-
labels:
54-
app.kubernetes.io/version: 1.6.0
52+
name: my-project
5553
spec:
5654
name: Test Project
5755
projectIpAccessList:
@@ -142,9 +140,7 @@ Procedure
142140
apiVersion: atlas.mongodb.com/v1
143141
kind: AtlasProject
144142
metadata:
145-
name: my-project
146-
labels:
147-
app.kubernetes.io/version: 1.6.0
143+
name: my-project
148144
spec:
149145
name: Test Project
150146
projectIpAccessList:

0 commit comments

Comments
 (0)