UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit d67254c3 authored by Jordan Olachea's avatar Jordan Olachea Committed by Ryan Garcia
Browse files

update "chart" (https://github.com/kubernetes-sigs/metrics-server) from...

parent ad0e73c1
No related branches found
No related tags found
1 merge request!13update "chart" (https://github.com/kubernetes-sigs/metrics-server) from...
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 22 deletions
CHANGELOG.md
+ 6
− 0
View file @ d67254c3
......@@ -3,6 +3,12 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
---
## [3.8.3-bb.0]
### Added
- Updated to upstream helm chart metrics-server-helm-chart-3.8.3
- Updated metrics-server images to 0.6.2
- Updated kubectl image to v1.25.5
## [3.8.0-bb.6]
### Added
- Updated kubectl image to v1.25.4
......
README.md
+ 13
− 3
View file @ d67254c3
# metrics-server
![Version: 3.8.0-bb.6](https://img.shields.io/badge/Version-3.8.0--bb.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.1](https://img.shields.io/badge/AppVersion-0.6.1-informational?style=flat-square)
![Version: 3.8.3-bb.0](https://img.shields.io/badge/Version-3.8.3--bb.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.2](https://img.shields.io/badge/AppVersion-0.6.2-informational?style=flat-square)
Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
......@@ -36,7 +36,7 @@ helm install metrics-server chart/
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| image.repository | string | `"registry1.dso.mil/ironbank/opensource/kubernetes-sigs/metrics-server"` | |
| image.tag | string | `"0.6.1"` | |
| image.tag | string | `"v0.6.2"` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| imagePullSecrets[0].name | string | `"private-registry"` | |
| nameOverride | string | `""` | |
......@@ -44,9 +44,14 @@ helm install metrics-server chart/
| serviceAccount.create | bool | `true` | |
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.name | string | `""` | |
| serviceAccount.secrets | list | `[]` | |
| rbac.create | bool | `true` | |
| rbac.pspEnabled | bool | `false` | |
| apiService.create | bool | `true` | |
| apiService.annotations | object | `{}` | |
| apiService.insecureSkipTLSVerify | bool | `true` | |
| apiService.caBundle | string | `""` | |
| commonLabels | object | `{}` | |
| podLabels | object | `{}` | |
| podAnnotations | object | `{}` | |
| podSecurityContext | object | `{}` | |
......@@ -88,6 +93,8 @@ helm install metrics-server chart/
| serviceMonitor.additionalLabels | object | `{}` | |
| serviceMonitor.interval | string | `"1m"` | |
| serviceMonitor.scrapeTimeout | string | `"10s"` | |
| serviceMonitor.metricRelabelings | list | `[]` | |
| serviceMonitor.relabelings | list | `[]` | |
| resources.limits.cpu | string | `"100m"` | |
| resources.limits.memory | string | `"200Mi"` | |
| resources.requests.cpu | string | `"100m"` | |
......@@ -109,8 +116,11 @@ helm install metrics-server chart/
| networkPolicies.controlPlaneCidr | string | `"0.0.0.0/0"` | |
| networkPolicies.nodeCidr | string | `nil` | |
| bbtests.enabled | bool | `false` | |
| bbtests.scripts.image | string | `"registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.25.4"` | |
| bbtests.scripts.image | string | `"registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.25.5"` | |
| bbtests.imagePullSecret | string | `"private-registry"` | |
| topologySpreadConstraints | list | `[]` | |
| deploymentAnnotations | object | `{}` | |
| schedulerName | string | `""` | |
## Contributing
......
chart/Chart.yaml
+ 14
− 6
View file @ d67254c3
......@@ -2,8 +2,8 @@ apiVersion: v2
name: metrics-server
description: Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
type: application
version: 3.8.0-bb.6
appVersion: 0.6.1
version: 3.8.3-bb.0
appVersion: 0.6.2
keywords:
- kubernetes
- metrics-server
......@@ -26,10 +26,18 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: added
description: "Add support for unauthenticated access to /metrics endpoint."
description: "Added support for topologySpreadConstraints."
- kind: added
description: "Add PrometheusOperator ServiceMonitor."
description: "Set resource namespaces explicitly."
- kind: added
description: "Allow configuring TLS on the APIService."
- kind: added
description: "Enabled service monitor relabelling."
- kind: added
description: "Added ability to set the scheduler name."
- kind: added
description: "Added support for common labels."
- kind: changed
description: "Update Metrics Server image to v0.6.1."
description: "Update Metrics Server image to v0.6.2."
bigbang.dev/applicationVersions: |
- Metrics Server: 0.6.1
\ No newline at end of file
- Metrics Server: 0.6.2
chart/Kptfile
+ 2
− 2
View file @ d67254c3
......@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
commit: 9c9d712d31742f7c32c023d7b36c49c2dc7033b5
commit: eb650ca6fc36504e7ac478f6b8cc9f28d2c1b81f
repo: https://github.com/kubernetes-sigs/metrics-server
directory: charts/metrics-server
ref: v0.6.1
ref: metrics-server-helm-chart-3.8.3
chart/README.md
+ 11
− 1
View file @ d67254c3
......@@ -33,9 +33,14 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
| `serviceAccount.create` | If `true`, create a new service account. | `true` |
| `serviceAccount.annotations` | Annotations to add to the service account. | `{}` |
| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template. | `nil` |
| `serviceAccount.secrets` | The list of secrets mountable by this service account. See https://kubernetes.io/docs/reference/labels-annotations-taints/#enforce-mountable-secrets | `[]` |
| `rbac.create` | If `true`, create the RBAC resources. | `true` |
| `rbac.pspEnabled` | If `true`, create a pod security policy resource. | `false` |
| `apiService.create` | If `true`, create the `v1beta1.metrics.k8s.io` API service. 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. | `true` |
| `apiService.annotations` | Annotations to add to the API service. | `{}` |
| `apiService.insecureSkipTLSVerify` | Specifies whether to skip TLS verification | `true` |
| `apiService.caBundle` | The PEM encoded CA bundle for TLS verification | `""` |
| `commonLabels` | Labels to add to each object of the chart. | `{}` |
| `podLabels` | Labels to add to the pod. | `{}` |
| `podAnnotations` | Annotations to add to the pod. | `{}` |
| `podSecurityContext` | Security context for the pod. | `{}` |
......@@ -59,11 +64,16 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
| `metrics.enabled` | If `true`, allow unauthenticated access to `/metrics`. | `false` |
| `serviceMonitor.enabled` | If `true`, create a _Prometheus_ service monitor. This needs `metrics.enabled` to be `true`. | `false` |
| `serviceMonitor.additionalLabels` | Additional labels to be set on the ServiceMonitor. | `{}` |
| `serviceMonitor.metricRelabelings` | _Prometheus_ metric relabeling. | `[]` |
| `serviceMonitor.relabelings` | _Prometheus_ relabeling. | `[]` |
| `serviceMonitor.interval` | _Prometheus_ scrape frequency. | `1m` |
| `serviceMonitor.scrapeTimeout` | _Prometheus_ scrape timeout. | `10s` |
| `resources` | Resource requests and limits for the _metrics-server_ container. | `{}` |
| `resources` | Resource requests and limits for the _metrics-server_ container. See https://github.com/kubernetes-sigs/metrics-server#scaling | `{}` |
| `extraVolumeMounts` | Additional volume mounts for the _metrics-server_ container. | `[]` |
| `extraVolumes` | Additional volumes for the pod. | `[]` |
| `nodeSelector` | Node labels for pod assignment. | `{}` |
| `tolerations` | Tolerations for pod assignment. | `[]` |
| `affinity` | Affinity for pod assignment. | `{}` |
| `topologySpreadConstraints` | Pod Topology Spread Constraints. | `[]` |
| `deploymentAnnotations` | Annotations to add to the deployment. | `{}` |
| `schedulerName` | scheduler to set to the deployment. | `""` |
chart/templates/_helpers.tpl
+ 3
− 0
View file @ d67254c3
......@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "metrics-server.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.commonLabels }}
{{ toYaml .Values.commonLabels }}
{{- end }}
{{- end }}
{{/*
......
chart/templates/apiservice.yaml
+ 9
− 1
View file @ d67254c3
......@@ -5,13 +5,21 @@ metadata:
name: v1beta1.metrics.k8s.io
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.apiService.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.apiService.caBundle }}
caBundle: {{ b64enc . }}
{{- end }}
group: metrics.k8s.io
groupPriorityMinimum: 100
insecureSkipTLSVerify: true
insecureSkipTLSVerify: {{ .Values.apiService.insecureSkipTLSVerify }}
service:
name: {{ include "metrics-server.fullname" . }}
namespace: {{ .Release.Namespace }}
port: {{ .Values.service.port }}
version: v1beta1
versionPriority: 100
{{- end -}}
chart/templates/deployment.yaml
+ 16
− 2
View file @ d67254c3
......@@ -2,8 +2,13 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "metrics-server.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.deploymentAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicas }}
{{- with .Values.updateStrategy }}
......@@ -25,6 +30,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
schedulerName: {{ .Values.schedulerName }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
......@@ -63,10 +69,14 @@ spec:
- name: https
protocol: TCP
containerPort: {{ .Values.containerPort }}
{{- with .Values.livenessProbe }}
livenessProbe:
{{- toYaml .Values.livenessProbe | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.readinessProbe }}
readinessProbe:
{{- toYaml .Values.readinessProbe | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
- name: tmp
mountPath: /tmp
......@@ -95,3 +105,7 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
chart/templates/pdb.yaml
+ 1
− 0
View file @ d67254c3
......@@ -3,6 +3,7 @@ apiVersion: {{ include "metrics-server.pdb.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
name: {{ include "metrics-server.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
spec:
......
chart/templates/rolebinding.yaml
+ 1
− 1
View file @ d67254c3
......@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ printf "%s-auth-reader" (include "metrics-server.fullname" .) }}
namespace: kube-system
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
roleRef:
......
chart/templates/service.yaml
+ 3
− 2
View file @ d67254c3
......@@ -2,12 +2,13 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "metrics-server.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.service.labels -}}
{{- toYaml . | nindent 4 }}
{{- end }}
......
chart/templates/serviceaccount.yaml
+ 7
− 2
View file @ d67254c3
......@@ -3,10 +3,15 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "metrics-server.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.secrets }}
secrets:
{{- toYaml . | nindent 2 }}
{{- end }}
{{- end -}}
chart/templates/servicemonitor.yaml
+ 9
− 0
View file @ d67254c3
......@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "metrics-server.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "metrics-server.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.additionalLabels }}
......@@ -28,4 +29,12 @@ spec:
{{- with .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
{{- with .Values.serviceMonitor.metricRelabelings }}
metricRelabelings:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.serviceMonitor.relabelings }}
relabelings:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end -}}
chart/values.yaml
+ 20
− 2
View file @ d67254c3
......@@ -5,7 +5,7 @@
image:
repository: registry1.dso.mil/ironbank/opensource/kubernetes-sigs/metrics-server
# Overrides the image tag whose default is v{{ .Chart.AppVersion }}
tag: "0.6.1"
tag: "v0.6.2"
pullPolicy: IfNotPresent
imagePullSecrets:
......@@ -22,6 +22,9 @@ serviceAccount:
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""
# The list of secrets mountable by this service account.
# See https://kubernetes.io/docs/reference/labels-annotations-taints/#enforce-mountable-secrets
secrets: []
rbac:
# Specifies whether RBAC resources should be created
......@@ -35,7 +38,14 @@ apiService:
# manage it outside of this chart for e.g horizontal pod autoscaling to
# work with this release.
create: true
# Annotations to add to the API service
annotations: {}
# Specifies whether to skip TLS verification
insecureSkipTLSVerify: true
# The PEM encoded CA bundle for TLS verification
caBundle: ""
commonLabels: {}
podLabels: {}
podAnnotations: {}
......@@ -116,6 +126,8 @@ serviceMonitor:
additionalLabels: {}
interval: 1m
scrapeTimeout: 10s
metricRelabelings: []
relabelings: []
# Pulled from README under 'Scaling' for <= 100 nodes
resources:
......@@ -169,6 +181,12 @@ networkPolicies:
bbtests:
enabled: false
scripts:
image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.25.4
image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.25.5
imagePullSecret: private-registry
topologySpreadConstraints: []
# Annotations to add to the deployment
deploymentAnnotations: {}
schedulerName: ""
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI