Passes ServiceEndpoints from install-config to CAPI

Signed-off-by: Hiro Miyamoto <[email protected]>

Author: miyamotoh

pkg/asset/cluster/powervs/powervs.go

@@ -23,5 +23,6 @@ func Metadata(config *types.InstallConfig, meta *icpowervs.Metadata) *powervs.Me
 		VPCRegion:            config.Platform.PowerVS.VPCRegion,
 		Zone:                 config.Platform.PowerVS.Zone,
 		ServiceInstanceGUID:  config.Platform.PowerVS.ServiceInstanceGUID,
+		ServiceEndpoints:     config.Platform.PowerVS.ServiceEndpoints,
 	}
 }

pkg/asset/installconfig/powervs/session.go

@@ -15,6 +15,9 @@ import (
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/form3tech-oss/jwt-go"
 	"github.com/sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/util/sets"
+
+	"github.com/openshift/installer/pkg/types/powervs"
 )
 
 var (
@@ -423,3 +426,18 @@ func getEnv(envs []string) string {
 	}
 	return ""
 }
+
+// FilterServiceEndpoints drops service endpoint overrides that are not supported by PowerVS CAPI provider.
+func (c *BxClient) FilterServiceEndpoints(cfg *powervs.Metadata) []string {
+	capiSupported := sets.New("cos", "powervs", "rc", "rm", "vpc") // see serviceIDs array definition in https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/pkg/endpoints/endpoints.go
+	overrides := make([]string, 0, len(cfg.ServiceEndpoints))
+	// CAPI expects name=url pairs of service endpoints
+	for _, endpoint := range cfg.ServiceEndpoints {
+		if capiSupported.Has(endpoint.Name) {
+			overrides = append(overrides, fmt.Sprintf("%s=%s", endpoint.Name, endpoint.URL))
+		} else {
+			logrus.Infof("Unsupported service endpoint skipped: %s", endpoint.Name)
+		}
+	}
+	return overrides
+}

pkg/clusterapi/system.go

@@ -291,24 +291,29 @@ func (c *system) Run(ctx context.Context) error {
 		}
 		APIKey := bxClient.GetBxClientAPIKey()
 
-		controllers = append(controllers,
-			c.getInfrastructureController(
-				&IBMCloud,
-				[]string{
-					"--provider-id-fmt=v2",
-					"--v=5",
-					"--health-addr={{suggestHealthHostPort}}",
-					"--webhook-port={{.WebhookPort}}",
-					"--webhook-cert-dir={{.WebhookCertDir}}",
-				},
-				map[string]string{
-					"IBMCLOUD_AUTH_TYPE": "iam",
-					"IBMCLOUD_APIKEY":    APIKey,
-					"IBMCLOUD_AUTH_URL":  "https://iam.cloud.ibm.com",
-					"LOGLEVEL":           "5",
-				},
-			),
+		controller := c.getInfrastructureController(
+			&IBMCloud,
+			[]string{
+				"--provider-id-fmt=v2",
+				"--v=5",
+				"--health-addr={{suggestHealthHostPort}}",
+				"--webhook-port={{.WebhookPort}}",
+				"--webhook-cert-dir={{.WebhookCertDir}}",
+			},
+			map[string]string{
+				"IBMCLOUD_AUTH_TYPE": "iam",
+				"IBMCLOUD_APIKEY":    APIKey,
+				"IBMCLOUD_AUTH_URL":  "https://iam.cloud.ibm.com",
+				"LOGLEVEL":           "5",
+			},
 		)
+		if cfg := metadata.PowerVS; cfg != nil && len(cfg.ServiceEndpoints) > 0 {
+			overrides := bxClient.FilterServiceEndpoints(cfg)
+			if len(overrides) > 0 {
+				controller.Args = append(controller.Args, fmt.Sprintf("--service-endpoint=%s:%s", cfg.Region, strings.Join(overrides, ",")))
+			}
+		}
+		controllers = append(controllers, controller)
 	default:
 		return fmt.Errorf("unsupported platform %q", platform)
 	}

pkg/types/powervs/metadata.go

@@ -1,13 +1,16 @@
 package powervs
 
+import configv1 "github.com/openshift/api/config/v1"
+
 // Metadata contains Power VS metadata (e.g. for uninstalling the cluster).
 type Metadata struct {
-	BaseDomain           string `json:"BaseDomain"`
-	CISInstanceCRN       string `json:"cisInstanceCRN"`
-	DNSInstanceCRN       string `json:"dnsInstanceCRN"`
-	PowerVSResourceGroup string `json:"powerVSResourceGroup"`
-	Region               string `json:"region"`
-	VPCRegion            string `json:"vpcRegion"`
-	Zone                 string `json:"zone"`
-	ServiceInstanceGUID  string `json:"serviceInstanceGUID"`
+	BaseDomain           string                            `json:"BaseDomain"`
+	CISInstanceCRN       string                            `json:"cisInstanceCRN"`
+	DNSInstanceCRN       string                            `json:"dnsInstanceCRN"`
+	PowerVSResourceGroup string                            `json:"powerVSResourceGroup"`
+	Region               string                            `json:"region"`
+	VPCRegion            string                            `json:"vpcRegion"`
+	Zone                 string                            `json:"zone"`
+	ServiceInstanceGUID  string                            `json:"serviceInstanceGUID"`
+	ServiceEndpoints     []configv1.PowerVSServiceEndpoint `json:"serviceEndpoints,omitempty"`
 }