From b473929b36cee4a565deccac477ce4c4e4d7e37b Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 18 Mar 2021 09:17:49 +0100 Subject: [PATCH 1/3] jsonnet/kube-prometheus/: Bump kube-state-metrics to v2.0.0-rc --- jsonnet/kube-prometheus/jsonnetfile.json | 4 ++-- jsonnet/kube-prometheus/versions.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index 1c3a3c98..dc536603 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -53,7 +53,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "release-1.9" + "version": "release-2.0" }, { "source": { @@ -62,7 +62,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "master" + "version": "release-2.0" }, { "source": { diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index db5f2a94..1d55d2ea 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -2,7 +2,7 @@ "alertmanager": "0.21.0", "blackboxExporter": "0.18.0", "grafana": "7.4.3", - "kubeStateMetrics": "1.9.8", + "kubeStateMetrics": "2.0.0-rc.0", "nodeExporter": "1.1.1", "prometheus": "2.25.0", "prometheusAdapter": "0.8.3", From 4bba284d9b30c9802dd48bb7f573d08515863dc4 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 18 Mar 2021 09:21:07 +0100 Subject: [PATCH 2/3] jsonnetfile.lock.json: jb update kube-state-metrics only --- jsonnetfile.lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index fff69108..9130db6b 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -79,8 +79,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "89aaf6c524ee891140c4c8f2a05b1b16f5847309", - "sum": "zD/pbQLnQq+5hegEelaheHS8mn1h09GTktFO74iwlBI=" + "version": "8fb9b23f7376be9014f110b83a83fe930e027726", + "sum": "aE6e4P6NiMf5eQMv0w4hy+oSeLBzwCrjUSkP+DSgrro=" }, { "source": { @@ -89,7 +89,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "72d6d3106861f992b7d6ecc0a88abe9b12ad5427", + "version": "8fb9b23f7376be9014f110b83a83fe930e027726", "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo=" }, { From 09b30e124f2e4791c0564fbbbf8119506a1271f6 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 18 Mar 2021 09:29:53 +0100 Subject: [PATCH 3/3] manifests: Regenerate --- manifests/kube-state-metrics-clusterRole.yaml | 11 +++++++++-- manifests/kube-state-metrics-clusterRoleBinding.yaml | 2 +- manifests/kube-state-metrics-deployment.yaml | 8 +++++--- manifests/kube-state-metrics-prometheusRule.yaml | 2 +- manifests/kube-state-metrics-service.yaml | 2 +- manifests/kube-state-metrics-serviceAccount.yaml | 2 +- manifests/kube-state-metrics-serviceMonitor.yaml | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml index 0de2af47..c1cd228b 100644 --- a/manifests/kube-state-metrics-clusterRole.yaml +++ b/manifests/kube-state-metrics-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics rules: - apiGroups: @@ -32,7 +32,6 @@ rules: - daemonsets - deployments - replicasets - - ingresses verbs: - list - watch @@ -107,6 +106,14 @@ rules: - networking.k8s.io resources: - networkpolicies + - ingresses + verbs: + - list + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases verbs: - list - watch diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml index cd4f9652..4f524dd0 100644 --- a/manifests/kube-state-metrics-clusterRoleBinding.yaml +++ b/manifests/kube-state-metrics-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index d87af742..2438d408 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics namespace: monitoring spec: @@ -21,7 +21,7 @@ spec: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 spec: containers: - args: @@ -29,7 +29,7 @@ spec: - --port=8081 - --telemetry-host=127.0.0.1 - --telemetry-port=8082 - image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v1.9.8 + image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.0 name: kube-state-metrics resources: limits: @@ -38,6 +38,8 @@ spec: requests: cpu: 10m memory: 190Mi + securityContext: + runAsUser: 65534 - args: - --logtostderr - --secure-listen-address=:8443 diff --git a/manifests/kube-state-metrics-prometheusRule.yaml b/manifests/kube-state-metrics-prometheusRule.yaml index 0f887466..4739e168 100644 --- a/manifests/kube-state-metrics-prometheusRule.yaml +++ b/manifests/kube-state-metrics-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 prometheus: k8s role: alert-rules name: kube-state-metrics-rules diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml index 0183585e..6b1537d5 100644 --- a/manifests/kube-state-metrics-service.yaml +++ b/manifests/kube-state-metrics-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics namespace: monitoring spec: diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml index a9887f00..99f34128 100644 --- a/manifests/kube-state-metrics-serviceAccount.yaml +++ b/manifests/kube-state-metrics-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics namespace: monitoring diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml index 804dea6e..6739bfdf 100644 --- a/manifests/kube-state-metrics-serviceMonitor.yaml +++ b/manifests/kube-state-metrics-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: exporter app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 1.9.8 + app.kubernetes.io/version: 2.0.0-rc.0 name: kube-state-metrics namespace: monitoring spec: