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 000000000..59d361cc2 Binary files /dev/null and b/charts/virtual-kubelet-0.1.1.tgz differ 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