Update virtual-kubelet helm chart to support ACI VNet (#356)

* Update the virtual-kubelet helm chart for ACI VNet

* Fix the typo

* version

* secret encoding

* Update the version to 0.4.0

* Add ClusterResourceId for LogAnalytics

charts/virtual-kubelet/Chart.yaml

@@ -1,6 +1,6 @@
 name: virtual-kubelet
-version: 0.3.0
-appVersion: 0.3
+version: 0.4.0
+appVersion: 0.4
 description: A Helm chart to install virtual kubelet inside a Kubernetes cluster.
 icon: https://avatars2.githubusercontent.com/u/34250142
 sources:

charts/virtual-kubelet/templates/deployment.yaml

@@ -39,6 +39,8 @@ spec:
 {{- if .loganalytics.enabled }}
         - name: LOG_ANALYTICS_AUTH_LOCATION
           value: /etc/virtual-kubelet/loganalytics.json
+        - name: CLUSTER_RESOURCE_ID
+          value:  {{ .loganalytics.clusterResourceId }}
 {{- end }}
 {{- if .targetAKS }}
         - name: ACS_CREDENTIAL_LOCATION
@@ -66,6 +68,21 @@ spec:
         - name: ACI_REGION
           value: {{ required "aciRegion is required" .aciRegion }}
 {{- end }}
+{{- if .vnet.enabled }}
+        - name: ACI_SUBNET_NAME
+          value: {{ required "subnetName is required" .vnet.subnetName }}
+        - name: ACI_SUBNET_CIDR
+          value: {{ .vnet.subnetCidr }}
+        - name: MASTER_URI
+          value: {{ required "masterUri is required" .masterUri }}
+        - name: CLUSTER_CIDR
+          value: {{ required "clusterCidr is required" .vnet.clusterCidr }}
+        - name: KUBE_DNS_IP
+          value: {{ required "kubeDnsIp is required" .vnet.kubeDnsIp }}
+{{- else }}
+        - name: MASTER_URI
+          value: {{ .masterUri }}
+{{- end }}          
 {{- end }}
 {{- end }}
         volumeMounts:

charts/virtual-kubelet/templates/secret.yaml

@@ -20,7 +20,7 @@ data:
 {{- if eq .Values.provider "azure" }}
 {{- with .Values.providers.azure }}
 {{- if .loganalytics.enabled }}
-  loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceID is required for loganalytics" .loganalytics.workspaceID ) (required "workspaceKey is required for loganalytics" .loganalytics.workspaceKey ) }}
+  loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceId is required for loganalytics" .loganalytics.workspaceId ) (required "workspaceKey is required for loganalytics" .loganalytics.workspaceKey ) | b64enc | quote }}
 {{- end }}
 {{- if .targetAKS }}
   clientSecret: {{ default "" .clientKey | b64enc | quote }}

charts/virtual-kubelet/values.yaml

@@ -30,10 +30,18 @@ providers:
     ## `aciResourceGroup` and `aciRegion` are required only for non-AKS deployments
     aciResourceGroup: 
     aciRegion: 
+    masterUri: 
     loganalytics:
       enabled: false
-      workspaceID: 
+      workspaceId: 
       workspaceKey: 
+      clusterResourceId: 
+    vnet:
+      enabled: false
+      subnetName: 
+      subnetCidr: 
+      clusterCidr: 
+      kubeDnsIp: 
 
 ## Install Default RBAC roles and bindings
 rbac: