341 enable defining additional custom taints and labels to virtual nodes from interlink config

ci/manifests/interlink-config-local.yaml

@@ -8,7 +8,7 @@
     #InterlinkAddress: "unix:///var/run/interlink.socket"
 InterlinkAddress: "http://0.0.0.0"
 InterlinkPort: "3000"
-#SidecarURL: "http://plugin"
+#sidecarURL: "http://plugin"
 SidecarURL: "http://0.0.0.0"
 SidecarPort: "4000"
 VerboseLogging: true

ci/manifests/interlink-config.yaml

@@ -9,7 +9,7 @@
 InterlinkAddress: "http://0.0.0.0"
 InterlinkPort: "3000"
 SidecarURL: "http://plugin"
-#SidecarURL: "http://0.0.0.0"
+#sidecarURL: "http://0.0.0.0"
 SidecarPort: "4000"
 VerboseLogging: true
 ErrorsOnlyLogging: false

ci/manifests/virtual-kubelet-config.yaml

@@ -13,9 +13,10 @@ data:
     ServiceAccount: "virtual-kubelet"
     Namespace: interlink 
     VKTokenFile: ""
-    CPU: "100"
-    Memory: "128Gi"
-    Pods: "100"
+    Resources:
+      CPU: "100"
+      Memory: "128Gi"
+      Pods: "100"
     HTTP:
       Insecure: true
     KubeletHTTP:

cmd/installer/templates/values.yaml

@@ -5,9 +5,10 @@ interlink:
   port: {{.InterLinkPort}}
 
 virtualNode:
-  CPUs: {{.VKLimits.CPU}}
-  MemGiB: {{.VKLimits.Memory}}
-  Pods: {{.VKLimits.Pods}}
+  Resources:
+    CPU: {{.VKLimits.CPU}}
+    Memory: {{.VKLimits.Memory}}
+    Pods: {{.VKLimits.Pods}}
   HTTPProxies:
     HTTP: null
     HTTPs: null

pkg/virtualkubelet/config.go

@@ -2,27 +2,45 @@ package virtualkubelet
 
 // Config holds the whole configuration
 type Config struct {
-	InterlinkURL            string `yaml:"InterlinkURL"`
-	Interlinkport           string `yaml:"InterlinkPort"`
-	KubernetesAPIAddr       string `yaml:"KubernetesApiAddr"`
-	KubernetesAPIPort       string `yaml:"KubernetesApiPort"`
-	KubernetesAPICaCrt      string `yaml:"KubernetesApiCaCrt"`
-	DisableProjectedVolumes bool   `yaml:"DisableProjectedVolumes"`
-	VKConfigPath            string `yaml:"VKConfigPath"`
-	VKTokenFile             string `yaml:"VKTokenFile"`
-	ServiceAccount          string `yaml:"ServiceAccount"`
-	Namespace               string `yaml:"Namespace"`
-	PodIP                   string `yaml:"PodIP"`
-	VerboseLogging          bool   `yaml:"VerboseLogging"`
-	ErrorsOnlyLogging       bool   `yaml:"ErrorsOnlyLogging"`
-	HTTP                    HTTP   `yaml:"HTTP"`
-	KubeletHTTP             HTTP   `yaml:"KubeletHTTP"`
-	CPU                     string `yaml:"CPU,omitempty"`
-	Memory                  string `yaml:"Memory,omitempty"`
-	Pods                    string `yaml:"Pods,omitempty"`
-	GPU                     string `yaml:"nvidia.com/gpu,omitempty"`
+	InterlinkURL            string      `yaml:"InterlinkURL"`
+	InterlinkPort           string      `yaml:"InterlinkPort"`
+	KubernetesAPIAddr       string      `yaml:"KubernetesApiAddr"`
+	KubernetesAPIPort       string      `yaml:"KubernetesApiPort"`
+	KubernetesAPICaCrt      string      `yaml:"KubernetesApiCaCrt"`
+	DisableProjectedVolumes bool        `yaml:"DisableProjectedVolumes"`
+	VKConfigPath            string      `yaml:"VKConfigPath"`
+	VKTokenFile             string      `yaml:"VKTokenFile"`
+	ServiceAccount          string      `yaml:"ServiceAccount"`
+	Namespace               string      `yaml:"Namespace"`
+	PodIP                   string      `yaml:"PodIP"`
+	VerboseLogging          bool        `yaml:"VerboseLogging"`
+	ErrorsOnlyLogging       bool        `yaml:"ErrorsOnlyLogging"`
+	HTTP                    HTTP        `yaml:"HTTP"`
+	KubeletHTTP             HTTP        `yaml:"KubeletHTTP"`
+	Resources               Resources   `yaml:"Resources"`
+	NodeLabels              []string    `yaml:"NodeLabels"`
+	NodeTaints              []TaintSpec `yaml:"NodeTaints"`
 }
 
 type HTTP struct {
 	Insecure bool `yaml:"Insecure"`
 }
