diff --git a/.gitignore b/.gitignore index 9e865d772..c69176432 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ *.dylib bin/ +# Certificates +*.pem + # Test binary, build with `go test -c` *.test diff --git a/charts/virtual-kubelet-0.1.2.tgz b/charts/virtual-kubelet-0.1.2.tgz new file mode 100644 index 000000000..87a37df24 Binary files /dev/null and b/charts/virtual-kubelet-0.1.2.tgz differ diff --git a/charts/virtual-kubelet-for-aks-0.1.4.tgz b/charts/virtual-kubelet-for-aks-0.1.4.tgz new file mode 100644 index 000000000..16d1008d8 Binary files /dev/null and b/charts/virtual-kubelet-for-aks-0.1.4.tgz differ diff --git a/charts/virtual-kubelet-for-aks/Chart.yaml b/charts/virtual-kubelet-for-aks/Chart.yaml index c92909014..e88317184 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.3 +version: 0.1.4 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 fbc9d1727..e7c2269bc 100644 --- a/charts/virtual-kubelet-for-aks/templates/deployment.yaml +++ b/charts/virtual-kubelet-for-aks/templates/deployment.yaml @@ -47,7 +47,7 @@ spec: - name: acs-credential mountPath: "/etc/acs/azure.json" command: ["virtual-kubelet"] - args: ["--provider", "azure", "--namespace", "default", "--nodename", {{ default "virtual-kubelet" .Values.env.nodeName | quote }} , "--os", {{ default "Linux" .Values.env.nodeOsType | quote }}, "--taint", {{ default "azure.com/aci" .Values.env.nodeTaint | quote }}] + args: ["--provider", "azure", "--namespace", {{ default "" .Values.env.monitoredNamespace | quote }}, "--nodename", {{ default "virtual-kubelet" .Values.env.nodeName | quote }} , "--os", {{ default "Linux" .Values.env.nodeOsType | quote }}, "--taint", {{ default "azure.com/aci" .Values.env.nodeTaint | quote }}] volumes: - name: credentials secret: diff --git a/charts/virtual-kubelet-for-aks/values.yaml b/charts/virtual-kubelet-for-aks/values.yaml index f2b3bfc2a..7dd131fcb 100644 --- a/charts/virtual-kubelet-for-aks/values.yaml +++ b/charts/virtual-kubelet-for-aks/values.yaml @@ -14,3 +14,4 @@ env: nodeOsType: apiserverCert: apiserverKey: + monitoredNamespace: diff --git a/charts/virtual-kubelet/Chart.yaml b/charts/virtual-kubelet/Chart.yaml index e6b645e3c..1542a2e5f 100644 --- a/charts/virtual-kubelet/Chart.yaml +++ b/charts/virtual-kubelet/Chart.yaml @@ -1,5 +1,5 @@ name: virtual-kubelet -version: 0.1.1 +version: 0.1.2 description: a Helm chart to install virtual kubelet inside a Kubernetes cluster. sources: - https://github.com/virtual-kubelet/virtual-kubelet diff --git a/charts/virtual-kubelet/templates/deployment.yaml b/charts/virtual-kubelet/templates/deployment.yaml index 0206d4bbb..41ba5b766 100644 --- a/charts/virtual-kubelet/templates/deployment.yaml +++ b/charts/virtual-kubelet/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: - name: credentials mountPath: "/etc/virtual-kubelet" command: ["virtual-kubelet"] - args: ["--provider", "azure", "--namespace", "default", "--nodename", {{ default "virtual-kubelet" .Values.env.nodeName | quote }} , "--os", {{ default "Linux" .Values.env.nodeOsType | quote }}, "--taint", {{ default "azure.com/aci" .Values.env.nodeTaint | quote }}] + args: ["--provider", "azure", "--namespace", {{ default "" .Values.env.monitoredNamespace | quote }}, "--nodename", {{ default "virtual-kubelet" .Values.env.nodeName | quote }} , "--os", {{ default "Linux" .Values.env.nodeOsType | quote }}, "--taint", {{ default "azure.com/aci" .Values.env.nodeTaint | quote }}] volumes: - name: credentials secret: diff --git a/charts/virtual-kubelet/values.yaml b/charts/virtual-kubelet/values.yaml index 48dba14d0..b0426297a 100644 --- a/charts/virtual-kubelet/values.yaml +++ b/charts/virtual-kubelet/values.yaml @@ -14,6 +14,7 @@ env: nodeOsType: apiserverCert: apiserverKey: + monitoredNamespace: # Install Default RBAC roles and bindings rbac: diff --git a/scripts/createCertAndKey.sh b/scripts/createCertAndKey.sh old mode 100644 new mode 100755 index 4c185161b..ef992c6c4 --- a/scripts/createCertAndKey.sh +++ b/scripts/createCertAndKey.sh @@ -1,5 +1,10 @@ #!/bin/bash # Generate cert and key for chart openssl req -newkey rsa:4096 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem -subj "/C=US/ST=CA/L=virtualkubelet/O=virtualkubelet/OU=virtualkubelet/CN=virtualkubelet" -cert=$(base64 cert.pem -w0) -key=$(base64 key.pem -w0) +if [[ "$OSTYPE" == "darwin"* ]]; then + cert=$(base64 cert.pem) + key=$(base64 key.pem) +else + cert=$(base64 cert.pem -w0) + key=$(base64 key.pem -w0) +fi