Pass spoke cluster name to the agent (#29)

Signed-off-by: Rokibul Hasan <mdrokibulhasan@appscode.com>

Author: RokibulHasan7

pkg/apiserver/apiserver.go

@@ -51,7 +51,6 @@ import (
 	cu "kmodules.xyz/client-go/client"
 	clustermeta "kmodules.xyz/client-go/cluster"
 	clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1"
-	ocmoperator "open-cluster-management.io/api/operator/v1"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -71,7 +70,6 @@ func init() {
 	proxyserverinstall.Install(Scheme)
 	utilruntime.Must(clientgoscheme.AddToScheme(Scheme))
 	utilruntime.Must(clusterv1alpha1.Install(Scheme))
-	utilruntime.Must(ocmoperator.Install(Scheme))
 	utilruntime.Must(core.AddToScheme(Scheme))
 
 	// we need to add the options to empty v1
@@ -91,12 +89,13 @@ func init() {
 
 // ExtraConfig holds custom apiserver config
 type ExtraConfig struct {
-	ClientConfig  *restclient.Config
-	BaseURL       string
-	Token         string
-	LicenseDir    string
-	CacheDir      string
-	HubKubeconfig string
+	ClientConfig     *restclient.Config
+	BaseURL          string
+	Token            string
+	LicenseDir       string
+	CacheDir         string
+	HubKubeconfig    string
+	SpokeClusterName string
 }
 
 // Config defines the config for the apiserver
@@ -220,6 +219,9 @@ func (c completedConfig) New(ctx context.Context) (*LicenseProxyServer, error) {
 	}
 
 	if isSpokeCluster {
+		if c.ExtraConfig.SpokeClusterName == "" {
+			return nil, fmt.Errorf("missing --cluster-name")
+		}
 		if c.ExtraConfig.HubKubeconfig == "" {
 			return nil, fmt.Errorf("missing --hub-kubeconfig")
 		}
@@ -248,13 +250,6 @@ func (c completedConfig) New(ctx context.Context) (*LicenseProxyServer, error) {
 			os.Exit(1)
 		}
 
-		// get klusterlet
-		kl := ocmoperator.Klusterlet{}
-		err = spokeManager.GetAPIReader().Get(context.Background(), client.ObjectKey{Name: "klusterlet"}, &kl)
-		if err != nil {
-			return nil, err
-		}
-
 		// get hub kubeconfig
 		hubConfig, err := clientcmd.BuildConfigFromFlags("", c.ExtraConfig.HubKubeconfig)
 		if err != nil {
@@ -273,7 +268,7 @@ func (c completedConfig) New(ctx context.Context) (*LicenseProxyServer, error) {
 				ByObject: map[client.Object]cache.ByObject{
 					&core.Secret{}: {
 						Namespaces: map[string]cache.Config{
-							kl.Spec.ClusterName: {
+							c.ExtraConfig.SpokeClusterName: {
 								FieldSelector: fields.OneTermEqualSelector("metadata.name", common.LicenseSecret),
 							},
 						},

pkg/cmds/server/options.go

@@ -31,7 +31,8 @@ type ExtraOptions struct {
 	LicenseDir string
 	CacheDir   string
 
-	HubKubeconfig string
+	HubKubeconfig    string
+	SpokeClusterName string
 }
 
 func NewExtraOptions() *ExtraOptions {
@@ -49,6 +50,7 @@ func (s *ExtraOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.LicenseDir, "license-dir", s.LicenseDir, "Path to license directory")
 	fs.StringVar(&s.CacheDir, "cache-dir", s.CacheDir, "Path to license cache directory")
 	fs.StringVar(&s.HubKubeconfig, "hub-kubeconfig", s.HubKubeconfig, "Path to hub kubeconfig")
+	fs.StringVar(&s.SpokeClusterName, "cluster-name", s.SpokeClusterName, "Spoke Cluster name")
 }
 
 func (s *ExtraOptions) ApplyTo(cfg *apiserver.ExtraConfig) error {
@@ -57,6 +59,7 @@ func (s *ExtraOptions) ApplyTo(cfg *apiserver.ExtraConfig) error {
 	cfg.LicenseDir = s.LicenseDir
 	cfg.CacheDir = s.CacheDir
 	cfg.HubKubeconfig = s.HubKubeconfig
+	cfg.SpokeClusterName = s.SpokeClusterName
 	cfg.ClientConfig.QPS = float32(s.QPS)
 	cfg.ClientConfig.Burst = s.Burst
 

pkg/manager/agent-manifests/license-proxyserver/templates/cluster-role.yaml

@@ -23,9 +23,3 @@ rules:
   resources:
   - clusterclaims
   verbs: ["get", "list", "watch", "create", "update", "patch"]
-# ocm cluster name detection
-- apiGroups:
-  - operator.open-cluster-management.io
-  resources:
-  - klusterlets
-  verbs: ["get"]

pkg/manager/agent-manifests/license-proxyserver/templates/deployment.yaml

@@ -51,6 +51,9 @@ spec:
         {{- if .Values.hubKubeconfigSecretName }}
         - --hub-kubeconfig=/var/run/secrets/ocm/auth/kubeconfig
         {{- end }}
+        {{- if .Values.clusterName }}
+        - --cluster-name={{ .Values.clusterName }}
+        {{- end }}
         ports:
         - containerPort: 8443
         - containerPort: 8081

pkg/manager/agent-manifests/license-proxyserver/values.yaml

@@ -123,3 +123,6 @@ encodedLicenses: {}
 
 # Name of OCM Hub Kubeconfig secret
 hubKubeconfigSecretName: ""
+
+# We need to pass the cluster name because the OCM-MC host cluster doesn't have Klusterlet object.
+clusterName: ""

pkg/manager/config.go

@@ -109,6 +109,10 @@ func GetConfigValues(opts *ManagerOptions, cs *certstore.CertStore) addonfactory
 		if err != nil {
 			return nil, err
 		}
+		err = unstructured.SetNestedField(vals, cluster.Name, "clusterName")
+		if err != nil {
+			return nil, err
+		}
 
 		return vals, nil
 	}

vendor/modules.txt

@@ -1482,7 +1482,6 @@ open-cluster-management.io/api/cluster/v1
 open-cluster-management.io/api/cluster/v1alpha1
 open-cluster-management.io/api/cluster/v1beta1
 open-cluster-management.io/api/cluster/v1beta2
-open-cluster-management.io/api/operator/v1
 open-cluster-management.io/api/utils/work/v1/workapplier
 open-cluster-management.io/api/work/v1
 open-cluster-management.io/api/work/v1alpha1