Merge pull request #9734 from shiftstack/OCPBUGS-43783

OSASINFRA-3915: openstack: Start setting CredentialsMode

Author: openshift-merge-bot[bot]

data/data/install.openshift.io_installconfigs.yaml

@@ -4260,13 +4260,14 @@ spec:
               "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
+              For each of the following platforms, the field can be 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"
+              OpenStack: "Passthrough"
               PowerVS: "Manual"
               Nutanix: "Manual"
             enum:

pkg/explain/printer_test.go

@@ -81,13 +81,14 @@ There are three possible values for this field, but the valid values are depende
 "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
+For each of the following platforms, the field can be 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"
+OpenStack: "Passthrough"
 PowerVS: "Manual"
 Nutanix: "Manual"
 

pkg/types/defaults/installconfig.go

@@ -90,6 +90,8 @@ func SetInstallConfigDefaults(c *types.InstallConfig) {
 	if c.CredentialsMode == "" {
 		if c.Platform.Azure != nil && c.Platform.Azure.CloudName == azure.StackCloud {
 			c.CredentialsMode = types.ManualCredentialsMode
+		} else if c.Platform.OpenStack != nil {
+			c.CredentialsMode = types.PassthroughCredentialsMode
 		} else if c.Platform.Nutanix != nil {
 			c.CredentialsMode = types.ManualCredentialsMode
 		} else if c.Platform.PowerVS != nil {

pkg/types/defaults/installconfig_test.go

@@ -63,6 +63,7 @@ func defaultAzureInstallConfig() *types.InstallConfig {
 
 func defaultOpenStackInstallConfig() *types.InstallConfig {
 	c := defaultInstallConfig()
+	c.CredentialsMode = types.PassthroughCredentialsMode
 	c.Platform.OpenStack = &openstack.Platform{}
 	openstackdefaults.SetPlatformDefaults(c.Platform.OpenStack, c.Networking)
 	return c

pkg/types/installconfig.go

@@ -193,13 +193,14 @@ type InstallConfig struct {
 	// "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
+	// For each of the following platforms, the field can be 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"
+	// OpenStack: "Passthrough"
 	// PowerVS: "Manual"
 	// Nutanix: "Manual"
 	// +optional

pkg/types/validation/installconfig.go

@@ -1285,12 +1285,13 @@ func validateCloudCredentialsMode(mode types.CredentialsMode, fldPath *field.Pat
 	// validPlatformCredentialsModes is a map from the platform name to a slice of credentials modes that are valid
 	// 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:    allowedAzureModes,
-		gcp.Name:      {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode},
-		ibmcloud.Name: {types.ManualCredentialsMode},
-		powervs.Name:  {types.ManualCredentialsMode},
-		nutanix.Name:  {types.ManualCredentialsMode},
+		aws.Name:       {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode},
+		azure.Name:     allowedAzureModes,
+		gcp.Name:       {types.MintCredentialsMode, types.PassthroughCredentialsMode, types.ManualCredentialsMode},
+		openstack.Name: {types.PassthroughCredentialsMode},
+		ibmcloud.Name:  {types.ManualCredentialsMode},
+		powervs.Name:   {types.ManualCredentialsMode},
+		nutanix.Name:   {types.ManualCredentialsMode},
 	}
 	if validModes, ok := validPlatformCredentialsModes[platform.Name()]; ok {
 		validModesSet := sets.NewString()