From 28d661a5fc6decbe4331eee108bbf39b6694a76e Mon Sep 17 00:00:00 2001
From: Kemal Akkoyun <kakkoyun@gmail.com>
Date: Fri, 20 Nov 2020 17:10:42 +0100
Subject: [PATCH] Fix formatting
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
---
.../alertmanager/alertmanager.libsonnet | 76 +++++++++----------
.../kube-prometheus-config-mixins.libsonnet | 4 +-
.../kube-prometheus-custom-metrics.libsonnet | 2 -
.../kube-prometheus-kubeadm.libsonnet | 4 +-
.../kube-state-metrics.libsonnet | 60 +++++++--------
jsonnet/kube-prometheus/lib/image.libsonnet | 8 +-
6 files changed, 75 insertions(+), 79 deletions(-)
diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
index 677c7889..6c9acdae 100644
--- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
@@ -98,52 +98,50 @@
},
},
- serviceMonitor:
- {
- apiVersion: 'monitoring.coreos.com/v1',
- kind: 'ServiceMonitor',
- metadata: {
- name: 'alertmanager',
- namespace: $._config.namespace,
- labels: {
- 'k8s-app': 'alertmanager',
- },
+ serviceMonitor: {
+ apiVersion: 'monitoring.coreos.com/v1',
+ kind: 'ServiceMonitor',
+ metadata: {
+ name: 'alertmanager',
+ namespace: $._config.namespace,
+ labels: {
+ 'k8s-app': 'alertmanager',
},
- spec: {
- selector: {
- matchLabels: {
- alertmanager: $._config.alertmanager.name,
- },
+ },
+ spec: {
+ selector: {
+ matchLabels: {
+ alertmanager: $._config.alertmanager.name,
},
- endpoints: [
- { port: 'web', interval: '30s' },
- ],
},
+ endpoints: [
+ { port: 'web', interval: '30s' },
+ ],
},
+ },
- alertmanager:
- {
- apiVersion: 'monitoring.coreos.com/v1',
- kind: 'Alertmanager',
- metadata: {
- name: $._config.alertmanager.name,
- namespace: $._config.namespace,
- labels: {
- alertmanager: $._config.alertmanager.name,
- },
+ alertmanager: {
+ apiVersion: 'monitoring.coreos.com/v1',
+ kind: 'Alertmanager',
+ metadata: {
+ name: $._config.alertmanager.name,
+ namespace: $._config.namespace,
+ labels: {
+ alertmanager: $._config.alertmanager.name,
},
- spec: {
- replicas: $._config.alertmanager.replicas,
- version: $._config.versions.alertmanager,
- image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
- nodeSelector: { 'kubernetes.io/os': 'linux' },
- serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
- securityContext: {
- runAsUser: 1000,
- runAsNonRoot: true,
- fsGroup: 2000,
- },
+ },
+ spec: {
+ replicas: $._config.alertmanager.replicas,
+ version: $._config.versions.alertmanager,
+ image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
+ nodeSelector: { 'kubernetes.io/os': 'linux' },
+ serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
+ securityContext: {
+ runAsUser: 1000,
+ runAsNonRoot: true,
+ fsGroup: 2000,
},
},
+ },
},
}
diff --git a/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
index ad278407..ff8fd297 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
@@ -9,9 +9,9 @@ local withImageRepository(repository) = {
if repository == null then image else repository + '/' + l.imageName(image),
_config+:: {
imageRepos:: {
- [field]: substituteRepository(oldRepos[field], repository),
+ [field]: substituteRepository(oldRepos[field], repository)
for field in std.objectFields(oldRepos)
- }
+ },
},
};
diff --git a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
index b0240ec3..d98b133f 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
@@ -133,7 +133,6 @@
metadata: {
name: 'custom-metrics-server-resources',
},
-
roleRef: {
apiGroup: 'rbac.authorization.k8s.io',
kind: 'ClusterRole',
@@ -151,7 +150,6 @@
metadata: {
name: 'hpa-controller-custom-metrics',
},
-
roleRef: {
apiGroup: 'rbac.authorization.k8s.io',
kind: 'ClusterRole',
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
index ad35df2e..543e0cea 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
@@ -19,14 +19,14 @@ local service(name, namespace, labels, selector, ports) = {
'kube-controller-manager-prometheus-discovery',
'kube-system',
{ 'k8s-app': 'kube-controller-manager' },
- { 'component': 'kube-controller-manager' },
+ { component: 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
),
kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery',
'kube-system',
{ 'k8s-app': 'kube-scheduler' },
- { 'component': 'kube-scheduler' },
+ { component: 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
},
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index 7fae2be2..f3a0e0d9 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -15,7 +15,7 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
},
},
kubeStateMetrics+::
- ksm + {
+ ksm {
local version = self.version,
name:: 'kube-state-metrics',
namespace:: $._config.namespace,
@@ -100,33 +100,33 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
],
},
},
- } +
- (kubeRbacProxyContainer {
- config+:: {
- kubeRbacProxy: {
- local cfg = self,
- image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
- name: 'kube-rbac-proxy-main',
- securePortName: 'https-main',
- securePort: 8443,
- secureListenAddress: ':%d' % self.securePort,
- upstream: 'http://127.0.0.1:8081/',
- tlsCipherSuites: $._config.tlsCipherSuites,
- },
- },
- }).deploymentMixin +
- (kubeRbacProxyContainer {
- config+:: {
- kubeRbacProxy: {
- local cfg = self,
- image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
- name: 'kube-rbac-proxy-self',
- securePortName: 'https-self',
- securePort: 9443,
- secureListenAddress: ':%d' % self.securePort,
- upstream: 'http://127.0.0.1:8082/',
- tlsCipherSuites: $._config.tlsCipherSuites,
- },
- },
- }).deploymentMixin,
+ } +
+ (kubeRbacProxyContainer {
+ config+:: {
+ kubeRbacProxy: {
+ local cfg = self,
+ image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
+ name: 'kube-rbac-proxy-main',
+ securePortName: 'https-main',
+ securePort: 8443,
+ secureListenAddress: ':%d' % self.securePort,
+ upstream: 'http://127.0.0.1:8081/',
+ tlsCipherSuites: $._config.tlsCipherSuites,
+ },
+ },
+ }).deploymentMixin +
+ (kubeRbacProxyContainer {
+ config+:: {
+ kubeRbacProxy: {
+ local cfg = self,
+ image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
+ name: 'kube-rbac-proxy-self',
+ securePortName: 'https-self',
+ securePort: 9443,
+ secureListenAddress: ':%d' % self.securePort,
+ upstream: 'http://127.0.0.1:8082/',
+ tlsCipherSuites: $._config.tlsCipherSuites,
+ },
+ },
+ }).deploymentMixin,
}
diff --git a/jsonnet/kube-prometheus/lib/image.libsonnet b/jsonnet/kube-prometheus/lib/image.libsonnet
index 0561e33c..723d1b38 100644
--- a/jsonnet/kube-prometheus/lib/image.libsonnet
+++ b/jsonnet/kube-prometheus/lib/image.libsonnet
@@ -5,16 +5,16 @@ local imageName(image) =
local parts = std.split(image, '/');
local len = std.length(parts);
if len == 3 then
- # registry.com/org/image
+ // registry.com/org/image
parts[2]
else if len == 2 then
- # org/image
+ // org/image
parts[1]
else if len == 1 then
- # image, ie. busybox
+ // image, ie. busybox
parts[0]
else
- error 'unknown image format: ' + image;
+ error 'unknown image format: ' + image;
{
imageName:: imageName,
--
GitLab