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
This commit is contained in:
Ahmed Sabbour
2018-06-26 21:55:23 +04:00
committed by Robbie Zhang
parent e1fa5b03af
commit 61753060c6
10 changed files with 16 additions and 6 deletions

3
.gitignore vendored
View File

@@ -5,6 +5,9 @@
*.dylib *.dylib
bin/ bin/
# Certificates
*.pem
# Test binary, build with `go test -c` # Test binary, build with `go test -c`
*.test *.test

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,5 @@
name: virtual-kubelet-for-aks 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. description: a Helm chart to install virtual kubelet in an AKS or ACS cluster.
sources: sources:
- https://github.com/virtual-kubelet/virtual-kubelet - https://github.com/virtual-kubelet/virtual-kubelet

View File

@@ -47,7 +47,7 @@ spec:
- name: acs-credential - name: acs-credential
mountPath: "/etc/acs/azure.json" mountPath: "/etc/acs/azure.json"
command: ["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: volumes:
- name: credentials - name: credentials
secret: secret:

View File

@@ -14,3 +14,4 @@ env:
nodeOsType: nodeOsType:
apiserverCert: apiserverCert:
apiserverKey: apiserverKey:
monitoredNamespace:

View File

@@ -1,5 +1,5 @@
name: virtual-kubelet name: virtual-kubelet
version: 0.1.1 version: 0.1.2
description: a Helm chart to install virtual kubelet inside a Kubernetes cluster. description: a Helm chart to install virtual kubelet inside a Kubernetes cluster.
sources: sources:
- https://github.com/virtual-kubelet/virtual-kubelet - https://github.com/virtual-kubelet/virtual-kubelet

View File

@@ -34,7 +34,7 @@ spec:
- name: credentials - name: credentials
mountPath: "/etc/virtual-kubelet" mountPath: "/etc/virtual-kubelet"
command: ["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: volumes:
- name: credentials - name: credentials
secret: secret:

View File

@@ -14,6 +14,7 @@ env:
nodeOsType: nodeOsType:
apiserverCert: apiserverCert:
apiserverKey: apiserverKey:
monitoredNamespace:
# Install Default RBAC roles and bindings # Install Default RBAC roles and bindings
rbac: rbac:

9
scripts/createCertAndKey.sh Normal file → Executable file
View File

@@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
# Generate cert and key for chart # 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" 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) if [[ "$OSTYPE" == "darwin"* ]]; then
key=$(base64 key.pem -w0) cert=$(base64 cert.pem)
key=$(base64 key.pem)
else
cert=$(base64 cert.pem -w0)
key=$(base64 key.pem -w0)
fi