Auto detect spoke externalServerURLs

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · Nov 14, 2023 · 1b8f429 · 1b8f429
1 parent d501c39
commit 1b8f429
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 39 deletions.
diff --git a/apis/installer/v1alpha1/cluster_manager_spoke_types.go b/apis/installer/v1alpha1/cluster_manager_spoke_types.go
@@ -50,10 +50,6 @@ type ClusterManagerSpokeSpec struct {
 	// +optional
 	Hub SpokeHub `json:"hub"`
 
-	// Klusterlet is the klusterlet related configuration
-	// +optional
-	Klusterlet Klusterlet `json:"klusterlet"`
-
 	// Registry is the image registry related configuration
 	// +optional
 	Registry string `json:"registry"`
@@ -83,13 +79,6 @@ type SpokeHub struct {
 	KubeConfig string `json:"kubeConfig"`
 }
 
-// Klusterlet is for templating klusterlet configuration
-type Klusterlet struct {
-	// APIServer: The API Server external URL
-	// +optional
-	APIServer string `json:"apiServer"`
-}
-
 type SpokeBundleVersion struct {
 	// registration image version
 	// +optional

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/cluster-manager-spoke/README.md b/charts/cluster-manager-spoke/README.md
@@ -50,7 +50,6 @@ The following table lists the configurable parameters of the `cluster-manager-sp
 | clusterName                            |             | <code>""</code>                              |
 | hub.apiServer                          |             | <code>""</code>                              |
 | hub.kubeConfig                         |             | <code>""</code>                              |
-| klusterlet.apiServer                   |             | <code>""</code>                              |
 | registry                               |             | <code>quay.io/open-cluster-management</code> |
 | bundleVersion.registrationImageVersion |             | <code>""</code>                              |
 | bundleVersion.placementImageVersion    |             | <code>""</code>                              |

diff --git a/charts/cluster-manager-spoke/templates/klusterlets.cr.yaml b/charts/cluster-manager-spoke/templates/klusterlets.cr.yaml
@@ -45,6 +45,15 @@ data:
 
 ---
 
+# Test using:
+# helm install cluster-manager-spoke  charts/cluster-manager-spoke --set hub.kubeConfig=abc --set clusterName=abc --dry-run=server
+
+{{- $spokeConfig := (lookup "v1" "ConfigMap" "kube-public" "cluster-info").data.kubeconfig | fromYaml -}}
+{{- $spokeServer := (dig "cluster" "server" "" (first $spokeConfig.clusters)) -}}
+{{- if not (or (hasPrefix "http://" $spokeServer) (hasPrefix "https://" $spokeServer)) }}
+{{- $spokeServer = "" }}
+{{- end }}
+
 apiVersion: operator.open-cluster-management.io/v1
 kind: Klusterlet
 metadata:
@@ -57,10 +66,10 @@ spec:
   imagePullSpec: {{ .Values.registry}}/registration-operator:{{ default .Chart.AppVersion .Values.bundleVersion.operatorImageVersion}}
   clusterName: {{ required "A valid clusterName entry required!" .Values.clusterName }}
   namespace: {{ $klusterletNamespace }}
+  {{- if $spokeServer }}
   externalServerURLs:
-  {{ if .Values.klusterlet.apiServer }}
-  - url: {{ .Values.klusterlet.apiServer }}
-  {{ end }}
+  - url: {{ $spokeServer }}
+  {{- end }}
   {{if .Values.registrationFeatures}}
   registrationConfiguration:
     featureGates:

diff --git a/charts/cluster-manager-spoke/values.openapiv3_schema.yaml b/charts/cluster-manager-spoke/values.openapiv3_schema.yaml
@@ -19,11 +19,6 @@ properties:
       kubeConfig:
         type: string
     type: object
-  klusterlet:
-    properties:
-      apiServer:
-        type: string
-    type: object
   managedKubeconfig:
     type: string
   registrationFeatures:

diff --git a/charts/cluster-manager-spoke/values.yaml b/charts/cluster-manager-spoke/values.yaml
@@ -4,9 +4,6 @@ hub:
   apiServer: ""
   kubeConfig: ""
 
-klusterlet:
-  apiServer: ""
-
 registry: quay.io/open-cluster-management
 
 bundleVersion: