From 350bc670a6875b59e84905bcbdae9ba638d61aec Mon Sep 17 00:00:00 2001 From: Shane Peckham Date: Thu, 19 Apr 2018 19:13:52 +0100 Subject: [PATCH] Package helm chart for RBAC clusters issue #137 (#138) * Package helm chart issue #137 * Restoring default virtual-kubelet-0.1.0.tgz --- charts/virtual-kubelet-0.1.1-rbac/Chart.yaml | 8 ---- .../templates/NOTES.txt | 21 --------- .../templates/_helpers.tpl | 16 ------- .../templates/deployment.yaml | 42 ------------------ .../templates/secrets.yaml | 9 ---- charts/virtual-kubelet-0.1.1-rbac/values.yaml | 25 ----------- charts/virtual-kubelet-0.1.1.tgz | Bin 0 -> 2242 bytes charts/virtual-kubelet/Chart.yaml | 2 +- charts/virtual-kubelet/templates/NOTES.txt | 2 +- .../templates/clusterrolebinding.yaml | 0 .../virtual-kubelet/templates/deployment.yaml | 1 + .../templates/serviceaccount.yaml | 0 charts/virtual-kubelet/values.yaml | 9 ++++ 13 files changed, 12 insertions(+), 123 deletions(-) delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/Chart.yaml delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/templates/NOTES.txt delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/templates/_helpers.tpl delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/templates/deployment.yaml delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/templates/secrets.yaml delete mode 100644 charts/virtual-kubelet-0.1.1-rbac/values.yaml create mode 100644 charts/virtual-kubelet-0.1.1.tgz rename charts/{virtual-kubelet-0.1.1-rbac => virtual-kubelet}/templates/clusterrolebinding.yaml (100%) rename charts/{virtual-kubelet-0.1.1-rbac => virtual-kubelet}/templates/serviceaccount.yaml (100%) diff --git a/charts/virtual-kubelet-0.1.1-rbac/Chart.yaml b/charts/virtual-kubelet-0.1.1-rbac/Chart.yaml deleted file mode 100644 index e6b645e3c..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: virtual-kubelet -version: 0.1.1 -description: a Helm chart to install virtual kubelet inside a Kubernetes cluster. -sources: - - https://github.com/virtual-kubelet/virtual-kubelet -maintainers: - - name: Robbie Zhang - email: junjiez@microsoft.com diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/NOTES.txt b/charts/virtual-kubelet-0.1.1-rbac/templates/NOTES.txt deleted file mode 100644 index 7d7983c02..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/templates/NOTES.txt +++ /dev/null @@ -1,21 +0,0 @@ -{{- if and .Values.env.azureClientId .Values.env.azureClientKey .Values.env.azureTenantId .Values.env.azureSubscriptionId .Values.env.aciResourceGroup -}} - -The virtual kubelet is getting deployed on your cluster. - -To verify that virtual kubelet has started, run: - - kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "fullname" . }}" - -{{- else -}} -############################################################################## -#### ERROR: You are missing required values in the values.yaml file. #### -############################################################################## - -This deployment will be incomplete until all the required fields in the values.yaml file have been provided. - -To update, run: - - helm upgrade {{ .Release.Name }} \ - --set env.azureClientId=,env.azureClientKey=,env.azureTenantId=,env.azureSubscriptionId=,env.aciResourceGroup=,ev.aciOsType=,rbac.install= - -{{- end }} diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/_helpers.tpl b/charts/virtual-kubelet-0.1.1-rbac/templates/_helpers.tpl deleted file mode 100644 index c199f18f0..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/templates/_helpers.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/deployment.yaml b/charts/virtual-kubelet-0.1.1-rbac/templates/deployment.yaml deleted file mode 100644 index 58095a3a8..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/templates/deployment.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ template "fullname" . }} -spec: - replicas: 1 - template: - metadata: - labels: - app: {{ template "fullname" . }} - spec: - containers: - - name: {{ template "fullname" . }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: KUBELET_PORT - value: "10250" - - name: AZURE_AUTH_LOCATION - value: /etc/virtual-kubelet/credentials.json - - name: ACI_RESOURCE_GROUP - value: {{ .Values.env.aciResourceGroup }} - - name: ACI_REGION - value: {{ default "westus" .Values.env.aciRegion }} - - name: APISERVER_CERT_LOCATION - value: /etc/virtual-kubelet/cert.pem - - name: APISERVER_KEY_LOCATION - value: /etc/virtual-kubelet/key.pem - - name: VKUBELET_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - volumeMounts: - - 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 }}] - volumes: - - name: credentials - secret: - secretName: {{ template "fullname" . }} - serviceAccountName: {{ if .Values.rbac.install }} "{{ template "fullname" . }}-service-account" {{ end }} diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/secrets.yaml b/charts/virtual-kubelet-0.1.1-rbac/templates/secrets.yaml deleted file mode 100644 index c3eb8c84c..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/templates/secrets.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "fullname" . }} -type: Opaque -data: - credentials.json: {{ printf "{ \"clientId\": \"%s\", \"clientSecret\": \"%s\", \"subscriptionId\": \"%s\", \"tenantId\": \"%s\", \"activeDirectoryEndpointUrl\": \"https://login.microsoftonline.com/\", \"resourceManagerEndpointUrl\": \"https://management.azure.com/\", \"activeDirectoryGraphResourceId\": \"https://graph.windows.net/\", \"sqlManagementEndpointUrl\": \"database.windows.net\", \"galleryEndpointUrl\": \"https://gallery.azure.com/\", \"managementEndpointUrl\": \"https://management.core.windows.net/\" }" (default "MISSING" .Values.env.azureClientId) (default "MISSING" .Values.env.azureClientKey) (default "MISSING" .Values.env.azureSubscriptionId) (default "MISSING" .Values.env.azureTenantId) | b64enc | quote }} - cert.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverCert) | quote }} - key.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverKey) | quote }} diff --git a/charts/virtual-kubelet-0.1.1-rbac/values.yaml b/charts/virtual-kubelet-0.1.1-rbac/values.yaml deleted file mode 100644 index 48dba14d0..000000000 --- a/charts/virtual-kubelet-0.1.1-rbac/values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -image: - repository: microsoft/virtual-kubelet - tag: latest - pullPolicy: Always -env: - azureClientId: - azureClientKey: - azureTenantId: - azureSubscriptionId: - aciResourceGroup: - aciRegion: - nodeName: - nodeTaint: - nodeOsType: - apiserverCert: - apiserverKey: - -# Install Default RBAC roles and bindings -rbac: - install: false - serviceAccountName: virtual-kubelet - # RBAC api version (currently v1beta1) - apiVersion: v1beta1 - # Cluster role reference - roleRef: cluster-admin diff --git a/charts/virtual-kubelet-0.1.1.tgz b/charts/virtual-kubelet-0.1.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..59d361cc2aad014110e9f1b3b0cf379abab7ff0c GIT binary patch literal 2242 zcmV;z2tD^7iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?6Z`(T7?q~gq1NAM?UPOwW^@Y$BlRBQ(NE-*X(~I8eAfTmV zn=M7DB<0j~{oe2MsR~9QW5c_(fC=M>g4_=5}@=2jTMc! z2L#?C3&Gbq04f5?r6P<$rX-Lli7uxB0)f+Hh=QX+2|i1tLg88=psD zlVqrYwySDf?L9>y%@iAM(`{P6dewg)sVy8~3Cf3c0Jquy;X$)%|9iU!8~c9@p&=Qg zX8{O|BS}>xW*#h!v}Q*Dii|yAM4{AAal+Vn#Hc^>;Fw*JnY55kH6Hn%2y8KmTy+8u z$|a{bTNMqElX9beGF*D4yxgZfOntx`5hd}eaBS>ayOJotGvhn5hk^D)%crg!%;L0? z#8je~qG+K|<&tz{)>G(YzV8G_Bw-4Aua8?GB8CzO4`4`nK>1i&Vn}>F-^^EfFd|H% z1)%Y$kH@|rC0w1Yb!q@lQ(zKP$b1w$_Y)zID>j2^bBKyGU!)`akUO!g*mQ5De%A~Q z1ddQ3_x1aAK@Ue>?wK7Dgp^lZU)BB) zA47mKi)I)=#98o@EEcw9=~YH1(ah`VgNlIz zX!m;Eo(CVJ1c*Qgsg!z+1b$7ZzyQ*?4wQq^tGbHvFro}y(6WSkz|mQQ36@NPtk?QoWm>Of$!ksGz3(M=w8iFM7`LUl+Z0>s_aPHt3utZ+hK}^Sp=Y zkOs%2m+vS~zWw-<@*ujBueNk>bF;{H^wLDOA4(+nDpP45z+$nfv8SCH%(a8KaY=LWK?HmYjL^*<;20&+3YSL&oC76uo%`*VqvO7f~Xn^nolt{P_ z2fOAk4g1MxM8ARUtiZJ2F&TmxS4*Idx@7qd9e!uekPq~(yqj_6!t#L_^WkrBfn0r_y1Wot&fq}VfVjfg>K`2 z_75xk&rY+kyYc^zBJ;UE{^j1LnD6P#u1GqVI+CbKBe{?Ef*OXyN!xA=iIp#iUP`s&GG3wsbO-k;{zwM0(J)VA5cjEq=7Re@aW7I}9~{T}p_9U9e$Oqq@0KccC)dw->_@F3{7x(d@*=?`L5eK9(1~A_0HR< z{Mz-IFEBu^C}Gn5EF)frZgnnmHsR9H33cScgx7L>g-MrT->eR754xjiaCdIE`2m;(HwuWnJeAI#9q3b?X$b674bwDNA%M8ZJi^wk_b*?xA*^2zq#ll@G7vbUC{=`hMQvUDF( zu2b2)O1YHyicax_3iNgI*5*MRQLZioOWWmN6R~Jaxx4)IA>xek)PbisB1>N06Hdk` zuEhyWy*W3nV!+y=yb&ax}ID#MUp+56=iYJ<@0J|q&09n*ee z!WiB#{j9z==J5KLt(mbO39Jkn7B)OzhQ;@te!p|}#=icx`Nch2pW^Ip&CAzlck7d1 z)4hNnFg(~p?ib><*6l1SG&;Qk99*!$MT2#FS4T$`)Z%9+FUnw9GI)P1vjhdGd)og^ z{@=v&ES&#L7`To9+i6z$zeaPfvGMb%7 literal 0 HcmV?d00001 diff --git a/charts/virtual-kubelet/Chart.yaml b/charts/virtual-kubelet/Chart.yaml index e8f711858..e6b645e3c 100644 --- a/charts/virtual-kubelet/Chart.yaml +++ b/charts/virtual-kubelet/Chart.yaml @@ -1,5 +1,5 @@ name: virtual-kubelet -version: 0.1.0 +version: 0.1.1 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/NOTES.txt b/charts/virtual-kubelet/templates/NOTES.txt index 19f090c9f..7d7983c02 100644 --- a/charts/virtual-kubelet/templates/NOTES.txt +++ b/charts/virtual-kubelet/templates/NOTES.txt @@ -16,6 +16,6 @@ This deployment will be incomplete until all the required fields in the values.y To update, run: helm upgrade {{ .Release.Name }} \ - --set env.azureClientId=,env.azureClientKey=,env.azureTenantId=,env.azureSubscriptionId=,env.aciResourceGroup=,ev.aciOsType= + --set env.azureClientId=,env.azureClientKey=,env.azureTenantId=,env.azureSubscriptionId=,env.aciResourceGroup=,ev.aciOsType=,rbac.install= {{- end }} diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/clusterrolebinding.yaml b/charts/virtual-kubelet/templates/clusterrolebinding.yaml similarity index 100% rename from charts/virtual-kubelet-0.1.1-rbac/templates/clusterrolebinding.yaml rename to charts/virtual-kubelet/templates/clusterrolebinding.yaml diff --git a/charts/virtual-kubelet/templates/deployment.yaml b/charts/virtual-kubelet/templates/deployment.yaml index f09924653..58095a3a8 100644 --- a/charts/virtual-kubelet/templates/deployment.yaml +++ b/charts/virtual-kubelet/templates/deployment.yaml @@ -39,3 +39,4 @@ spec: - name: credentials secret: secretName: {{ template "fullname" . }} + serviceAccountName: {{ if .Values.rbac.install }} "{{ template "fullname" . }}-service-account" {{ end }} diff --git a/charts/virtual-kubelet-0.1.1-rbac/templates/serviceaccount.yaml b/charts/virtual-kubelet/templates/serviceaccount.yaml similarity index 100% rename from charts/virtual-kubelet-0.1.1-rbac/templates/serviceaccount.yaml rename to charts/virtual-kubelet/templates/serviceaccount.yaml diff --git a/charts/virtual-kubelet/values.yaml b/charts/virtual-kubelet/values.yaml index f2b3bfc2a..48dba14d0 100644 --- a/charts/virtual-kubelet/values.yaml +++ b/charts/virtual-kubelet/values.yaml @@ -14,3 +14,12 @@ env: nodeOsType: apiserverCert: apiserverKey: + +# Install Default RBAC roles and bindings +rbac: + install: false + serviceAccountName: virtual-kubelet + # RBAC api version (currently v1beta1) + apiVersion: v1beta1 + # Cluster role reference + roleRef: cluster-admin