diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml index 08180c8613d..456cd46cfeb 100644 --- a/data/data/install.openshift.io_installconfigs.yaml +++ b/data/data/install.openshift.io_installconfigs.yaml @@ -1112,9 +1112,9 @@ spec: \"Manual\": CredentialsRequests must be handled manually by the user \n For each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: \"Mint\", - \"Passthrough\", \"Manual\" Azure: \"Mint\", \"Passthrough\", \"Manual\" - AzureStack: \"Manual\" GCP: \"Mint\", \"Passthrough\", \"Manual\" IBMCloud: - \"Manual\" AlibabaCloud: \"Manual\" PowerVS: \"Manual\"" + \"Passthrough\", \"Manual\" Azure: \"Passthrough\", \"Manual\" AzureStack: + \"Manual\" GCP: \"Mint\", \"Passthrough\", \"Manual\" IBMCloud: \"Manual\" + AlibabaCloud: \"Manual\" PowerVS: \"Manual\"" enum: - "" - Mint diff --git a/pkg/explain/printer_test.go b/pkg/explain/printer_test.go index 84f812694ed..bfd494dbb97 100644 --- a/pkg/explain/printer_test.go +++ b/pkg/explain/printer_test.go @@ -46,7 +46,7 @@ func Test_PrintFields(t *testing.T) { CredentialsMode is used to explicitly set the mode with which CredentialRequests are satisfied. If this field is set, then the installer will not attempt to query the cloud permissions before attempting installation. If the field is not set or empty, then the installer will perform its normal verification that the credentials provided are sufficient to perform an installation. There are three possible values for this field, but the valid values are dependent upon the platform being used. "Mint": create new credentials with a subset of the overall permissions for each CredentialsRequest "Passthrough": copy the credentials with all of the overall permissions for each CredentialsRequest "Manual": CredentialsRequests must be handled manually by the user - For each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: "Mint", "Passthrough", "Manual" Azure: "Mint", "Passthrough", "Manual" AzureStack: "Manual" GCP: "Mint", "Passthrough", "Manual" IBMCloud: "Manual" AlibabaCloud: "Manual" PowerVS: "Manual" + For each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: "Mint", "Passthrough", "Manual" Azure: "Passthrough", "Manual" AzureStack: "Manual" GCP: "Mint", "Passthrough", "Manual" IBMCloud: "Manual" AlibabaCloud: "Manual" PowerVS: "Manual" fips Default: false diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go index e18c1fab253..940acab16bc 100644 --- a/pkg/types/installconfig.go +++ b/pkg/types/installconfig.go @@ -147,7 +147,7 @@ type InstallConfig struct { // For each of the following platforms, the field can set to the specified values. For all other platforms, the // field must not be set. // AWS: "Mint", "Passthrough", "Manual" - // Azure: "Mint", "Passthrough", "Manual" + // Azure: "Passthrough", "Manual" // AzureStack: "Manual" // GCP: "Mint", "Passthrough", "Manual" // IBMCloud: "Manual" diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go index a29158e4da5..bc905b93a6c 100644 --- a/pkg/types/validation/installconfig.go +++ b/pkg/types/validation/installconfig.go @@ -616,7 +616,7 @@ func validateCloudCredentialsMode(mode types.CredentialsMode, fldPath *field.Pat } allErrs := field.ErrorList{} - allowedAzureModes := []types.CredentialsMode{types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode} + allowedAzureModes := []types.CredentialsMode{types.PassthroughCredentialsMode, types.ManualCredentialsMode} if platform.Azure != nil && platform.Azure.CloudName == azure.StackCloud { allowedAzureModes = []types.CredentialsMode{types.ManualCredentialsMode} }