mark ingress config fields as optional for controller-gen CRD generation

Signed-off-by: kahirokunn <okinakahiro@gmail.com>

Author: kahirokunn

config/charts/knative-operator/templates/crds/knativeservings.yaml

@@ -1575,16 +1575,12 @@ spec:
                     properties:
                       enabled:
                         type: boolean
-                    required:
-                    - enabled
                     type: object
                   gateway-api:
                     description: GatewayAPIIngressConfiguration specifies whether to enable the gateway-api ingresses.
                     properties:
                       enabled:
                         type: boolean
-                    required:
-                    - enabled
                     type: object
                   istio:
                     description: IstioIngressConfiguration specifies options for the istio ingresses.
@@ -2027,8 +2023,6 @@ spec:
                               type: object
                             type: array
                         type: object
-                    required:
-                    - enabled
                     type: object
                   kourier:
                     description: KourierIngressConfiguration specifies whether to enable the kourier ingresses.
@@ -2052,14 +2046,7 @@ spec:
                       service-type:
                         description: ServiceType specifies the service type for kourier gateway.
                         type: string
-                    required:
-                    - enabled
                     type: object
-                required:
-                - contour
-                - gateway-api
-                - istio
-                - kourier
                 type: object
               manifests:
                 description: A means to specify the manifests to install

config/crd/bases/operator.knative.dev_knativeservings.yaml

@@ -1647,17 +1647,13 @@ spec:
                     properties:
                       enabled:
                         type: boolean
-                    required:
-                    - enabled
                     type: object
                   gateway-api:
                     description: GatewayAPIIngressConfiguration specifies whether
                       to enable the gateway-api ingresses.
                     properties:
                       enabled:
                         type: boolean
-                    required:
-                    - enabled
                     type: object
                   istio:
                     description: IstioIngressConfiguration specifies options for the
@@ -2181,8 +2177,6 @@ spec:
                               type: object
                             type: array
                         type: object
-                    required:
-                    - enabled
                     type: object
                   kourier:
                     description: KourierIngressConfiguration specifies whether to
@@ -2212,14 +2206,7 @@ spec:
                         description: ServiceType specifies the service type for kourier
                           gateway.
                         type: string
-                    required:
-                    - enabled
                     type: object
-                required:
-                - contour
-                - gateway-api
-                - istio
-                - kourier
                 type: object
               manifests:
                 description: A means to specify the manifests to install

pkg/apis/operator/base/ingressconfiguration.go

@@ -23,7 +23,8 @@ import (
 
 // IstioIngressConfiguration specifies options for the istio ingresses.
 type IstioIngressConfiguration struct {
-	Enabled bool `json:"enabled"`
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
 
 	// KnativeIngressGateway overrides the knative-ingress-gateway.
 	// +optional
@@ -36,7 +37,8 @@ type IstioIngressConfiguration struct {
 
 // KourierIngressConfiguration specifies whether to enable the kourier ingresses.
 type KourierIngressConfiguration struct {
-	Enabled bool `json:"enabled"`
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
 
 	// ServiceType specifies the service type for kourier gateway.
 	ServiceType v1.ServiceType `json:"service-type,omitempty"`
@@ -56,12 +58,14 @@ type KourierIngressConfiguration struct {
 
 // ContourIngressConfiguration specifies whether to enable the contour ingresses.
 type ContourIngressConfiguration struct {
-	Enabled bool `json:"enabled"`
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
 }
 
 // GatewayAPIIngressConfiguration specifies whether to enable the gateway-api ingresses.
 type GatewayAPIIngressConfiguration struct {
-	Enabled bool `json:"enabled"`
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
 }
 
 // IstioGatewayOverride override the knative-ingress-gateway and knative-local-gateway(cluster-local-gateway)

pkg/apis/operator/v1beta1/knativeserving_types.go

@@ -89,10 +89,14 @@ type KnativeServingList struct {
 
 // IngressConfigs specifies options for the ingresses.
 type IngressConfigs struct {
-	Istio      base.IstioIngressConfiguration      `json:"istio"`
-	Kourier    base.KourierIngressConfiguration    `json:"kourier"`
-	Contour    base.ContourIngressConfiguration    `json:"contour"`
-	GatewayAPI base.GatewayAPIIngressConfiguration `json:"gateway-api"`
+	// +optional
+	Istio base.IstioIngressConfiguration `json:"istio,omitempty"`
+	// +optional
+	Kourier base.KourierIngressConfiguration `json:"kourier,omitempty"`
+	// +optional
+	Contour base.ContourIngressConfiguration `json:"contour,omitempty"`
+	// +optional
+	GatewayAPI base.GatewayAPIIngressConfiguration `json:"gateway-api,omitempty"`
 }
 
 // SecurityConfigs specifies options for the security