From da161a80fc4dbe2d202f4491b220aab0f55dde92 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sun, 24 Jun 2018 16:25:04 +0200 Subject: [PATCH] Adds metrics-server chart (#5538) * Add initial commit of a metrics-server chart * Fixes metrics-server without rbac * Fixed some lint errors * Add a NOTES.txt file * makes some imrpovements on how the chart looks like compared to helm create * follow best practices for RBAC * adds selector in deployment * incubator/metrics-server: create ServiceAccount based on serviceAccount.create * incubator/metrics-server: default pullPolicy to IfNotPresent * incubator/metrics-server: add maintainer * incubator/metrics-server: replace maintainer full name with github username in Chart.yaml * incubator/metrics-server: make namespace configurable where possible * incubator/metrics-server: grant system:auth-delegator clusterrole and the extension-apiserver-authentication-reader role specifically in the kube-system namespace * incubator/metrics-server: Replace 'metrics-server' with release fullname * incubator/metrics-server: Make apiService creation conditional * Revert "incubator/metrics-server: grant system:auth-delegator clusterrole and the extension-apiserver-authentication-reader role specifically in the kube-system namespace" This reverts commit b35818cf7d5f03269476a0d5044f6677c0e66b26. * incubator/metrics-server: put system:auth-delegator crb in kube-system * incubator/metrics-server: disable creation of apiService on CI runs * incubator/metrics-server: remove an unecessary RBAC rule * incubator/metrics-server: warn about not setting apiSerivce.create: true * incubator/metrics-server: update README.md to reflect values.yaml * stable/metrics-server: promote chart from incubator to stable --- stable/metrics-server/.helmignore | 21 ++++++++ stable/metrics-server/Chart.yaml | 13 +++++ stable/metrics-server/README.md | 15 ++++++ stable/metrics-server/ci/ci-values.yaml | 5 ++ stable/metrics-server/templates/NOTES.txt | 11 ++++ stable/metrics-server/templates/_helpers.tpl | 51 +++++++++++++++++++ .../templates/auth-delegator-crb.yaml | 20 ++++++++ .../templates/cluster-role.yaml | 22 ++++++++ .../templates/metric-server-service.yaml | 17 +++++++ .../templates/metrics-api-service.yaml | 20 ++++++++ .../templates/metrics-server-crb.yaml | 19 +++++++ .../templates/metrics-server-deployment.yaml | 28 ++++++++++ .../metrics-server-serviceaccount.yaml | 11 ++++ .../templates/role-binding.yaml | 20 ++++++++ stable/metrics-server/values.yaml | 23 +++++++++ 15 files changed, 296 insertions(+) create mode 100644 stable/metrics-server/.helmignore create mode 100755 stable/metrics-server/Chart.yaml create mode 100644 stable/metrics-server/README.md create mode 100644 stable/metrics-server/ci/ci-values.yaml create mode 100644 stable/metrics-server/templates/NOTES.txt create mode 100644 stable/metrics-server/templates/_helpers.tpl create mode 100644 stable/metrics-server/templates/auth-delegator-crb.yaml create mode 100644 stable/metrics-server/templates/cluster-role.yaml create mode 100644 stable/metrics-server/templates/metric-server-service.yaml create mode 100644 stable/metrics-server/templates/metrics-api-service.yaml create mode 100644 stable/metrics-server/templates/metrics-server-crb.yaml create mode 100644 stable/metrics-server/templates/metrics-server-deployment.yaml create mode 100644 stable/metrics-server/templates/metrics-server-serviceaccount.yaml create mode 100644 stable/metrics-server/templates/role-binding.yaml create mode 100644 stable/metrics-server/values.yaml diff --git a/stable/metrics-server/.helmignore b/stable/metrics-server/.helmignore new file mode 100644 index 0000000000..f0c1319444 --- /dev/null +++ b/stable/metrics-server/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml new file mode 100755 index 0000000000..a741f2836a --- /dev/null +++ b/stable/metrics-server/Chart.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +appVersion: 0.2.1 +description: Metrics Server is a cluster-wide aggregator of resource usage data. +name: metrics-server +version: 0.0.2 +keywords: +- metrics-server +home: https://github.com/kubernetes-incubator/metrics-server +sources: +- https://github.com/kubernetes-incubator/metrics-server +maintainers: +- name: olemarkus + email: o.with@sportradar.com diff --git a/stable/metrics-server/README.md b/stable/metrics-server/README.md new file mode 100644 index 0000000000..a1a55d9ce2 --- /dev/null +++ b/stable/metrics-server/README.md @@ -0,0 +1,15 @@ +# metric-server + +Metrics Server is a cluster-wide aggregator of resource usage data. + +## Configuration + +Parameter | Description | Default +--- | --- | --- +`rbac.create` | Enable Role-based authentication | `true` +`serviceAccount.create` | If `true`, create a new service account | `true` +`serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | `` +`apiService.create` | Create the v1beta1.metrics.k8s.io API service | `true` +`image.repository` | Image repository | `gcr.io/google_containers/metrics-server-amd64` +`image.tag` | Image tag | `v0.2.1` +`image.pullPolicy` | Image pull policy | `IfNotPresent` diff --git a/stable/metrics-server/ci/ci-values.yaml b/stable/metrics-server/ci/ci-values.yaml new file mode 100644 index 0000000000..fa9fa63ca4 --- /dev/null +++ b/stable/metrics-server/ci/ci-values.yaml @@ -0,0 +1,5 @@ +# CI is running on GKE, which already ships metrics-server. This cause +# conflicts on the apiService resource. + +apiService: + create: false \ No newline at end of file diff --git a/stable/metrics-server/templates/NOTES.txt b/stable/metrics-server/templates/NOTES.txt new file mode 100644 index 0000000000..1034c129e9 --- /dev/null +++ b/stable/metrics-server/templates/NOTES.txt @@ -0,0 +1,11 @@ +The metric server has been deployed. +{{ if .Values.apiService.create }} +In a few minutes you should be able to list metrics using the following +command: + + kubectl get --raw "/apis/metrics.k8s.io/v1beta1/nodes" +{{ else }} +NOTE: You have disabled the API service creation for this release. The metrics +API will not work with this release unless you configure the metrics API +service outside of this Helm chart. +{{- end -}} diff --git a/stable/metrics-server/templates/_helpers.tpl b/stable/metrics-server/templates/_helpers.tpl new file mode 100644 index 0000000000..39105d125f --- /dev/null +++ b/stable/metrics-server/templates/_helpers.tpl @@ -0,0 +1,51 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "metrics-server.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "metrics-server.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "metrics-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a service name that defaults to app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "metrics-server.service.fullname" -}} +{{- .Values.service.nameOverride | default .Chart.Name }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "metrics-server.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "metrics-server.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} diff --git a/stable/metrics-server/templates/auth-delegator-crb.yaml b/stable/metrics-server/templates/auth-delegator-crb.yaml new file mode 100644 index 0000000000..e1db3837d9 --- /dev/null +++ b/stable/metrics-server/templates/auth-delegator-crb.yaml @@ -0,0 +1,20 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ template "metrics-server.fullname" . }}:system:auth-delegator + namespace: kube-system + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: system:auth-delegator +subjects: + - kind: ServiceAccount + name: {{ template "metrics-server.fullname" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} diff --git a/stable/metrics-server/templates/cluster-role.yaml b/stable/metrics-server/templates/cluster-role.yaml new file mode 100644 index 0000000000..d79fb6220d --- /dev/null +++ b/stable/metrics-server/templates/cluster-role.yaml @@ -0,0 +1,22 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: system:{{ template "metrics-server.fullname" . }} + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +rules: + - apiGroups: + - "" + resources: + - pods + - nodes + - namespaces + verbs: + - get + - list + - watch +{{- end -}} diff --git a/stable/metrics-server/templates/metric-server-service.yaml b/stable/metrics-server/templates/metric-server-service.yaml new file mode 100644 index 0000000000..ddf03e1f2a --- /dev/null +++ b/stable/metrics-server/templates/metric-server-service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "metrics-server.fullname" . }} + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + ports: + - port: 443 + protocol: TCP + targetPort: 443 + selector: + app: {{ template "metrics-server.name" . }} + release: {{ .Release.Name }} diff --git a/stable/metrics-server/templates/metrics-api-service.yaml b/stable/metrics-server/templates/metrics-api-service.yaml new file mode 100644 index 0000000000..88e0065cb0 --- /dev/null +++ b/stable/metrics-server/templates/metrics-api-service.yaml @@ -0,0 +1,20 @@ +{{- if .Values.apiService.create -}} +apiVersion: apiregistration.k8s.io/v1beta1 +kind: APIService +metadata: + name: v1beta1.metrics.k8s.io + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + service: + name: {{ template "metrics-server.fullname" . }} + namespace: {{ .Release.Namespace }} + group: metrics.k8s.io + version: v1beta1 + insecureSkipTLSVerify: true + groupPriorityMinimum: 100 + versionPriority: 100 +{{- end -}} \ No newline at end of file diff --git a/stable/metrics-server/templates/metrics-server-crb.yaml b/stable/metrics-server/templates/metrics-server-crb.yaml new file mode 100644 index 0000000000..18ac6f3537 --- /dev/null +++ b/stable/metrics-server/templates/metrics-server-crb.yaml @@ -0,0 +1,19 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: system:{{ template "metrics-server.fullname" . }} + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: system:{{ template "metrics-server.fullname" . }} +subjects: + - kind: ServiceAccount + name: {{ template "metrics-server.fullname" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml new file mode 100644 index 0000000000..ca538bb8b9 --- /dev/null +++ b/stable/metrics-server/templates/metrics-server-deployment.yaml @@ -0,0 +1,28 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: {{ template "metrics-server.fullname" . }} + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + selector: + matchLabels: + app: {{ template "metrics-server.name" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ template "metrics-server.name" . }} + release: {{ .Release.Name }} + spec: + serviceAccountName: {{ template "metrics-server.serviceAccountName" . }} + containers: + - name: metrics-server + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + command: + - /metrics-server + - --source=kubernetes.summary_api:'' diff --git a/stable/metrics-server/templates/metrics-server-serviceaccount.yaml b/stable/metrics-server/templates/metrics-server-serviceaccount.yaml new file mode 100644 index 0000000000..5fbedb49c5 --- /dev/null +++ b/stable/metrics-server/templates/metrics-server-serviceaccount.yaml @@ -0,0 +1,11 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ template "metrics-server.fullname" . }} + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +{{- end -}} diff --git a/stable/metrics-server/templates/role-binding.yaml b/stable/metrics-server/templates/role-binding.yaml new file mode 100644 index 0000000000..2585878402 --- /dev/null +++ b/stable/metrics-server/templates/role-binding.yaml @@ -0,0 +1,20 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + name: {{ template "metrics-server.fullname" . }}-auth-reader + namespace: kube-system + labels: + app: {{ template "metrics-server.name" . }} + chart: {{ template "metrics-server.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: extension-apiserver-authentication-reader +subjects: + - kind: ServiceAccount + name: {{ template "metrics-server.fullname" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} \ No newline at end of file diff --git a/stable/metrics-server/values.yaml b/stable/metrics-server/values.yaml new file mode 100644 index 0000000000..12331221c4 --- /dev/null +++ b/stable/metrics-server/values.yaml @@ -0,0 +1,23 @@ +rbac: + # Specifies whether RBAC resources should be created + create: true + +serviceAccount: + # Specifies whether a ServiceAccount should be created + create: true + # The name of the ServiceAccount to use. + # If not set and create is true, a name is generated using the fullname template + name: + +apiService: + # Specifies if the v1beta1.metrics.k8s.io API service should be created. + # + # You typically want this enabled! If you disable API service creation you have to + # manage it outside of this chart for e.g horizontal pod autoscaling to + # work with this release. + create: true + +image: + repository: gcr.io/google_containers/metrics-server-amd64 + tag: v0.2.1 + pullPolicy: IfNotPresent