[kube-state-metrics] Update to make current
Update image to a version appropriate for current Kubernetes versions, adjust RBAC appropriately. Change-Id: I6c7835cb18737f98e37a433bde8fd232d6f5479e
This commit is contained in:
parent
9d5b9a9e42
commit
25d2b06c16
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.3.1
|
appVersion: v1.3.1
|
||||||
description: OpenStack-Helm Kube-State-Metrics for Prometheus
|
description: OpenStack-Helm Kube-State-Metrics for Prometheus
|
||||||
name: prometheus-kube-state-metrics
|
name: prometheus-kube-state-metrics
|
||||||
version: 0.1.1
|
version: 0.1.2
|
||||||
home: https://github.com/kubernetes/kube-state-metrics
|
home: https://github.com/kubernetes/kube-state-metrics
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/kubernetes/kube-state-metrics
|
- https://github.com/kubernetes/kube-state-metrics
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
{{/*
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/}}
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
exec kube-state-metrics --port=8080 --telemetry-port=8081
|
|
@ -20,8 +20,6 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: kube-state-metrics-bin
|
name: kube-state-metrics-bin
|
||||||
data:
|
data:
|
||||||
kube-state-metrics.sh: |
|
|
||||||
{{ tuple "bin/_kube-state-metrics.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
||||||
image-repo-sync.sh: |
|
image-repo-sync.sh: |
|
||||||
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
|
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -30,46 +30,9 @@ metadata:
|
|||||||
name: {{ $serviceAccountName }}
|
name: {{ $serviceAccountName }}
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- "*"
|
||||||
resources:
|
resources:
|
||||||
- configmaps
|
- "*"
|
||||||
- secrets
|
|
||||||
- nodes
|
|
||||||
- pods
|
|
||||||
- services
|
|
||||||
- resourcequotas
|
|
||||||
- replicationcontrollers
|
|
||||||
- limitranges
|
|
||||||
- persistentvolumeclaims
|
|
||||||
- persistentvolumes
|
|
||||||
- namespaces
|
|
||||||
- endpoints
|
|
||||||
verbs:
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- statefulsets
|
|
||||||
- daemonsets
|
|
||||||
- deployments
|
|
||||||
- replicasets
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- batch
|
|
||||||
resources:
|
|
||||||
- cronjobs
|
|
||||||
- jobs
|
|
||||||
verbs:
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- autoscaling
|
|
||||||
resources:
|
|
||||||
- horizontalpodautoscalers
|
|
||||||
verbs:
|
verbs:
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
@ -124,8 +87,6 @@ spec:
|
|||||||
{{ tuple $envAll "kube_state_metrics" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "kube_state_metrics" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.kube_state_metrics | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.kube_state_metrics | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
{{ dict "envAll" $envAll "application" "exporter" "container" "kube_state_metrics" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
{{ dict "envAll" $envAll "application" "exporter" "container" "kube_state_metrics" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
command:
|
|
||||||
- /tmp/kube-state-metrics.sh
|
|
||||||
ports:
|
ports:
|
||||||
- name: metrics
|
- name: metrics
|
||||||
containerPort: {{ tuple "kube_state_metrics" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
containerPort: {{ tuple "kube_state_metrics" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
@ -133,15 +94,7 @@ spec:
|
|||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: pod-tmp
|
- name: pod-tmp
|
||||||
mountPath: /tmp
|
mountPath: /tmp
|
||||||
- name: kube-state-metrics-bin
|
|
||||||
mountPath: /tmp/kube-state-metrics.sh
|
|
||||||
subPath: kube-state-metrics.sh
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: pod-tmp
|
- name: pod-tmp
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: kube-state-metrics-bin
|
|
||||||
configMap:
|
|
||||||
name: kube-state-metrics-bin
|
|
||||||
defaultMode: 0555
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
---
|
---
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
kube_state_metrics: docker.io/bitnami/kube-state-metrics:1.3.1
|
kube_state_metrics: quay.io/coreos/kube-state-metrics:v2.0.0-alpha
|
||||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||||
image_repo_sync: docker.io/docker:17.07.0
|
image_repo_sync: docker.io/docker:17.07.0
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
|
Loading…
Reference in New Issue
Block a user