From 6e32d2c5444de9376eea7d9222b225985865060b Mon Sep 17 00:00:00 2001
From: Robbie Zhang <junjiez@microsoft.com>
Date: Mon, 13 Aug 2018 18:09:46 -0700
Subject: [PATCH] Update the helm chart to support the ACI VNet Integration

---
 charts/virtual-kubelet-for-aks-0.1.7.tgz         | Bin 0 -> 2441 bytes
 charts/virtual-kubelet-for-aks/Chart.yaml        |   2 +-
 .../templates/deployment.yaml                    |  14 ++++++++++++++
 .../templates/secrets.yaml                       |   5 ++++-
 charts/virtual-kubelet-for-aks/values.yaml       |   9 +++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 charts/virtual-kubelet-for-aks-0.1.7.tgz

diff --git a/charts/virtual-kubelet-for-aks-0.1.7.tgz b/charts/virtual-kubelet-for-aks-0.1.7.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..9130452bf7d3bfe7f90d32aec0274d2c1d4522d9
GIT binary patch
literal 2441
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
H05$*sJ;~m(

literal 0
HcmV?d00001

diff --git a/charts/virtual-kubelet-for-aks/Chart.yaml b/charts/virtual-kubelet-for-aks/Chart.yaml
index ca157f8e3..e141b37df 100644
--- a/charts/virtual-kubelet-for-aks/Chart.yaml
+++ b/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
diff --git a/charts/virtual-kubelet-for-aks/templates/deployment.yaml b/charts/virtual-kubelet-for-aks/templates/deployment.yaml
index 9b88283b3..39959d994 100644
--- a/charts/virtual-kubelet-for-aks/templates/deployment.yaml
+++ b/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"
diff --git a/charts/virtual-kubelet-for-aks/templates/secrets.yaml b/charts/virtual-kubelet-for-aks/templates/secrets.yaml
index 26e616500..42c032d57 100644
--- a/charts/virtual-kubelet-for-aks/templates/secrets.yaml
+++ b/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 }}
\ No newline at end of file
+  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 }}
\ No newline at end of file
diff --git a/charts/virtual-kubelet-for-aks/values.yaml b/charts/virtual-kubelet-for-aks/values.yaml
index e34f51a6f..4fb2f8acf 100644
--- a/charts/virtual-kubelet-for-aks/values.yaml
+++ b/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: