From 5eae5633e8f4964dd3afac423b10999db4091a5f Mon Sep 17 00:00:00 2001 From: Claude Ebaneck Date: Thu, 23 Apr 2020 18:41:34 +0200 Subject: [PATCH 1/2] renderer: remove mandatory `--service-config` argument Some charts do not have a service config argument but the renderer script enforces that we pass a service configuration. This commit ensures the `--service-config` argument is not mandatory while rendering the charts --- charts/render.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/charts/render.py b/charts/render.py index 7176e83bd5..a7e71b47fb 100755 --- a/charts/render.py +++ b/charts/render.py @@ -190,6 +190,7 @@ def main(): '--service-config', action='append', nargs=2, + required=False, dest="service_configs", help="Example: --service-config grafana metalk8s-grafana-config" ) @@ -212,16 +213,14 @@ def main(): ) ) - sys.stdout.write( - START_BLOCK.format( - configlines='\n'.join( - ("{{%- set {} = salt.metalk8s_service_configuration" - ".get_service_conf('{}', '{}') %}}").format( - service_config[0], args.namespace, service_config[1] - ) for service_config in args.service_configs - ) - ).lstrip() - ) + config = '\n'.join( + ("{{%- set {} = salt.metalk8s_service_configuration" + ".get_service_conf('{}', '{}') %}}").format( + service_config[0], args.namespace, service_config[1] + ) for service_config in args.service_configs + ) if args.service_configs else '' + + sys.stdout.write(START_BLOCK.format(configlines=config).lstrip()) sys.stdout.write('\n') stream = io.StringIO() From 0eb09621fe2657d6404757d8b4f6dace75a9dd8d Mon Sep 17 00:00:00 2001 From: Claude Ebaneck Date: Tue, 21 Apr 2020 11:09:32 +0200 Subject: [PATCH 2/2] charts: update prometheus-adapter to version 0.6.0 This chart is render using: ``` $ rm -rf charts/prometheus-adapter $ helm repo update $ helm fetch -d charts --untar stable/prometheus-adapter $ ./charts/render.py prometheus-adapter --namespace metalk8s-monitoring charts/prometheus-adapter.yaml charts/prometheus-adapter/ > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls ``` Closes #2431 --- buildchain/buildchain/versions.py | 4 +- charts/prometheus-adapter/Chart.yaml | 4 +- charts/prometheus-adapter/README.md | 14 +- .../custom-metrics-apiserver-deployment.yaml | 10 +- .../templates/custom-metrics-apiservice.yaml | 2 + .../custom-metrics-cluster-role.yaml | 2 +- .../templates/custom-metrics-configmap.yaml | 20 +- ...-metrics-resource-reader-cluster-role.yaml | 1 + charts/prometheus-adapter/values.yaml | 23 ++- .../prometheus-adapter/deployed/chart.sls | 171 ++++++++++++------ 10 files changed, 170 insertions(+), 81 deletions(-) diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py index ae02d0512d..8df8615e45 100644 --- a/buildchain/buildchain/versions.py +++ b/buildchain/buildchain/versions.py @@ -174,8 +174,8 @@ def _version_prefix(version: str, prefix: str = 'v') -> str: ), Image( name='k8s-prometheus-adapter-amd64', - version='v0.5.0', - digest='sha256:acf4c4dc6aaa51e3004eebdc410b509db45d1a6ebd255457c5745f0b4671678f', + version='v0.6.0', + digest='sha256:b63dc612e3cb73f79d2401a4516f794f9f0a83002600ca72e675e41baecff437', ), Image( name='prometheus-config-reloader', diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index c7f22d6ed7..56c8ce3cc5 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v0.5.0 +appVersion: v0.6.0 description: A Helm chart for k8s prometheus adapter home: https://github.com/DirectXMan12/k8s-prometheus-adapter keywords: @@ -17,4 +17,4 @@ name: prometheus-adapter sources: - https://github.com/kubernetes/charts - https://github.com/DirectXMan12/k8s-prometheus-adapter -version: 1.4.0 +version: 2.3.1 diff --git a/charts/prometheus-adapter/README.md b/charts/prometheus-adapter/README.md index 4c43d2f63d..9d8f0af3fb 100644 --- a/charts/prometheus-adapter/README.md +++ b/charts/prometheus-adapter/README.md @@ -4,7 +4,7 @@ Installs the [Prometheus Adapter](https://github.com/DirectXMan12/k8s-prometheus ## Prerequisites -Kubernetes 1.11+ +Kubernetes 1.14+ ## Installing the Chart @@ -74,9 +74,9 @@ rules: resource: node namespace: resource: namespace - pod_name: + pod: resource: pod - containerLabel: container_name + containerLabel: container memory: containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>) nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>) @@ -86,9 +86,9 @@ rules: resource: node namespace: resource: namespace - pod_name: + pod: resource: pod - containerLabel: container_name + containerLabel: container window: 3m ``` @@ -112,12 +112,14 @@ The following table lists the configurable parameters of the Prometheus Adapter | ------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------| | `affinity` | Node affinity | `{}` | | `image.repository` | Image repository | `directxman12/k8s-prometheus-adapter-amd64` | -| `image.tag` | Image tag | `v0.5.0` | +| `image.tag` | Image tag | `v0.6.0` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Image pull secrets | `{}` | | `logLevel` | Log level | `4` | +| `listenPort` | Port that application would listen on in the container | `6443` | | `metricsRelistInterval` | Interval at which to re-list the set of all available metrics from Prometheus | `1m` | | `nodeSelector` | Node labels for pod assignment | `{}` | +| `podLabels` | Labels to add to the pod | `{}` | | `podAnnotations` | Annotations to add to the pod | `{}` | | `priorityClassName` | Pod priority | `` | | `prometheus.url` | Url of where we can find the Prometheus service | `http://prometheus.default.svc` | diff --git a/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml b/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml index fa98872e6f..54e0a4e94a 100644 --- a/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml +++ b/charts/prometheus-adapter/templates/custom-metrics-apiserver-deployment.yaml @@ -20,6 +20,9 @@ spec: chart: {{ template "k8s-prometheus-adapter.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.podLabels }} + {{- toYaml . | trim | nindent 8 }} + {{- end }} name: {{ template "k8s-prometheus-adapter.name" . }} annotations: checksum/config: {{ include (print $.Template.BasePath "/custom-metrics-configmap.yaml") . | sha256sum }} @@ -28,13 +31,16 @@ spec: {{- end }} spec: serviceAccountName: {{ template "k8s-prometheus-adapter.serviceAccountName" . }} + {{- if .Values.hostNetwork.enabled }} + hostNetwork: true + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: - /adapter - - --secure-port=6443 + - --secure-port={{ .Values.listenPort }} {{- if .Values.tls.enable }} - --tls-cert-file=/var/run/serving-cert/tls.crt - --tls-private-key-file=/var/run/serving-cert/tls.key @@ -46,7 +52,7 @@ spec: - --v={{ .Values.logLevel }} - --config=/etc/adapter/config.yaml ports: - - containerPort: 6443 + - containerPort: {{ .Values.listenPort }} name: https livenessProbe: httpGet: diff --git a/charts/prometheus-adapter/templates/custom-metrics-apiservice.yaml b/charts/prometheus-adapter/templates/custom-metrics-apiservice.yaml index 676402143c..1eb380d70f 100644 --- a/charts/prometheus-adapter/templates/custom-metrics-apiservice.yaml +++ b/charts/prometheus-adapter/templates/custom-metrics-apiservice.yaml @@ -1,3 +1,4 @@ +{{- if or .Values.rules.default .Values.rules.custom }} apiVersion: apiregistration.k8s.io/v1beta1 kind: APIService metadata: @@ -19,3 +20,4 @@ spec: insecureSkipTLSVerify: {{ if .Values.tls.enable }}false{{ else }}true{{ end }} groupPriorityMinimum: 100 versionPriority: 100 +{{- end }} diff --git a/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml b/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml index 66a3d399a6..33daf7113b 100644 --- a/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml +++ b/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml @@ -1,4 +1,4 @@ -{{- if .Values.rbac.create -}} +{{- if and .Values.rbac.create (or .Values.rules.default .Values.rules.custom) -}} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/prometheus-adapter/templates/custom-metrics-configmap.yaml b/charts/prometheus-adapter/templates/custom-metrics-configmap.yaml index 5b035900ad..a191e8add3 100644 --- a/charts/prometheus-adapter/templates/custom-metrics-configmap.yaml +++ b/charts/prometheus-adapter/templates/custom-metrics-configmap.yaml @@ -10,48 +10,49 @@ metadata: heritage: {{ .Release.Service }} data: config.yaml: | +{{- if or .Values.rules.default .Values.rules.custom }} rules: {{- if .Values.rules.default }} - - seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}' + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' seriesFilters: [] resources: overrides: namespace: resource: namespace - pod_name: + pod: resource: pod name: matches: ^container_(.*)_seconds_total$ as: "" - metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[5m])) + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m])) by (<<.GroupBy>>) - - seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}' + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' seriesFilters: - isNot: ^container_.*_seconds_total$ resources: overrides: namespace: resource: namespace - pod_name: + pod: resource: pod name: matches: ^container_(.*)_total$ as: "" - metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[5m])) + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m])) by (<<.GroupBy>>) - - seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}' + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' seriesFilters: - isNot: ^container_.*_total$ resources: overrides: namespace: resource: namespace - pod_name: + pod: resource: pod name: matches: ^container_(.*)$ as: "" - metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}) by (<<.GroupBy>>) + metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>) - seriesQuery: '{namespace!="",__name__!~"^container_.*"}' seriesFilters: - isNot: .*_total$ @@ -82,6 +83,7 @@ data: {{- if .Values.rules.custom }} {{ toYaml .Values.rules.custom | indent 4 }} {{- end -}} +{{- end -}} {{- if .Values.rules.external }} externalRules: {{ toYaml .Values.rules.external | indent 4 }} diff --git a/charts/prometheus-adapter/templates/custom-metrics-resource-reader-cluster-role.yaml b/charts/prometheus-adapter/templates/custom-metrics-resource-reader-cluster-role.yaml index af10d0aaa8..319460a332 100644 --- a/charts/prometheus-adapter/templates/custom-metrics-resource-reader-cluster-role.yaml +++ b/charts/prometheus-adapter/templates/custom-metrics-resource-reader-cluster-role.yaml @@ -19,4 +19,5 @@ rules: verbs: - get - list + - watch {{- end -}} diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml index 4e13ad6c51..d27bc9a2f3 100644 --- a/charts/prometheus-adapter/values.yaml +++ b/charts/prometheus-adapter/values.yaml @@ -3,13 +3,15 @@ affinity: {} image: repository: directxman12/k8s-prometheus-adapter-amd64 - tag: v0.5.0 + tag: v0.6.0 pullPolicy: IfNotPresent logLevel: 4 metricsRelistInterval: 1m +listenPort: 6443 + nodeSelector: {} priorityClassName: "" @@ -71,9 +73,9 @@ rules: # resource: node # namespace: # resource: namespace -# pod_name: +# pod: # resource: pod -# containerLabel: container_name +# containerLabel: container # memory: # containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>) # nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>) @@ -83,9 +85,9 @@ rules: # resource: node # namespace: # resource: namespace -# pod_name: +# pod: # resource: pod -# containerLabel: container_name +# containerLabel: container # window: 3m service: @@ -123,5 +125,16 @@ extraVolumeMounts: [] tolerations: [] +# Labels added to the pod +podLabels: {} + # Annotations added to the pod podAnnotations: {} + +hostNetwork: + # Specifies if prometheus-adapter should be started in hostNetwork mode. + # + # You would require this enabled if you use alternate overlay networking for pods and + # API server unable to communicate with metrics-server. As an example, this is required + # if you use Weave network on EKS + enabled: false diff --git a/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls b/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls index 37f0a524ea..3ba1a43e38 100644 --- a/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls +++ b/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls @@ -1,47 +1,109 @@ #!jinja | metalk8s_kubernetes + {%- from "metalk8s/repo/macro.sls" import build_image_name with context %} + {% raw %} apiVersion: v1 data: - config.yaml: "rules:\n- seriesQuery: '{__name__=~\"^container_.*\",container_name!=\"\ - POD\",namespace!=\"\",pod_name!=\"\"}'\n seriesFilters: []\n resources:\n \ - \ overrides:\n namespace:\n resource: namespace\n pod_name:\n\ - \ resource: pod\n name:\n matches: ^container_(.*)_seconds_total$\n\ - \ as: \"\"\n metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!=\"\ - POD\"}[5m]))\n by (<<.GroupBy>>)\n- seriesQuery: '{__name__=~\"^container_.*\"\ - ,container_name!=\"POD\",namespace!=\"\",pod_name!=\"\"}'\n seriesFilters:\n\ - \ - isNot: ^container_.*_seconds_total$\n resources:\n overrides:\n \ - \ namespace:\n resource: namespace\n pod_name:\n resource:\ - \ pod\n name:\n matches: ^container_(.*)_total$\n as: \"\"\n metricsQuery:\ - \ sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!=\"POD\"}[5m]))\n \ - \ by (<<.GroupBy>>)\n- seriesQuery: '{__name__=~\"^container_.*\",container_name!=\"\ - POD\",namespace!=\"\",pod_name!=\"\"}'\n seriesFilters:\n - isNot: ^container_.*_total$\n\ - \ resources:\n overrides:\n namespace:\n resource: namespace\n\ - \ pod_name:\n resource: pod\n name:\n matches: ^container_(.*)$\n\ - \ as: \"\"\n metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container_name!=\"\ - POD\"}) by (<<.GroupBy>>)\n- seriesQuery: '{namespace!=\"\",__name__!~\"^container_.*\"\ - }'\n seriesFilters:\n - isNot: .*_total$\n resources:\n template: <<.Resource>>\n\ - \ name:\n matches: \"\"\n as: \"\"\n metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>})\ - \ by (<<.GroupBy>>)\n- seriesQuery: '{namespace!=\"\",__name__!~\"^container_.*\"\ - }'\n seriesFilters:\n - isNot: .*_seconds_total\n resources:\n template:\ - \ <<.Resource>>\n name:\n matches: ^(.*)_total$\n as: \"\"\n metricsQuery:\ - \ sum(rate(<<.Series>>{<<.LabelMatchers>>}[5m])) by (<<.GroupBy>>)\n- seriesQuery:\ - \ '{namespace!=\"\",__name__!~\"^container_.*\"}'\n seriesFilters: []\n resources:\n\ - \ template: <<.Resource>>\n name:\n matches: ^(.*)_seconds_total$\n \ - \ as: \"\"\n metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>}[5m])) by\ - \ (<<.GroupBy>>)\nresourceRules:\n cpu:\n containerLabel: container_name\n\ - \ containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m]))\n\ - \ by (<<.GroupBy>>)\n nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,\ - \ id='/'}[3m]))\n by (<<.GroupBy>>)\n resources:\n overrides:\n \ - \ namespace:\n resource: namespace\n node:\n resource:\ - \ node\n pod:\n resource: pod\n memory:\n containerLabel:\ - \ container_name\n containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>})\ - \ by (<<.GroupBy>>)\n nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'})\ - \ by\n (<<.GroupBy>>)\n resources:\n overrides:\n namespace:\n\ - \ resource: namespace\n node:\n resource: node\n \ - \ pod:\n resource: pod\n window: 3m\n \n" + config.yaml: |- + rules: + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' + seriesFilters: [] + resources: + overrides: + namespace: + resource: namespace + pod: + resource: pod + name: + matches: ^container_(.*)_seconds_total$ + as: "" + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m])) + by (<<.GroupBy>>) + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' + seriesFilters: + - isNot: ^container_.*_seconds_total$ + resources: + overrides: + namespace: + resource: namespace + pod: + resource: pod + name: + matches: ^container_(.*)_total$ + as: "" + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m])) + by (<<.GroupBy>>) + - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}' + seriesFilters: + - isNot: ^container_.*_total$ + resources: + overrides: + namespace: + resource: namespace + pod: + resource: pod + name: + matches: ^container_(.*)$ + as: "" + metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>) + - seriesQuery: '{namespace!="",__name__!~"^container_.*"}' + seriesFilters: + - isNot: .*_total$ + resources: + template: <<.Resource>> + name: + matches: "" + as: "" + metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>) + - seriesQuery: '{namespace!="",__name__!~"^container_.*"}' + seriesFilters: + - isNot: .*_seconds_total + resources: + template: <<.Resource>> + name: + matches: ^(.*)_total$ + as: "" + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>}[5m])) by (<<.GroupBy>>) + - seriesQuery: '{namespace!="",__name__!~"^container_.*"}' + seriesFilters: [] + resources: + template: <<.Resource>> + name: + matches: ^(.*)_seconds_total$ + as: "" + metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>}[5m])) by (<<.GroupBy>>) + resourceRules: + cpu: + containerLabel: container_name + containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) + by (<<.GroupBy>>) + nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) + by (<<.GroupBy>>) + resources: + overrides: + namespace: + resource: namespace + node: + resource: node + pod: + resource: pod + memory: + containerLabel: container_name + containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>) + nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by + (<<.GroupBy>>) + resources: + overrides: + namespace: + resource: namespace + node: + resource: node + pod: + resource: pod + window: 3m kind: ConfigMap metadata: labels: @@ -49,7 +111,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter @@ -63,7 +125,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter @@ -77,7 +139,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-server-resources @@ -98,7 +160,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-resource-reader @@ -114,6 +176,7 @@ rules: verbs: - get - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -123,7 +186,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-metrics @@ -148,7 +211,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter:system:auth-delegator @@ -170,7 +233,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-resource-reader @@ -192,7 +255,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-hpa-controller @@ -214,7 +277,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-hpa-controller-metrics @@ -236,7 +299,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter-auth-reader @@ -259,7 +322,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter @@ -282,7 +345,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter @@ -296,13 +359,13 @@ spec: template: metadata: annotations: - checksum/config: af5232ebf7c9aae4f20e8e0491bce5ee713153bc0ca342a4c4c275e44ef3d6e7 + checksum/config: e1ea8506b046c8e09a15940037dab9e258845ce50292615b74e487d8f475ef8d labels: app: prometheus-adapter app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: prometheus-adapter @@ -319,7 +382,7 @@ spec: - --v=4 - --config=/etc/adapter/config.yaml image: '{%- endraw -%}{{ build_image_name("k8s-prometheus-adapter-amd64", - False) }}{%- raw -%}:v0.5.0' + False) }}{%- raw -%}:v0.6.0' imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -377,7 +440,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: v1beta1.custom.metrics.k8s.io @@ -400,7 +463,7 @@ metadata: app.kubernetes.io/managed-by: salt app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: metalk8s - chart: prometheus-adapter-1.4.0 + chart: prometheus-adapter-2.3.1 heritage: metalk8s release: prometheus-adapter name: v1beta1.metrics.k8s.io