Merge pull request #1917 from gcs278/add-listtypes

OCPBUGS-34906: Fix IngressController missing listTypes
openshift · Jul 1, 2024 · d3b3bb1 · d3b3bb1
2 parents 0689f00 + e3df50e
commit d3b3bb1
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 9 deletions.
diff --git a/config/v1/types_tlssecurityprofile.go b/config/v1/types_tlssecurityprofile.go
@@ -211,6 +211,7 @@ type TLSProfileSpec struct {
 	//   ciphers:
 	//     - DES-CBC3-SHA
 	//
+	// +listType=atomic
 	Ciphers []string `json:"ciphers"`
 	// minTLSVersion is used to specify the minimal version of the TLS protocol
 	// that is negotiated during the TLS handshake. For example, to use TLS

diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers.crd.yaml
@@ -234,6 +234,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       minTLSVersion:
                         description: "minTLSVersion is used to specify the minimal
                           version of the TLS protocol that is negotiated during the

diff --git a/...1/zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/AAA_ungated.yaml b/...1/zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/AAA_ungated.yaml
@@ -235,6 +235,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       minTLSVersion:
                         description: "minTLSVersion is used to specify the minimal
                           version of the TLS protocol that is negotiated during the

diff --git a/...iguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml b/...iguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml
@@ -126,6 +126,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       minTLSVersion:
                         description: "minTLSVersion is used to specify the minimal
                           version of the TLS protocol that is negotiated during the

diff --git a/...turegated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml b/...turegated-crd-manifests/kubeletconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml
@@ -127,6 +127,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       minTLSVersion:
                         description: "minTLSVersion is used to specify the minimal
                           version of the TLS protocol that is negotiated during the

diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -5825,7 +5825,8 @@
           "items": {
             "type": "string",
             "default": ""
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "minTLSVersion": {
           "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n  minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12",
@@ -10150,7 +10151,8 @@
           "items": {
             "type": "string",
             "default": ""
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "minTLSVersion": {
           "description": "minTLSVersion is used to specify the minimal version of the TLS protocol that is negotiated during the TLS handshake. For example, to use TLS versions 1.1, 1.2 and 1.3 (yaml):\n\n  minTLSVersion: VersionTLS11\n\nNOTE: currently the highest minTLSVersion allowed is VersionTLS12",
@@ -25369,7 +25371,8 @@
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.operator.v1.IngressControllerCaptureHTTPCookie"
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "httpCaptureHeaders": {
           "description": "httpCaptureHeaders defines HTTP headers that should be captured in access logs.  If this field is empty, no headers are captured.\n\nNote that this option only applies to cleartext HTTP connections and to secure HTTP connections for which the ingress controller terminates encryption (that is, edge-terminated or reencrypt connections).  Headers cannot be captured for TLS passthrough connections.",
@@ -27705,15 +27708,17 @@
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.operator.v1.IngressControllerCaptureHTTPHeader"
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "response": {
           "description": "response specifies which HTTP response headers to capture.\n\nIf this field is empty, no response headers are captured.",
           "type": "array",
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.operator.v1.IngressControllerCaptureHTTPHeader"
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         }
       }
     },
@@ -27812,7 +27817,8 @@
           "items": {
             "type": "string",
             "default": ""
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "uniqueId": {
           "description": "uniqueId describes configuration for a custom HTTP header that the ingress controller should inject into incoming HTTP requests. Typically, this header is configured to have a value that is unique to the HTTP request.  The header can be used by applications or included in access logs to facilitate tracing individual HTTP requests.\n\nIf this field is empty, no such header is injected into requests.",
@@ -27989,7 +27995,11 @@
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.operator.v1.OperatorCondition"
-          }
+          },
+          "x-kubernetes-list-map-keys": [
+            "type"
+          ],
+          "x-kubernetes-list-type": "map"
         },
         "domain": {
           "description": "domain is the actual domain in use.",
@@ -28946,7 +28956,8 @@
           "items": {
             "type": "string",
             "default": ""
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "dnsManagementPolicy": {
           "description": "dnsManagementPolicy indicates if the lifecycle of the wildcard DNS record associated with the load balancer service will be managed by the ingress operator. It defaults to Managed. Valid values are: Managed and Unmanaged.",
@@ -29870,7 +29881,8 @@
           "items": {
             "default": {},
             "$ref": "#/definitions/io.k8s.api.core.v1.Toleration"
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         }
       }
     },

diff --git a/operator/v1/types_ingress.go b/operator/v1/types_ingress.go
@@ -342,6 +342,7 @@ type NodePlacement struct {
 	// See https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 	//
 	// +optional
+	// +listType=atomic
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 }
 
@@ -413,6 +414,7 @@ type LoadBalancerStrategy struct {
 	//
 	// +nullable
 	// +optional
+	// +listType=atomic
 	AllowedSourceRanges []CIDR `json:"allowedSourceRanges,omitempty"`
 
 	// providerParameters holds desired load balancer information specific to
@@ -1129,6 +1131,7 @@ type IngressControllerCaptureHTTPHeaders struct {
 	//
 	// +nullable
 	// +optional
+	// +listType=atomic
 	Request []IngressControllerCaptureHTTPHeader `json:"request,omitempty"`
 
 	// response specifies which HTTP response headers to capture.
@@ -1137,6 +1140,7 @@ type IngressControllerCaptureHTTPHeaders struct {
 	//
 	// +nullable
 	// +optional
+	// +listType=atomic
 	Response []IngressControllerCaptureHTTPHeader `json:"response,omitempty"`
 }
 
@@ -1263,6 +1267,7 @@ type AccessLogging struct {
 	// +nullable
 	// +optional
 	// +kubebuilder:validation:MaxItems=1
+	// +listType=atomic
 	HTTPCaptureCookies []IngressControllerCaptureHTTPCookie `json:"httpCaptureCookies,omitempty"`
 
 	// logEmptyRequests specifies how connections on which no request is
@@ -1402,6 +1407,7 @@ type IngressControllerHTTPHeaders struct {
 	//
 	// +nullable
 	// +optional
+	// +listType=atomic
 	HeaderNameCaseAdjustments []IngressControllerHTTPHeaderNameCaseAdjustment `json:"headerNameCaseAdjustments,omitempty"`
 
 	// actions specifies options for modifying headers and their values.
@@ -1865,6 +1871,8 @@ type IngressControllerStatus struct {
 	//     * DNS is managed.
 	//     * DNS records have been successfully created.
 	//   - False if any of those conditions are unsatisfied.
+	// +listType=map
+	// +listMapKey=type
 	Conditions []OperatorCondition `json:"conditions,omitempty"`
 
 	// tlsProfile is the TLS connection configuration that is in effect.

diff --git a/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers.crd.yaml
@@ -246,6 +246,7 @@ spec:
                           type: string
                         nullable: true
                         type: array
+                        x-kubernetes-list-type: atomic
                       dnsManagementPolicy:
                         default: Managed
                         description: 'dnsManagementPolicy indicates if the lifecycle
@@ -878,6 +879,7 @@ spec:
                       type: string
                     nullable: true
                     type: array
+                    x-kubernetes-list-type: atomic
                   uniqueId:
                     description: "uniqueId describes configuration for a custom HTTP
                       header that the ingress controller should inject into incoming
@@ -1084,6 +1086,7 @@ spec:
                         maxItems: 1
                         nullable: true
                         type: array
+                        x-kubernetes-list-type: atomic
                       httpCaptureHeaders:
                         description: "httpCaptureHeaders defines HTTP headers that
                           should be captured in access logs.  If this field is empty,
@@ -1122,6 +1125,7 @@ spec:
                               type: object
                             nullable: true
                             type: array
+                            x-kubernetes-list-type: atomic
                           response:
                             description: "response specifies which HTTP response headers
                               to capture. \n If this field is empty, no response headers
@@ -1151,6 +1155,7 @@ spec:
                               type: object
                             nullable: true
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                       httpLogFormat:
                         description: "httpLogFormat specifies the format of the log
@@ -1340,6 +1345,7 @@ spec:
                           type: string
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                 type: object
               replicas:
                 description: "replicas is the desired number of ingress controller
@@ -1464,6 +1470,7 @@ spec:
                         items:
                           type: string
                         type: array
+                        x-kubernetes-list-type: atomic
                       minTLSVersion:
                         description: "minTLSVersion is used to specify the minimal
                           version of the TLS protocol that is negotiated during the
@@ -1784,6 +1791,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               domain:
                 description: domain is the actual domain in use.
                 type: string
@@ -1889,6 +1899,7 @@ spec:
                           type: string
                         nullable: true
                         type: array
+                        x-kubernetes-list-type: atomic
                       dnsManagementPolicy:
                         default: Managed
                         description: 'dnsManagementPolicy indicates if the lifecycle
@@ -2246,6 +2257,7 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-list-type: atomic
                   minTLSVersion:
                     description: "minTLSVersion is used to specify the minimal version
                       of the TLS protocol that is negotiated during the TLS handshake.