From 61753060c6925b3488b12fdec3eeba1bd523fcb8 Mon Sep 17 00:00:00 2001 From: Ahmed Sabbour Date: Tue, 26 Jun 2018 21:55:23 +0400 Subject: [PATCH] Patch/vk chart namespace (#235) * Fix the dependency issue * Changed the charts to accept a namespace variable * Bumped and regenerated chart. Updated createCert for MacOS * Moving generated charts up in the folder structure --- .gitignore | 3 +++ charts/virtual-kubelet-0.1.2.tgz | Bin 0 -> 2284 bytes charts/virtual-kubelet-for-aks-0.1.4.tgz | Bin 0 -> 1661 bytes charts/virtual-kubelet-for-aks/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- charts/virtual-kubelet-for-aks/values.yaml | 1 + charts/virtual-kubelet/Chart.yaml | 2 +- charts/virtual-kubelet/templates/deployment.yaml | 2 +- charts/virtual-kubelet/values.yaml | 1 + scripts/createCertAndKey.sh | 9 +++++++-- 10 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 charts/virtual-kubelet-0.1.2.tgz create mode 100644 charts/virtual-kubelet-for-aks-0.1.4.tgz mode change 100644 => 100755 scripts/createCertAndKey.sh 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 0000000000000000000000000000000000000000..87a37df2453bdd8001d935d164a369d94949807f GIT binary patch literal 2284 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 H044wcwna99 literal 0 HcmV?d00001 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