Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

metrics-server: Update to 0.3.6 #343

Merged
merged 1 commit into from
Apr 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/components/metrics-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 0.3.5
appVersion: 0.3.6
description: Metrics Server is a cluster-wide aggregator of resource usage data.
home: https://github.com/kubernetes-incubator/metrics-server
keywords:
Expand All @@ -12,4 +12,4 @@ maintainers:
name: metrics-server
sources:
- https://github.com/kubernetes-incubator/metrics-server
version: 2.8.8
version: 2.11.1
4 changes: 3 additions & 1 deletion assets/components/metrics-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Parameter | Description | Default
`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`
`hostNetwork.enabled` | Enable hostNetwork mode | `false`
`image.repository` | Image repository | `gcr.io/google_containers/metrics-server-amd64`
`image.repository` | Image repository | `k8s.gcr.io/metrics-server-amd64`
`image.tag` | Image tag | `v0.3.2`
`image.pullPolicy` | Image pull policy | `IfNotPresent`
`imagePullSecrets` | Image pull secrets | `[]`
Expand All @@ -25,6 +25,7 @@ Parameter | Description | Default
`extraVolumeMounts` | Ability to provide volume mounts to the pod | `[]`
`extraVolumes` | Ability to provide volumes to the pod | `[]`
`livenessProbe` | Container liveness probe | See values.yaml
`podLabels` | Labels to be added to pods | `{}`
`podAnnotations` | Annotations to be added to pods | `{}`
`priorityClassName` | Pod priority class | `""`
`readinessProbe` | Container readiness probe | See values.yaml
Expand All @@ -35,3 +36,4 @@ Parameter | Description | Default
`podDisruptionBudget.enabled` | Create a PodDisruptionBudget | `false`
`podDisruptionBudget.minAvailable` | Minimum available instances; ignored if there is no PodDisruptionBudget |
`podDisruptionBudget.maxUnavailable` | Maximum unavailable instances; ignored if there is no PodDisruptionBudget |
`extraContainers` | Add additional containers | `[]`
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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" . }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ rules:
{{- if .Values.rbac.pspEnabled }}
- apiGroups:
- extensions
- policy
resources:
- podsecuritypolicies
resourceNames:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ spec:
labels:
app: {{ template "metrics-server.name" . }}
release: {{ .Release.Name }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- with .Values.podAnnotations }}
annotations:
{{- range $key, $value := . }}
Expand All @@ -40,6 +43,9 @@ spec:
hostNetwork: true
{{- end }}
containers:
{{- if .Values.extraContainers }}
{{- ( tpl (toYaml .Values.extraContainers) . ) | nindent 8 }}
{{- end }}
- name: metrics-server
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.rbac.create -}}
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ template "metrics-server.fullname" . }}-auth-reader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Pod
metadata:
name: {{ template "metrics-server.fullname" . }}-test
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "metrics-server.name" . }}
chart: {{ template "metrics-server.chart" . }}
Expand Down
12 changes: 9 additions & 3 deletions assets/components/metrics-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ hostNetwork:
enabled: false

image:
repository: gcr.io/google_containers/metrics-server-amd64
tag: v0.3.5
repository: k8s.gcr.io/metrics-server-amd64
tag: v0.3.6
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand All @@ -48,11 +48,17 @@ affinity: {}

replicas: 1

extraContainers: []

podLabels: {}

podAnnotations: {}
# The following annotations guarantee scheduling for critical add-on pods.
# See more at: https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
# scheduler.alpha.kubernetes.io/critical-pod: ''
# priorityClassName: system-node-critical

## Set a pod priorityClassName
# priorityClassName: system-node-critical

extraVolumeMounts: []
# - name: secrets
Expand Down
32 changes: 16 additions & 16 deletions pkg/assets/generated_assets.go

Large diffs are not rendered by default.