Augment renderConfig with the External and Internal API LB IPs

When installing on cloud plaforms with `userConfiguredDNS` enabled, the Installer will provide the MCO instance running on the bootstrap node with a ConfigMap containing the Internal and External LB IPs. These IPs are added to renderConfig.
openshift · Nov 15, 2023 · f8a4eec · f8a4eec
1 parent 656e4b2
commit f8a4eec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pkg/operator/render.go b/pkg/operator/render.go
@@ -34,6 +34,8 @@ type renderConfig struct {
 	Infra                  configv1.Infrastructure
 	Constants              map[string]string
 	PointerConfig          string
+	CloudIntLBIPs          []string
+	CloudExtLBIPs          []string
 }
 
 type assetRenderer struct {
@@ -351,3 +353,15 @@ func onPremPlatformAPIServerInternalIPs(cfg mcfgv1.ControllerConfigSpec) (interf
 	}
 	return nil, fmt.Errorf("")
 }
+
+func cloudPlatformShortName(cfg mcfgv1.ControllerConfigSpec) interface{} {
+	if cfg.Infra.Status.PlatformStatus != nil {
+		switch cfg.Infra.Status.PlatformStatus.Type {
+		case configv1.GCPPlatformType:
+			return "gcp"
+		default:
+			return ""
+		}
+	}
+	return ""
+}
diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -581,7 +581,7 @@ func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
 	}
 
 	// create renderConfig
-	optr.renderConfig = getRenderConfig(optr.namespace, string(kubeAPIServerServingCABytes), spec, &imgs.RenderConfigImages, infra.Status.APIServerInternalURL, pointerConfigData)
+	optr.renderConfig = getRenderConfig(optr.namespace, string(kubeAPIServerServingCABytes), spec, &imgs.RenderConfigImages, infra.Status.APIServerInternalURL, pointerConfigData, nil, nil)
 	return nil
 }
 
@@ -1492,7 +1492,7 @@ func setGVK(obj runtime.Object, scheme *runtime.Scheme) error {
 	return nil
 }
 
-func getRenderConfig(tnamespace, kubeAPIServerServingCA string, ccSpec *mcfgv1.ControllerConfigSpec, imgs *RenderConfigImages, apiServerURL string, pointerConfigData []byte) *renderConfig {
+func getRenderConfig(tnamespace, kubeAPIServerServingCA string, ccSpec *mcfgv1.ControllerConfigSpec, imgs *RenderConfigImages, apiServerURL string, pointerConfigData []byte, cloudIntLBIPs, cloudExtLBIPs []string) *renderConfig {
 	return &renderConfig{
 		TargetNamespace:        tnamespace,
 		Version:                version.Raw,
@@ -1502,6 +1502,8 @@ func getRenderConfig(tnamespace, kubeAPIServerServingCA string, ccSpec *mcfgv1.C
 		KubeAPIServerServingCA: kubeAPIServerServingCA,
 		APIServerURL:           apiServerURL,
 		PointerConfig:          string(pointerConfigData),
+		CloudIntLBIPs:          cloudIntLBIPs,
+		CloudExtLBIPs:          cloudExtLBIPs,
 	}
 }