Skip to content

Commit 0785069

Browse files
CLOUDP-318983: Fixed typo in tag values for deployments (#2330)
* CLOUDP-318983: Fixed typo in tag values for deployments * Update the base for deployment crd
1 parent a9ac619 commit 0785069

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

api/v1/atlasdeployment_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ type TagSpec struct {
218218
Key string `json:"key"`
219219
// +kubebuilder:validation:MaxLength:=255
220220
// +kubebuilder:validation:MinLength:=1
221-
// +kubebuilder:validation:Pattern:=^[a-zA-Z0-9][a-zA-Z0-9@_.+`;`-]*$
221+
// +kubebuilder:validation:Pattern:=^[a-zA-Z0-9][a-zA-Z0-9 @_.+`;`-]*$
222222
Value string `json:"value"`
223223
}
224224

config/crd/bases/atlas.mongodb.com_atlasdeployments.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ spec:
596596
value:
597597
maxLength: 255
598598
minLength: 1
599-
pattern: ^[a-zA-Z0-9][a-zA-Z0-9@_.+`;`-]*$
599+
pattern: ^[a-zA-Z0-9][a-zA-Z0-9 @_.+`;`-]*$
600600
type: string
601601
required:
602602
- key
@@ -676,7 +676,7 @@ spec:
676676
value:
677677
maxLength: 255
678678
minLength: 1
679-
pattern: ^[a-zA-Z0-9][a-zA-Z0-9@_.+`;`-]*$
679+
pattern: ^[a-zA-Z0-9][a-zA-Z0-9 @_.+`;`-]*$
680680
type: string
681681
required:
682682
- key
@@ -895,7 +895,7 @@ spec:
895895
value:
896896
maxLength: 255
897897
minLength: 1
898-
pattern: ^[a-zA-Z0-9][a-zA-Z0-9@_.+`;`-]*$
898+
pattern: ^[a-zA-Z0-9][a-zA-Z0-9 @_.+`;`-]*$
899899
type: string
900900
required:
901901
- key

test/int/deployment_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment-
299299
secret.StringData = secretData()
300300
})
301301
Expect(err).To(BeNil())
302-
303302
})
304303

305304
By("Checking that the Deployment is deleted", func() {
@@ -722,7 +721,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment-
722721

723722
By("Updating the Deployment tags", func() {
724723
createdDeployment = performUpdate(ctx, 30*time.Minute, client.ObjectKeyFromObject(createdDeployment), func(deployment *akov2.AtlasDeployment) {
725-
deployment.Spec.DeploymentSpec.Tags = []*akov2.TagSpec{{Key: "test-1", Value: "value-1"}, {Key: "test-2", Value: "value-2"}}
724+
deployment.Spec.DeploymentSpec.Tags = []*akov2.TagSpec{{Key: "test 1", Value: "value 1"}, {Key: "test-2", Value: "value-2"}}
726725
})
727726
doDeploymentStatusChecks()
728727
checkAtlasState(func(c *admin.AdvancedClusterDescription) {
@@ -970,7 +969,6 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment-
970969

971970
Describe("Setting the deployment skip annotation should skip reconciliations.", func() {
972971
It("Should Succeed", func(ctx context.Context) {
973-
974972
By(`Creating the deployment with reconciliation policy "skip" first`, func() {
975973
createdDeployment = akov2.DefaultAWSDeployment(namespace.Name, createdProject.Name).Lightweight()
976974
performCreate(createdDeployment, 30*time.Minute)
@@ -1356,7 +1354,6 @@ var _ = Describe("AtlasDeployment", Ordered, Label("int", "AtlasDeployment", "de
13561354
}
13571355
return nil
13581356
}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Not(HaveOccurred()))
1359-
13601357
})
13611358
})
13621359
})
@@ -1443,7 +1440,6 @@ var _ = Describe("AtlasDeployment", Ordered, Label("int", "AtlasDeployment", "de
14431440
}
14441441
})
14451442
Expect(err).To(BeNil())
1446-
14471443
})
14481444

14491445
By("Deployment is ready with backup and snapshot distribution configured", func() {

0 commit comments

Comments
 (0)