fix: adds enum validations to healtcheckprotocol field (#4193)

faiq · web-flow · commit fd5e11f51019 · 2023-04-04T23:23:41.000-07:00
* fix: adds enum validations to healtcheckprotocol field

* fix: revert enum changes in v1beta1
diff --git a/api/v1beta2/awscluster_types.go b/api/v1beta2/awscluster_types.go
@@ -195,6 +195,7 @@ type AWSLoadBalancerSpec struct {
 
 	// HealthCheckProtocol sets the protocol type for ELB health check target
 	// default value is ELBProtocolSSL
+	// +kubebuilder:validation:Enum=TCP;SSL;HTTP;HTTPS;TLS;UDP
 	// +optional
 	HealthCheckProtocol *ELBProtocol `json:"healthCheckProtocol,omitempty"`
 
diff --git a/api/v1beta2/network_types.go b/api/v1beta2/network_types.go
@@ -73,7 +73,7 @@ var (
 	ELBProtocolHTTPS = ELBProtocol("HTTPS")
 	// ELBProtocolTLS defines the NLB API string representing the TLS protocol.
 	ELBProtocolTLS = ELBProtocol("TLS")
-	// ELBProtocolUDP defines the NLB API string representing the UPD protocol.
+	// ELBProtocolUDP defines the NLB API string representing the UDP protocol.
 	ELBProtocolUDP = ELBProtocol("UDP")
 )
 
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -992,6 +992,13 @@ spec:
                   healthCheckProtocol:
                     description: HealthCheckProtocol sets the protocol type for ELB
                       health check target default value is ELBProtocolSSL
+                    enum:
+                    - TCP
+                    - SSL
+                    - HTTP
+                    - HTTPS
+                    - TLS
+                    - UDP
                     type: string
                   loadBalancerType:
                     default: classic
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
@@ -587,6 +587,13 @@ spec:
                           healthCheckProtocol:
                             description: HealthCheckProtocol sets the protocol type
                               for ELB health check target default value is ELBProtocolSSL
+                            enum:
+                            - TCP
+                            - SSL
+                            - HTTP
+                            - HTTPS
+                            - TLS
+                            - UDP
                             type: string
                           loadBalancerType:
                             default: classic

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ var (`
`73`	`73`	`ELBProtocolHTTPS = ELBProtocol("HTTPS")`
`74`	`74`	`// ELBProtocolTLS defines the NLB API string representing the TLS protocol.`
`75`	`75`	`ELBProtocolTLS = ELBProtocol("TLS")`
`76`		`- // ELBProtocolUDP defines the NLB API string representing the UPD protocol.`
	`76`	`+ // ELBProtocolUDP defines the NLB API string representing the UDP protocol.`
`77`	`77`	`ELBProtocolUDP = ELBProtocol("UDP")`
`78`	`78`	`)`
`79`	`79`