Update the helm chart to support the ACI VNet Integration

charts/virtual-kubelet-for-aks/Chart.yaml

@@ -1,5 +1,5 @@
 name: virtual-kubelet-for-aks
-version: 0.1.6
+version: 0.1.7
 description: a Helm chart to install virtual kubelet in an AKS or ACS cluster.
 sources:
   - https://github.com/virtual-kubelet/virtual-kubelet

charts/virtual-kubelet-for-aks/templates/deployment.yaml

@@ -41,6 +41,20 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+        - name: ACI_SUBNET_NAME
+          value: {{ .Values.env.aciVnetSubnetName }}
+        - name: ACI_SUBNET_CIDR
+          value: {{ .Values.env.aciVnetSubnetCIDR }}
+        - name: MASTER_URI
+          value: {{ .Values.env.masterUri }}
+        - name: CLUSTER_CIDR
+          value: {{ .Values.env.clusterCIDR }}
+        - name: KUBE_DNS_IP
+          value: {{ .Values.env.kubeDnsIP }}
+        {{ if .Values.loganalytics.enabled }}
+        - name: LOG_ANALYTICS_AUTH_LOCATION
+          value: /etc/virtual-kubelet/loganalytics.json
+        {{ end }}
         volumeMounts:
         - name: credentials
           mountPath: "/etc/virtual-kubelet"

charts/virtual-kubelet-for-aks/templates/secrets.yaml

@@ -16,4 +16,7 @@ data:
   cert.pem: {{ quote .Values.env.apiserverCert }}
   key.pem: {{ quote .Values.env.apiserverKey }}
   {{ end}}
-  clientSecret: {{ default "" .Values.env.azureClientKey | b64enc | quote }}
+  clientSecret: {{ default "" .Values.env.azureClientKey | b64enc | quote }}
+  {{ if .Values.loganalytics.enabled }}
+  loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceID is required for loganalytics" .Values.loganalytics.workspaceID ) (required "workspaceKey is required for loganalytics" .Values.loganalytics.workspaceKey ) }}
+  {{ end }}

charts/virtual-kubelet-for-aks/values.yaml

@@ -15,6 +15,15 @@ env:
   apiserverCert: 
   apiserverKey: 
   monitoredNamespace:
+  aciVnetSubnetName:
+  aciVnetSubnetCidr:
+  masterUri:
+  clusterCidr:
+  kubeDnsIp:
+loganalytics:
+  enabled: false
+  workspaceID:
+  workspaceKey:
 
 # Install Default RBAC roles and bindings
 rbac: