From 17b11ae344a0e1148e3e7d3999c20fa0556ca328 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Mon, 29 Mar 2021 14:19:51 +0200 Subject: [PATCH 1/2] jsonnetfile.lock.json: Bump kube-state-metrics to 2.0.0-rc.1 --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 1d55d2ea..7cd8c6cf 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": "2.0.0-rc.0", + "kubeStateMetrics": "2.0.0-rc.1", "nodeExporter": "1.1.1", "prometheus": "2.25.0", "prometheusAdapter": "0.8.3", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 537db026..943152b1 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -79,8 +79,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "6ba0712daefa77e89c18f99f82cb8f2fc9d009ec", - "sum": "aE6e4P6NiMf5eQMv0w4hy+oSeLBzwCrjUSkP+DSgrro=" + "version": "aafecf305bbb5c13fcec0ba3e749d1ffcb0d93e1", + "sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE=" }, { "source": { @@ -89,7 +89,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "6ba0712daefa77e89c18f99f82cb8f2fc9d009ec", + "version": "aafecf305bbb5c13fcec0ba3e749d1ffcb0d93e1", "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo=" }, { From 0df93109d4367dfdd2cc3116905e9dc404463bb1 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Mon, 29 Mar 2021 14:32:08 +0200 Subject: [PATCH 2/2] manifests: Regenerate files --- manifests/kube-state-metrics-clusterRole.yaml | 11 +---------- manifests/kube-state-metrics-clusterRoleBinding.yaml | 2 +- manifests/kube-state-metrics-deployment.yaml | 6 +++--- 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, 9 insertions(+), 18 deletions(-) diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml index c1cd228b..d18a23bf 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 name: kube-state-metrics rules: - apiGroups: @@ -26,15 +26,6 @@ rules: verbs: - list - watch -- apiGroups: - - extensions - resources: - - daemonsets - - deployments - - replicasets - verbs: - - list - - watch - apiGroups: - apps resources: diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml index 4f524dd0..a635e6f0 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 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 2438d408..9f534b16 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 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:v2.0.0-rc.0 + image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.1 name: kube-state-metrics resources: limits: diff --git a/manifests/kube-state-metrics-prometheusRule.yaml b/manifests/kube-state-metrics-prometheusRule.yaml index 4739e168..b2b6f00e 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 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 6b1537d5..bcbff985 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 name: kube-state-metrics namespace: monitoring spec: diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml index 99f34128..413df7e0 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 name: kube-state-metrics namespace: monitoring diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml index 6739bfdf..df301e31 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: 2.0.0-rc.0 + app.kubernetes.io/version: 2.0.0-rc.1 name: kube-state-metrics namespace: monitoring spec: