Apply review feedback

- Modify SSL Certification to be enum instead of boolean

Signed-off-by: Michael Shitrit <[email protected]>

Author: mshitrit

data/data/install.openshift.io_installconfigs.yaml

@@ -71,8 +71,15 @@ spec:
                       properties:
                         address:
                           type: string
-                        disableCertificateVerification:
-                          type: boolean
+                        certificateVerification:
+                          default: Enabled
+                          description: |-
+                            CertificateVerification Defines whether ssl certificate verification is required or not.
+                            If omitted, the platform chooses a default, that default is enabled.
+                          enum:
+                          - Enabled
+                          - Disabled
+                          type: string
                         hostName:
                           type: string
                         password:
@@ -81,7 +88,6 @@ spec:
                           type: string
                       required:
                       - address
-                      - disableCertificateVerification
                       - password
                       - username
                       type: object
@@ -1387,8 +1393,15 @@ spec:
                         properties:
                           address:
                             type: string
-                          disableCertificateVerification:
-                            type: boolean
+                          certificateVerification:
+                            default: Enabled
+                            description: |-
+                              CertificateVerification Defines whether ssl certificate verification is required or not.
+                              If omitted, the platform chooses a default, that default is enabled.
+                            enum:
+                            - Enabled
+                            - Disabled
+                            type: string
                           hostName:
                             type: string
                           password:
@@ -1397,7 +1410,6 @@ spec:
                             type: string
                         required:
                         - address
-                        - disableCertificateVerification
                         - password
                         - username
                         type: object
@@ -2642,8 +2654,15 @@ spec:
                       properties:
                         address:
                           type: string
-                        disableCertificateVerification:
-                          type: boolean
+                        certificateVerification:
+                          default: Enabled
+                          description: |-
+                            CertificateVerification Defines whether ssl certificate verification is required or not.
+                            If omitted, the platform chooses a default, that default is enabled.
+                          enum:
+                          - Enabled
+                          - Disabled
+                          type: string
                         hostName:
                           type: string
                         password:
@@ -2652,7 +2671,6 @@ spec:
                           type: string
                       required:
                       - address
-                      - disableCertificateVerification
                       - password
                       - username
                       type: object

pkg/types/machinepools.go

@@ -158,11 +158,26 @@ type Fencing struct {
 	Credentials []*Credential `json:"credentials,omitempty"`
 }
 
+// CertificateVerificationPolicy represents the options for CertificateVerification .
+type CertificateVerificationPolicy string
+
+const (
+	// CertificateVerificationEnabled enables ssl certificate verification.
+	CertificateVerificationEnabled CertificateVerificationPolicy = "Enabled"
+	// CertificateVerificationDisabled disables ssl certificate verification.
+	CertificateVerificationDisabled CertificateVerificationPolicy = "Disabled"
+)
+
 // Credential stores the information about a baremetal host's management controller.
 type Credential struct {
-	HostName                       string `json:"hostName,omitempty" validate:"required,uniqueField"`
-	Username                       string `json:"username" validate:"required"`
-	Password                       string `json:"password" validate:"required"`
-	Address                        string `json:"address" validate:"required,uniqueField"`
-	DisableCertificateVerification bool   `json:"disableCertificateVerification"`
+	HostName string `json:"hostName,omitempty" validate:"required,uniqueField"`
+	Username string `json:"username" validate:"required"`
+	Password string `json:"password" validate:"required"`
+	Address  string `json:"address" validate:"required,uniqueField"`
+	// CertificateVerification Defines whether ssl certificate verification is required or not.
+	// If omitted, the platform chooses a default, that default is enabled.
+	// +kubebuilder:default:="Enabled"
+	// +kubebuilder:validation:Enum=Enabled;Disabled
+	// +optional
+	CertificateVerification CertificateVerificationPolicy `json:"certificateVerification,omitempty"`
 }

pkg/types/validation/installconfig_test.go

@@ -2824,8 +2824,9 @@ func TestValidateTNF(t *testing.T) {
 		},
 		{
 			config: installConfig().
+				PlatformBMWithHosts().
 				MachinePoolCP(machinePool().
-					Credential(c1().DisableCertificateVerification(true), c2())).
+					Credential(c1().CertificateVerification(types.CertificateVerificationDisabled), c2())).
 				CpReplicas(2).
 				build(),
 			name:     "valid_with_disabled_cert_verification",
@@ -3026,8 +3027,8 @@ func (hb *credentialBuilder) BMCPassword(value string) *credentialBuilder {
 	return hb
 }
 
-func (hb *credentialBuilder) DisableCertificateVerification(value bool) *credentialBuilder {
-	hb.Credential.DisableCertificateVerification = value
+func (hb *credentialBuilder) CertificateVerification(value types.CertificateVerificationPolicy) *credentialBuilder {
+	hb.Credential.CertificateVerification = value
 	return hb
 }