diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml index cf357867f1a..948094620c8 100644 --- a/data/data/install.openshift.io_installconfigs.yaml +++ b/data/data/install.openshift.io_installconfigs.yaml @@ -803,8 +803,8 @@ 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\" - GCP: \"Mint\", \"Passthrough\", \"Manual\"" + \"Passthrough\", \"Manual\" Azure: \"Passthrough\", \"Manual\" GCP: + \"Mint\", \"Passthrough\", \"Manual\"" enum: - "" - Mint diff --git a/pkg/explain/printer_test.go b/pkg/explain/printer_test.go index 4cd81663e10..6c65476f5f5 100644 --- a/pkg/explain/printer_test.go +++ b/pkg/explain/printer_test.go @@ -43,7 +43,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" GCP: "Mint", "Passthrough", "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" GCP: "Mint", "Passthrough", "Manual" fips Default: false diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go index 4a7dc88b5e1..4897d752809 100644 --- a/pkg/types/installconfig.go +++ b/pkg/types/installconfig.go @@ -138,7 +138,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" // GCP: "Mint", "Passthrough", "Manual" // +optional CredentialsMode CredentialsMode `json:"credentialsMode,omitempty"` diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go index babfdcdb006..8abdf9550a3 100644 --- a/pkg/types/validation/installconfig.go +++ b/pkg/types/validation/installconfig.go @@ -561,7 +561,7 @@ func validateCloudCredentialsMode(mode types.CredentialsMode, fldPath *field.Pat // for the platform. If a platform name is not in the map, then the credentials mode cannot be set for that platform. validPlatformCredentialsModes := map[string][]types.CredentialsMode{ aws.Name: {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode}, - azure.Name: {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode}, + azure.Name: {types.PassthroughCredentialsMode, types.ManualCredentialsMode}, gcp.Name: {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode}, } if validModes, ok := validPlatformCredentialsModes[platform]; ok {