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 000000000..9130452bf Binary files /dev/null and b/charts/virtual-kubelet-for-aks-0.1.7.tgz differ 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: