wip

mongodb · Jan 25, 2024 · fbcd9e2 · fbcd9e2
1 parent 1391f1e
commit fbcd9e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/api/v1/mongodbcommunity_types.go b/api/v1/mongodbcommunity_types.go
@@ -323,9 +323,7 @@ type AuthenticationRestriction struct {
 
 // AutomationConfigOverride contains fields which will be overridden in the operator created config.
 type AutomationConfigOverride struct {
-	Processes []OverrideProcess `json:"processes,omitempty"`
-	// +kubebuilder:validation:Type=object
-	// +kubebuilder:pruning:PreserveUnknownFields
+	Processes  []OverrideProcess  `json:"processes,omitempty"`
 	ReplicaSet OverrideReplicaSet `json:"replicaSet,omitempty"`
 }
 
@@ -335,14 +333,6 @@ type OverrideReplicaSet struct {
 	Settings MapWrapper `json:"settings,omitempty"`
 }
 
-// type OverrideReplicaSetEntry struct {
-// 	Settings OverrideReplicaSet `json:"settings,omitempty"`
-// }
-
-// type OverrideReplicaSet struct {
-// 	MapWrapper MapWrapper `json:"-"` // Ignored during JSON decoding
-// }
-
 // Note: We do not use the automationconfig.Process type directly here as unmarshalling cannot happen directly
 // with the Args26 which is a map[string]interface{}
 

diff --git a/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml b/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml
@@ -190,7 +190,6 @@ spec:
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                     type: object
-                    x-kubernetes-preserve-unknown-fields: true
                 type: object
               featureCompatibilityVersion:
                 description: FeatureCompatibilityVersion configures the feature compatibility

diff --git a/config/samples/mongodb.com_v1_mongodbcommunity_cr.yaml b/config/samples/mongodb.com_v1_mongodbcommunity_cr.yaml
@@ -7,10 +7,6 @@ spec:
   members: 3
   type: ReplicaSet
   version: "6.0.5"
-  automationConfig:
-    replicaSet:
-      settings:
-        electionTimeoutMillis: 20
   security:
     authentication:
       modes: ["SCRAM"]
@@ -37,4 +33,4 @@ metadata:
   name: my-user-password
 type: Opaque
 stringData:
-  password: pass
+  password: <your-password-here>