Merge pull request #1115 from zexi/automated-cherry-pick-of-#1114-ups…

…tream-release-3.12 Automated cherry pick of #1114: fix(operator): ensure cloud user of host deployer
yunionio · Jul 23, 2024 · daa6164 · daa6164
2 parents 7f77905 + 413a9d6
commit daa6164
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/manager/component/host-deployer.go b/pkg/manager/component/host-deployer.go
@@ -38,6 +38,10 @@ func (m *hostDeployerManager) Sync(oc *v1alpha1.OnecloudCluster) error {
 	return syncComponent(m, oc, oc.Spec.HostDeployer.Disable, "")
 }
 
+func (m *hostDeployerManager) getCloudUser(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.CloudUser {
+	return &cfg.HostAgent.CloudUser
+}
+
 func (m *hostDeployerManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1alpha1.OnecloudClusterConfig, zone string) (*corev1.ConfigMap, bool, error) {
 	if oc.Spec.ProductVersion == v1alpha1.ProductVersionCMP {
 		return newHostManager(m.ComponentManager).(*hostManager).getConfigMap(oc, cfg, zone)