resolve change requests

Signed-off-by: Arnob kumar saha <arnob@appscode.com>
kubedb · Sep 14, 2022 · f844c61 · f844c61
1 parent 0c2dee6
commit f844c61
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 45 deletions.
diff --git a/apis/kubedb/v1alpha2/mongodb_helpers.go b/apis/kubedb/v1alpha2/mongodb_helpers.go
@@ -400,7 +400,7 @@ func (m MongoDB) Hosts() []string {
 			hosts = append(hosts, s)
 		}
 		if m.Spec.Hidden != nil {
-			for i := int32(0); i < *m.Spec.Hidden.Replicas; i++ {
+			for i := int32(0); i < m.Spec.Hidden.Replicas; i++ {
 				s := fmt.Sprintf("%v-%v.%v.%v.svc:%v", m.HiddenNodeName(), i, m.GoverningServiceName(m.OffshootName()), m.Namespace, MongoDBDatabasePort)
 				hosts = append(hosts, s)
 			}
@@ -446,7 +446,7 @@ func (m MongoDB) ShardHosts(nodeNum int32) []string {
 		hosts = append(hosts, s)
 	}
 	if m.Spec.Hidden != nil {
-		for i := int32(0); i < *m.Spec.Hidden.Replicas; i++ {
+		for i := int32(0); i < m.Spec.Hidden.Replicas; i++ {
 			s := fmt.Sprintf("%v-%v.%v.%v.svc:%v", m.HiddenShardNodeName(nodeNum), i, m.GoverningServiceName(m.ShardNodeName(nodeNum)), m.Namespace, MongoDBDatabasePort)
 			hosts = append(hosts, s)
 		}

diff --git a/apis/kubedb/v1alpha2/mongodb_types.go b/apis/kubedb/v1alpha2/mongodb_types.go
@@ -292,13 +292,10 @@ type MongoHiddenNode struct {
 
 	// Replicas represents number of replicas of this specific node.
 	// If current node has replicaset enabled, then replicas is the amount of replicaset nodes.
-	Replicas *int32 `json:"replicas,omitempty"`
+	Replicas int32 `json:"replicas"`
 
 	// Storage to specify how storage shall be used.
-	Storage *core.PersistentVolumeClaimSpec `json:"storage,omitempty"`
-
-	// EphemeralStorage spec to specify the configuration of ephemeral storage type.
-	EphemeralStorage *core.EmptyDirVolumeSource `json:"ephemeralStorage,omitempty"`
+	Storage core.PersistentVolumeClaimSpec `json:"storage"`
 }
 
 type MongoDBNode struct {

diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/crds/kubedb.com_mongodbs.yaml b/crds/kubedb.com_mongodbs.yaml
@@ -2536,17 +2536,6 @@ spec:
                       name:
                         type: string
                     type: object
-                  ephemeralStorage:
-                    properties:
-                      medium:
-                        type: string
-                      sizeLimit:
-                        anyOf:
-                        - type: integer
-                        - type: string
-                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                        x-kubernetes-int-or-string: true
-                    type: object
                   podTemplate:
                     properties:
                       controller:
@@ -4897,6 +4886,9 @@ spec:
                       volumeName:
                         type: string
                     type: object
+                required:
+                - replicas
+                - storage
                 type: object
               init:
                 properties:

diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -30949,15 +30949,15 @@
     },
     "dev.kubedb.apimachinery.apis.kubedb.v1alpha2.MongoHiddenNode": {
       "type": "object",
+      "required": [
+        "replicas",
+        "storage"
+      ],
       "properties": {
         "configSecret": {
           "description": "ConfigSecret is an optional field to provide custom configuration file for database (i.e mongod.cnf). If specified, this file will be used as configuration file otherwise default configuration file will be used.",
           "$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference"
         },
-        "ephemeralStorage": {
-          "description": "EphemeralStorage spec to specify the configuration of ephemeral storage type.",
-          "$ref": "#/definitions/io.k8s.api.core.v1.EmptyDirVolumeSource"
-        },
         "podTemplate": {
           "description": "PodTemplate is an optional configuration for pods used to expose database",
           "default": {},
@@ -30966,10 +30966,12 @@
         "replicas": {
           "description": "Replicas represents number of replicas of this specific node. If current node has replicaset enabled, then replicas is the amount of replicaset nodes.",
           "type": "integer",
-          "format": "int32"
+          "format": "int32",
+          "default": 0
         },
         "storage": {
           "description": "Storage to specify how storage shall be used.",
+          "default": {},
           "$ref": "#/definitions/io.k8s.api.core.v1.PersistentVolumeClaimSpec"
         }
       }