Merge pull request openshift#7608 from s-fairchild/update-aro-build

openshift-ci[bot] · web-flow · commit 6b79ceb6b1a8 · 2023-11-02T20:37:36.000Z
OCPBUGS-22113: Do not generate azure-cloud-provider in manual mode for aro builds
diff --git a/pkg/asset/manifests/openshift.go b/pkg/asset/manifests/openshift.go
@@ -270,7 +270,7 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 		assetData["99_baremetal-provisioning-config.yaml"] = applyTemplateData(baremetalConfig.Files()[0].Data, bmTemplateData)
 	}
 
-	if platform == azuretypes.Name && installConfig.Config.Azure.IsARO() {
+	if platform == azuretypes.Name && installConfig.Config.Azure.IsARO() && installConfig.Config.CredentialsMode != types.ManualCredentialsMode {
 		// config is used to created compatible secret to trigger azure cloud
 		// controller config merge behaviour
 		// https://github.com/openshift/origin/blob/90c050f5afb4c52ace82b15e126efe98fa798d88/vendor/k8s.io/legacy-cloud-providers/azure/azure_config.go#L83

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {`
`270`	`270`	`assetData["99_baremetal-provisioning-config.yaml"] = applyTemplateData(baremetalConfig.Files()[0].Data, bmTemplateData)`
`271`	`271`	`}`
`272`	`272`
`273`		`- if platform == azuretypes.Name && installConfig.Config.Azure.IsARO() {`
	`273`	`+ if platform == azuretypes.Name && installConfig.Config.Azure.IsARO() && installConfig.Config.CredentialsMode != types.ManualCredentialsMode {`
`274`	`274`	`// config is used to created compatible secret to trigger azure cloud`
`275`	`275`	`// controller config merge behaviour`
`276`	`276`	`// https://github.com/openshift/origin/blob/90c050f5afb4c52ace82b15e126efe98fa798d88/vendor/k8s.io/legacy-cloud-providers/azure/azure_config.go#L83`