From 44ab592e3ea1bd6f7031ee0935cc6de60a4eab05 Mon Sep 17 00:00:00 2001 From: Oleg Mayko Date: Sat, 8 Feb 2020 17:44:44 +0100 Subject: [PATCH 1/2] Remove prefix from version label --- jsonnet/kube-state-metrics/kube-state-metrics.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet index 7b2b93748e..296657ac7d 100644 --- a/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet @@ -9,7 +9,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; commonLabels:: { 'app.kubernetes.io/name': 'kube-state-metrics', - 'app.kubernetes.io/version': 'v' + ksm.version, + 'app.kubernetes.io/version': ksm.version, }, podLabels:: { From 9caa43f830cfa6596cd5b2f65fc193645b78ce82 Mon Sep 17 00:00:00 2001 From: Oleg Mayko Date: Sat, 8 Feb 2020 17:50:22 +0100 Subject: [PATCH 2/2] Regenerate manifests --- examples/autosharding/cluster-role-binding.yaml | 2 +- examples/autosharding/cluster-role.yaml | 2 +- examples/autosharding/role-binding.yaml | 2 +- examples/autosharding/role.yaml | 2 +- examples/autosharding/service-account.yaml | 2 +- examples/autosharding/service.yaml | 2 +- examples/autosharding/statefulset.yaml | 4 ++-- examples/standard/cluster-role-binding.yaml | 2 +- examples/standard/cluster-role.yaml | 2 +- examples/standard/deployment.yaml | 4 ++-- examples/standard/service-account.yaml | 2 +- examples/standard/service.yaml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/autosharding/cluster-role-binding.yaml b/examples/autosharding/cluster-role-binding.yaml index 0cf78a1011..8f33692e31 100644 --- a/examples/autosharding/cluster-role-binding.yaml +++ b/examples/autosharding/cluster-role-binding.yaml @@ -3,7 +3,7 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/examples/autosharding/cluster-role.yaml b/examples/autosharding/cluster-role.yaml index e35169570e..5edf165fd2 100644 --- a/examples/autosharding/cluster-role.yaml +++ b/examples/autosharding/cluster-role.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics rules: - apiGroups: diff --git a/examples/autosharding/role-binding.yaml b/examples/autosharding/role-binding.yaml index aea862da29..992aabeede 100644 --- a/examples/autosharding/role-binding.yaml +++ b/examples/autosharding/role-binding.yaml @@ -3,7 +3,7 @@ kind: RoleBinding metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/examples/autosharding/role.yaml b/examples/autosharding/role.yaml index e031af2f2b..e304e1f607 100644 --- a/examples/autosharding/role.yaml +++ b/examples/autosharding/role.yaml @@ -3,7 +3,7 @@ kind: Role metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system rules: diff --git a/examples/autosharding/service-account.yaml b/examples/autosharding/service-account.yaml index f793e22d13..29a7746608 100644 --- a/examples/autosharding/service-account.yaml +++ b/examples/autosharding/service-account.yaml @@ -3,6 +3,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system diff --git a/examples/autosharding/service.yaml b/examples/autosharding/service.yaml index 3d75da3bf9..fbd14a44b4 100644 --- a/examples/autosharding/service.yaml +++ b/examples/autosharding/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system spec: diff --git a/examples/autosharding/statefulset.yaml b/examples/autosharding/statefulset.yaml index fe3776ac2e..7a9e5b6d4d 100644 --- a/examples/autosharding/statefulset.yaml +++ b/examples/autosharding/statefulset.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system spec: @@ -16,7 +16,7 @@ spec: metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 spec: containers: - args: diff --git a/examples/standard/cluster-role-binding.yaml b/examples/standard/cluster-role-binding.yaml index 0cf78a1011..8f33692e31 100644 --- a/examples/standard/cluster-role-binding.yaml +++ b/examples/standard/cluster-role-binding.yaml @@ -3,7 +3,7 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/examples/standard/cluster-role.yaml b/examples/standard/cluster-role.yaml index e35169570e..5edf165fd2 100644 --- a/examples/standard/cluster-role.yaml +++ b/examples/standard/cluster-role.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics rules: - apiGroups: diff --git a/examples/standard/deployment.yaml b/examples/standard/deployment.yaml index eaa3ab3ef8..07e36d1ffe 100644 --- a/examples/standard/deployment.yaml +++ b/examples/standard/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system spec: @@ -15,7 +15,7 @@ spec: metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 spec: containers: - image: quay.io/coreos/kube-state-metrics:v1.9.4 diff --git a/examples/standard/service-account.yaml b/examples/standard/service-account.yaml index f793e22d13..29a7746608 100644 --- a/examples/standard/service-account.yaml +++ b/examples/standard/service-account.yaml @@ -3,6 +3,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system diff --git a/examples/standard/service.yaml b/examples/standard/service.yaml index 3d75da3bf9..fbd14a44b4 100644 --- a/examples/standard/service.yaml +++ b/examples/standard/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/version: v1.9.4 + app.kubernetes.io/version: 1.9.4 name: kube-state-metrics namespace: kube-system spec: