Fix Tests

hyperledger-bevel · May 29, 2023 · e31e360 · e31e360
1 parent 2ce111b
commit e31e360
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go b/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go
@@ -176,7 +176,10 @@ type FabricPeerSpec struct {
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
-	GatewayApi       *FabricGatewayApi    `json:"gatewayApi"`
+	GatewayApi *FabricGatewayApi `json:"gatewayApi"`
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +nullable
 	Istio            *FabricIstio         `json:"istio"`
 	Gossip           FabricPeerSpecGossip `json:"gossip"`
 	ExternalEndpoint string               `json:"externalEndpoint"`
@@ -527,12 +530,18 @@ type FabricOrdererNodeSpec struct {
 	// +kubebuilder:validation:Optional
 	// +nullable
 	GatewayApi *FabricGatewayApi `json:"gatewayApi"`
-	Istio      *FabricIstio      `json:"istio"`
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +nullable
+	Istio *FabricIstio `json:"istio"`
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +nullable
 	AdminGatewayApi *FabricGatewayApi `json:"adminGatewayApi"`
-	AdminIstio      *FabricIstio      `json:"adminIstio"`
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +nullable
+	AdminIstio *FabricIstio `json:"adminIstio"`
 
 	// +nullable
 	// +kubebuilder:validation:Optional
@@ -645,8 +654,11 @@ type FabricCASpec struct {
 	// +kubebuilder:validation:Optional
 	// +nullable
 	GatewayApi *FabricGatewayApi `json:"gatewayApi"`
-	Istio      *FabricIstio      `json:"istio"`
-	Database   FabricCADatabase  `json:"db"`
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +nullable
+	Istio    *FabricIstio     `json:"istio"`
+	Database FabricCADatabase `json:"db"`
 	// +kubebuilder:validation:MinItems=1
 	// Hosts for the Fabric CA
 	Hosts   []string            `json:"hosts"`

diff --git a/config/crd/bases/hlf.kungfusoftware.es_fabriccas.yaml b/config/crd/bases/hlf.kungfusoftware.es_fabriccas.yaml
@@ -1393,6 +1393,7 @@ spec:
                 nullable: true
                 type: array
               istio:
+                nullable: true
                 properties:
                   hosts:
                     items:
@@ -2033,7 +2034,6 @@ spec:
             - debug
             - hosts
             - image
-            - istio
             - metrics
             - resources
             - rootCA

diff --git a/config/crd/bases/hlf.kungfusoftware.es_fabricorderernodes.yaml b/config/crd/bases/hlf.kungfusoftware.es_fabricorderernodes.yaml
@@ -65,6 +65,7 @@ spec:
                 - gatewayNamespace
                 type: object
               adminIstio:
+                nullable: true
                 properties:
                   hosts:
                     items:
@@ -1139,6 +1140,7 @@ spec:
                 nullable: true
                 type: array
               istio:
+                nullable: true
                 properties:
                   hosts:
                     items:
@@ -1495,12 +1497,10 @@ spec:
                 nullable: true
                 type: string
             required:
-            - adminIstio
             - bootstrapMethod
             - channelParticipationEnabled
             - genesis
             - image
-            - istio
             - mspID
             - replicas
             - resources

diff --git a/config/crd/bases/hlf.kungfusoftware.es_fabricpeers.yaml b/config/crd/bases/hlf.kungfusoftware.es_fabricpeers.yaml
@@ -1242,6 +1242,7 @@ spec:
                 nullable: true
                 type: array
               istio:
+                nullable: true
                 properties:
                   hosts:
                     items:
@@ -1788,7 +1789,6 @@ spec:
             - gossip
             - hosts
             - image
-            - istio
             - logging
             - mspID
             - replicas