Adjust types definition to reflect what is optional

This change adds optional and removes omitempty according to our
usage of the resource.

Change-Id: I958db19eb448dc0cf55b93a20fda4c0dbd3f7f0c

Author: TristanCacqueray

api/v1/softwarefactory_types.go

@@ -39,7 +39,7 @@ type FluentBitForwarderSpec struct {
 	// Run fluent bit sidecars in debug mode. This will output forwarded payloads and additional info in the sidecar's logs. Defaults to false.
 	Debug *bool `json:"debug,omitempty"`
 	// The Host for the Fluent Bit Forward Input to forward logs to.
-	ForwardInputHost string `json:"forwardInputHost,omitempty"`
+	ForwardInputHost string `json:"forwardInputHost"`
 	// The (optional) port of the forward input, defaults to 24224.
 	// +kubebuilder:default:=24224
 	ForwardInputPort int32 `json:"forwardInputPort,omitempty"`
@@ -532,15 +532,15 @@ type NodepoolSpec struct {
 }
 
 type ZookeeperSpec struct {
-	Storage StorageSpec `json:"storage"`
+	Storage StorageSpec `json:"storage,omitempty"`
 	// Memory/CPU Limit
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={"memory": "2Gi", "cpu": "500m"}
 	Limits *LimitsSpec `json:"limits"`
 }
 
 type CodesearchSpec struct {
-	Storage StorageSpec `json:"storage"`
+	Storage StorageSpec `json:"storage,omitempty"`
 	// Memory/CPU Limit
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={"memory": "2Gi", "cpu": "500m"}
@@ -560,9 +560,9 @@ type LimitsSpec struct {
 
 type MariaDBSpec struct {
 	// Storage parameters related to mariaDB's data
-	DBStorage StorageSpec `json:"dbStorage"`
+	DBStorage StorageSpec `json:"dbStorage,omitempty"`
 	// Storage parameters related to the database's logging
-	LogStorage StorageSpec `json:"logStorage"`
+	LogStorage StorageSpec `json:"logStorage,omitempty"`
 	// Memory/CPU Limit
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={"memory": "2Gi", "cpu": "500m"}

config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml

@@ -72,6 +72,8 @@ spec:
                       to 24224.
                     format: int32
                     type: integer
+                required:
+                - forwardInputHost
                 type: object
               codesearch:
                 description: Codesearch service spec
@@ -123,8 +125,6 @@ spec:
                     required:
                     - size
                     type: object
-                required:
-                - storage
                 type: object
               config-location:
                 description: Config repository spec
@@ -313,9 +313,6 @@ spec:
                     required:
                     - size
                     type: object
-                required:
-                - dbStorage
-                - logStorage
                 type: object
               nodepool:
                 description: Nodepool services spec
@@ -493,8 +490,6 @@ spec:
                     required:
                     - size
                     type: object
-                required:
-                - storage
                 type: object
               zuul:
                 description: Zuul service spec

schemas/Codesearch.dhall

@@ -1,7 +1,11 @@
 { Type =
-    { storage : (./Storage.dhall).Type
-    , enabled : Optional Bool
+    { enabled : Optional Bool
     , limits : Optional (./Limits.dhall).Type
+    , storage : Optional (./Storage.dhall).Type
     }
-, default = { enabled = None Bool, limits = None (./Limits.dhall).Type }
+, default =
+  { enabled = None Bool
+  , limits = None (./Limits.dhall).Type
+  , storage = None (./Storage.dhall).Type
+  }
 }

schemas/FluentBitLogForwarding.dhall

@@ -1,11 +1,7 @@
 { Type =
-    { debug : Optional Bool
-    , forwardInputHost : Optional Text
+    { forwardInputHost : Text
+    , debug : Optional Bool
     , forwardInputPort : Optional Natural
     }
-, default =
-  { debug = None Bool
-  , forwardInputHost = None Text
-  , forwardInputPort = None Natural
-  }
+, default = { debug = None Bool, forwardInputPort = None Natural }
 }

schemas/Mariadb.dhall

@@ -1,7 +1,11 @@
 { Type =
-    { dbStorage : (./Storage.dhall).Type
-    , logStorage : (./Storage.dhall).Type
+    { dbStorage : Optional (./Storage.dhall).Type
     , limits : Optional (./Limits.dhall).Type
+    , logStorage : Optional (./Storage.dhall).Type
     }
-, default.limits = None (./Limits.dhall).Type
+, default =
+  { dbStorage = None (./Storage.dhall).Type
+  , limits = None (./Limits.dhall).Type
+  , logStorage = None (./Storage.dhall).Type
+  }
 }

schemas/Zookeeper.dhall

@@ -1,6 +1,7 @@
 { Type =
-    { storage : (./Storage.dhall).Type
-    , limits : Optional (./Limits.dhall).Type
+    { limits : Optional (./Limits.dhall).Type
+    , storage : Optional (./Storage.dhall).Type
     }
-, default.limits = None (./Limits.dhall).Type
+, default =
+  { limits = None (./Limits.dhall).Type, storage = None (./Storage.dhall).Type }
 }