🌱 add clusterName, clusterID for later usage

vngcloud · Apr 4, 2024 · 71fa2a5 · 71fa2a5
1 parent 42e3fd4
commit 71fa2a5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -23,10 +23,13 @@ import (
 
 // Config struct contains ingress controller configuration
 type Config struct {
-	ClusterName string          `mapstructure:"clusterName"`
-	Kubernetes  kubeConfig      `mapstructure:"kubernetes"`
-	Global      client.AuthOpts `mapstructure:"global"`
-	Metadata    metadata.Opts   `mapstructure:"metadata"`
+	Cluster struct {
+		ClusterName string `mapstructure:"clusterName"`
+		ClusterID   string `mapstructure:"clusterID"`
+	} `mapstructure:"cluster"`
+	Kubernetes kubeConfig      `mapstructure:"kubernetes"`
+	Global     client.AuthOpts `mapstructure:"global"`
+	Metadata   metadata.Opts   `mapstructure:"metadata"`
 }
 
 // Configuration for connecting to Kubernetes API server, either api_host or kubeconfig should be configured.

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -215,6 +215,8 @@ func NewController(conf config.Config) *Controller {
 // Start starts the vngcloud ingress controller.
 func (c *Controller) Start() {
 	klog.Infoln("------------ Start() ------------")
+	klog.Infoln("ClusterName: ", c.getClusterName())
+	klog.Infoln("ClusterID: ", c.getClusterID())
 	defer close(c.stopCh)
 	defer utilruntime.HandleCrash()
 	defer c.queue.ShutDown()
@@ -1568,7 +1570,11 @@ func (c *Controller) toVngCloudCertificate(secretName string, namespace string,
 
 // NAME RESOURCE
 func (c *Controller) getClusterName() string {
-	return c.config.ClusterName
+	return c.config.Cluster.ClusterName
+}
+
+func (c *Controller) getClusterID() string {
+	return c.config.Cluster.ClusterID
 }
 
 func (c *Controller) generateHashName(ing *nwv1.Ingress) string {