+
+type Resources struct {
+	CPU          string        `yaml:"CPU,omitempty"`
+	Memory       string        `yaml:"Memory,omitempty"`
+	Pods         string        `yaml:"Pods,omitempty"`
+	Accelerators []Accelerator `yaml:"Accelerators"`
+}
+
+type Accelerator struct {
+	ResourceType string `yaml:"ResourceType"`
+	Model        string `yaml:"Model"`
+	Available    int    `yaml:"Available"`
+}
+
+type TaintSpec struct {
+	Key    string `yaml:"Key"`
+	Value  string `yaml:"Value"`
+	Effect string `yaml:"Effect"`
+}

pkg/virtualkubelet/execute.go

@@ -87,7 +87,7 @@ func getSidecarEndpoint(ctx context.Context, interLinkURL string, interLinkPort
 // PingInterLink pings the InterLink API and returns true if there's an answer. The second return value is given by the answer provided by the API.
 func PingInterLink(ctx context.Context, config Config) (bool, int, error) {
 	tracer := otel.Tracer("interlink-service")
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 	log.G(ctx).Info("Pinging: " + interLinkEndpoint + "/pinglink")
 	retVal := -1
 	req, err := http.NewRequest(http.MethodPost, interLinkEndpoint+"/pinglink", nil)
@@ -145,7 +145,7 @@ func updateCacheRequest(ctx context.Context, config Config, pod v1.Pod, token st
 		return err
 	}
 
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 	reader := bytes.NewReader(bodyBytes)
 	req, err := http.NewRequest(http.MethodPost, interLinkEndpoint+"/updateCache", reader)
 	if err != nil {
@@ -183,7 +183,7 @@ func updateCacheRequest(ctx context.Context, config Config, pod v1.Pod, token st
 // Returns the call response expressed in bytes and/or the first encountered error
 func createRequest(ctx context.Context, config Config, pod types.PodCreateRequests, token string) ([]byte, error) {
 	tracer := otel.Tracer("interlink-service")
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 
 	bodyBytes, err := json.Marshal(pod)
 	if err != nil {
@@ -232,7 +232,7 @@ func createRequest(ctx context.Context, config Config, pod types.PodCreateReques
 // deleteRequest performs a REST call to the InterLink API when a Pod is deleted from the VK. It Marshals the standard v1.Pod struct and sends it to InterLink.
 // Returns the call response expressed in bytes and/or the first encountered error
 func deleteRequest(ctx context.Context, config Config, pod *v1.Pod, token string) ([]byte, error) {
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 	var returnValue []byte
 	bodyBytes, err := json.Marshal(pod)
 	if err != nil {
@@ -288,7 +288,7 @@ func deleteRequest(ctx context.Context, config Config, pod *v1.Pod, token string
 func statusRequest(ctx context.Context, config Config, podsList []*v1.Pod, token string) ([]byte, error) {
 	tracer := otel.Tracer("interlink-service")
 
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 
 	bodyBytes, err := json.Marshal(podsList)
 	if err != nil {
@@ -349,7 +349,7 @@ func LogRetrieval(
 	sessionContext string,
 ) (io.ReadCloser, error) {
 	tracer := otel.Tracer("interlink-service")
-	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.Interlinkport)
+	interLinkEndpoint := getSidecarEndpoint(ctx, config.InterlinkURL, config.InterlinkPort)
 
 	token := ""