Bug 1706689: asset/manifests: update infrastructure to set public apiserver url

cmd/openshift-install/create.go

@@ -326,6 +326,7 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
 	clusterVersionContext, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
+	failing := configv1.ClusterStatusConditionType("Failing")
 	var lastError string
 	_, err = clientwatch.UntilWithSync(
 		clusterVersionContext,
@@ -343,8 +344,8 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
 				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorAvailable) {
 					return true, nil
 				}
-				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorFailing) {
-					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorFailing).Message
+				if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, failing) {
+					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, failing).Message
 				} else if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorProgressing) {
 					lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorProgressing).Message
 				}

pkg/asset/manifests/infrastructure.go

@@ -81,10 +81,11 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
 			// not namespaced
 		},
 		Status: configv1.InfrastructureStatus{
-			InfrastructureName:  clusterID.InfraID,
-			Platform:            platform,
-			APIServerURL:        getAPIServerURL(installConfig.Config),
-			EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
+			InfrastructureName:   clusterID.InfraID,
+			Platform:             platform,
+			APIServerURL:         getAPIServerURL(installConfig.Config),
+			APIServerInternalURL: getInternalAPIServerURL(installConfig.Config),
+			EtcdDiscoveryDomain:  getEtcdDiscoveryDomain(installConfig.Config),
 		},
 	}
 

pkg/asset/manifests/utils.go

@@ -34,6 +34,10 @@ func configMap(namespace, name string, data genericData) *configurationObject {
 }
 
 func getAPIServerURL(ic *types.InstallConfig) string {
+	return fmt.Sprintf("https://api.%s:6443", ic.ClusterDomain())
+}
+
+func getInternalAPIServerURL(ic *types.InstallConfig) string {
 	return fmt.Sprintf("https://api-int.%s:6443", ic.ClusterDomain())
 }