Merge pull request #9629 from eggfoobar/fix-tna-install

OCPEDGE-1701: fix: update tnf validation to account for tna install config

Author: openshift-merge-bot[bot]

pkg/types/validation/installconfig.go

@@ -1560,9 +1560,10 @@ func isV4NodeSubnetLargeEnough(cn []types.ClusterNetworkEntry, nodeSubnet *ipnet
 }
 
 // validateCredentialsNumber in case fencing credentials exists validates there are exactly 2.
-func validateCredentialsNumber(controlPlane *types.MachinePool, fencing *types.Fencing, fldPath *field.Path) field.ErrorList {
+func validateCredentialsNumber(installConfig *types.InstallConfig, fencing *types.Fencing, fldPath *field.Path) field.ErrorList {
 	errs := field.ErrorList{}
-	if controlPlane == nil || controlPlane.Replicas == nil {
+	controlPlane := installConfig.ControlPlane
+	if controlPlane == nil || controlPlane.Replicas == nil || installConfig.IsArbiterEnabled() {
 		// invalid use case covered by a different validation.
 		return errs
 	}
@@ -1590,7 +1591,7 @@ func validateFencingCredentials(installConfig *types.InstallConfig) (errors fiel
 	if fencingCredentials != nil {
 		allErrs = append(allErrs, common.ValidateUniqueAndRequiredFields(fencingCredentials.Credentials, fldPath, func([]byte) bool { return false }, "credentials")...)
 	}
-	allErrs = append(allErrs, validateCredentialsNumber(installConfig.ControlPlane, fencingCredentials, fldPath.Child("credentials"))...)
+	allErrs = append(allErrs, validateCredentialsNumber(installConfig, fencingCredentials, fldPath.Child("credentials"))...)
 
 	return allErrs
 }

pkg/types/validation/installconfig_test.go

@@ -2829,6 +2829,24 @@ func TestValidateTNF(t *testing.T) {
 			name:     "invalid_number_of_credentials_for_dual_replica",
 			expected: "controlPlane.fencing.credentials: Forbidden: there should be exactly two fencing credentials to support the two node cluster, instead 3 credentials were found",
 		},
+		{
+			config: installConfig().
+				MachinePoolArbiter(machinePool()).
+				MachinePoolCP(machinePool().Credential(c1(), c2())).
+				ArbiterReplicas(1).
+				CpReplicas(2).build(),
+			name:     "skip_number_of_credentials_validation_for_arbiter_deployment",
+			expected: "",
+		},
+		{
+			config: installConfig().
+				MachinePoolArbiter(machinePool()).
+				MachinePoolCP(machinePool().Credential(c1(), c2(), c3())).
+				ArbiterReplicas(1).
+				CpReplicas(2).build(),
+			name:     "skip_number_of_credentials_validation_for_arbiter_deployment_invalid_credentials_count",
+			expected: "",
+		},
 		{
 			config: installConfig().
 				MachinePoolCP(machinePool().
@@ -3040,6 +3058,19 @@ func (icb *installConfigBuilder) MachinePoolCP(builder *machinePoolBuilder) *ins
 	return icb
 }
 
+func (icb *installConfigBuilder) ArbiterReplicas(numOfCpReplicas int64) *installConfigBuilder {
+	if icb.InstallConfig.Arbiter == nil {
+		icb.InstallConfig.Arbiter = &types.MachinePool{}
+	}
+	icb.InstallConfig.Arbiter.Replicas = &numOfCpReplicas
+	return icb
+}
+
+func (icb *installConfigBuilder) MachinePoolArbiter(builder *machinePoolBuilder) *installConfigBuilder {
+	icb.InstallConfig.Arbiter = builder.build()
+	return icb
+}
+
 func (icb *installConfigBuilder) MachinePoolCompute(builders ...*machinePoolBuilder) *installConfigBuilder {
 	for _, builder := range builders {
 		icb.InstallConfig.Compute = append(icb.InstallConfig.Compute, *builder.build())