Merge pull request kosmos-io#625 from OrangeBao/release-0.4.0-cert

feat: support plugin options for templete

deploy/crds/kosmos.io_virtualclusters.yaml

@@ -51,6 +51,19 @@ spec:
                 description: Kubeconfig is the kubeconfig of the virtual kubernetes's
                   control plane
                 type: string
+              pluginOptions:
+                description: datasource for plugin yaml
+                items:
+                  properties:
+                    name:
+                      type: string
+                    value:
+                      type: string
+                  required:
+                  - name
+                  - value
+                  type: object
+                type: array
               promotePolicies:
                 description: PromotePolicies definites the policies for promote to
                   the kubernetes's control plane

examples/vitual-cluster-demo.yaml

@@ -13,3 +13,8 @@ spec:
   promoteResources:
     nodeInfos:
       - nodeName: nodeName1
+  pluginOptions:
+    - name: accessKey
+      value: hello
+    - name: secretKey
+      value: world

pkg/apis/kosmos/v1alpha1/virtualcluster_types.go

@@ -61,6 +61,17 @@ type VirtualClusterSpec struct {
 	// the resources can be nodes or just cpu,memory or gpu resources
 	// +optional
 	PromoteResources PromoteResources `json:"promoteResources,omitempty"`
+
+	// datasource for plugin yaml
+	// +optional
+	PluginOptions []PluginOptions `json:"pluginOptions,omitempty"`
+}
+
+type PluginOptions struct {
+	// +required
+	Name string `json:"name"`
+	// +required
+	Value string `json:"value"`
 }
 
 type PromotePolicy struct {

pkg/kubenest/init.go

@@ -38,6 +38,7 @@ type initData struct {
 	hostPort              int32
 	hostPortMap           map[string]int32
 	kubeNestOptions       *ko.KubeNestOptions
+	virtualCluster        *v1alpha1.VirtualCluster
 }
 
 type InitOptions struct {
@@ -184,6 +185,7 @@ func newRunData(opt *InitOptions) (*initData, error) {
 		hostPort:              opt.virtualCluster.Status.Port,
 		hostPortMap:           opt.virtualCluster.Status.PortMap,
 		kubeNestOptions:       opt.KubeNestOptions,
+		virtualCluster:        opt.virtualCluster,
 	}, nil
 }
 
@@ -258,3 +260,16 @@ func (i initData) DynamicClient() *dynamic.DynamicClient {
 func (i initData) KubeNestOpt() *ko.KubeNestOptions {
 	return i.kubeNestOptions
 }
+
+func (i initData) PluginOptions() map[string]string {
+	if i.virtualCluster.Spec.PluginOptions == nil {
+		return nil
+	}
+
+	pluginOptoinsMapping := map[string]string{}
+
+	for _, option := range i.virtualCluster.Spec.PluginOptions {
+		pluginOptoinsMapping[option.Name] = option.Value
+	}
+	return pluginOptoinsMapping
+}

pkg/kubenest/tasks/coredns.go

@@ -116,6 +116,9 @@ func runCoreDnsHostTask(r workflow.RunData) error {
 			"Name":            data.GetName(),
 			"ImageRepository": imageRepository,
 		}
+		for k, v := range data.PluginOptions() {
+			templatedMapping[k] = v
+		}
 		err = applyYMLTemplate(dynamicClient, component.Path, templatedMapping)
 		if err != nil {
 			return err
@@ -243,6 +246,9 @@ func runCoreDnsVirtualTask(r workflow.RunData) error {
 			"MetricsPort":     MetricsPort,
 			"HostNodeAddress": HostNodeAddress,
 		}
+		for k, v := range data.PluginOptions() {
+			templatedMapping[k] = v
+		}
 		err = applyYMLTemplate(dynamicClient, component.Path, templatedMapping)
 		if err != nil {
 			return err

pkg/kubenest/tasks/data.go

@@ -24,4 +24,5 @@ type InitData interface {
 	HostPortMap() map[string]int32
 	DynamicClient() *dynamic.DynamicClient
 	KubeNestOpt() *ko.KubeNestOptions
+	PluginOptions() map[string]string
 }

pkg/kubenest/tasks/manifests_components.go

@@ -84,6 +84,10 @@ func applyComponentsManifests(r workflow.RunData) error {
 	imageRepository, _ := util.GetImageMessage()
 	templatedMapping["ImageRepository"] = imageRepository
 
+	for k, v := range data.PluginOptions() {
+		templatedMapping[k] = v
+	}
+
 	for _, component := range components {
 		klog.V(2).Infof("Deploy component %s", component.Name)
 		err = applyTemplatedManifests(component.Name, dynamicClient, component.Path, templatedMapping)

pkg/kubenest/util/template.go

@@ -6,10 +6,21 @@ import (
 	"text/template"
 )
 
+// pluginOptions
+func defaultValue(value interface{}, defaultVal string) string {
+	if str, ok := value.(string); ok && str != "" {
+		return str
+	}
+	return defaultVal
+}
+
 // ParseTemplate validates and parses passed as argument template
 func ParseTemplate(strtmpl string, obj interface{}) (string, error) {
 	var buf bytes.Buffer
-	tmpl, err := template.New("template").Parse(strtmpl)
+	tmpl := template.New("template").Funcs(template.FuncMap{
+		"defaultValue": defaultValue,
+	})
+	tmpl, err := tmpl.Parse(strtmpl)
 	if err != nil {
 		return "", fmt.Errorf("error when parsing template, err: %w", err)
 	}