mirror of
https://github.com/prometheus-operator/kube-prometheus.git
synced 2025-09-02 20:31:38 +02:00
Fix formatting
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
This commit is contained in:
parent
7f50004133
commit
28d661a5fc
@ -98,52 +98,50 @@
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
serviceMonitor:
|
serviceMonitor: {
|
||||||
{
|
apiVersion: 'monitoring.coreos.com/v1',
|
||||||
apiVersion: 'monitoring.coreos.com/v1',
|
kind: 'ServiceMonitor',
|
||||||
kind: 'ServiceMonitor',
|
metadata: {
|
||||||
metadata: {
|
name: 'alertmanager',
|
||||||
name: 'alertmanager',
|
namespace: $._config.namespace,
|
||||||
namespace: $._config.namespace,
|
labels: {
|
||||||
labels: {
|
'k8s-app': 'alertmanager',
|
||||||
'k8s-app': 'alertmanager',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
spec: {
|
|
||||||
selector: {
|
|
||||||
matchLabels: {
|
|
||||||
alertmanager: $._config.alertmanager.name,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
endpoints: [
|
|
||||||
{ port: 'web', interval: '30s' },
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
spec: {
|
||||||
alertmanager:
|
selector: {
|
||||||
{
|
matchLabels: {
|
||||||
apiVersion: 'monitoring.coreos.com/v1',
|
|
||||||
kind: 'Alertmanager',
|
|
||||||
metadata: {
|
|
||||||
name: $._config.alertmanager.name,
|
|
||||||
namespace: $._config.namespace,
|
|
||||||
labels: {
|
|
||||||
alertmanager: $._config.alertmanager.name,
|
alertmanager: $._config.alertmanager.name,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
spec: {
|
endpoints: [
|
||||||
replicas: $._config.alertmanager.replicas,
|
{ port: 'web', interval: '30s' },
|
||||||
version: $._config.versions.alertmanager,
|
],
|
||||||
image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
|
},
|
||||||
nodeSelector: { 'kubernetes.io/os': 'linux' },
|
},
|
||||||
serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
|
|
||||||
securityContext: {
|
alertmanager: {
|
||||||
runAsUser: 1000,
|
apiVersion: 'monitoring.coreos.com/v1',
|
||||||
runAsNonRoot: true,
|
kind: 'Alertmanager',
|
||||||
fsGroup: 2000,
|
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,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,9 @@ local withImageRepository(repository) = {
|
|||||||
if repository == null then image else repository + '/' + l.imageName(image),
|
if repository == null then image else repository + '/' + l.imageName(image),
|
||||||
_config+:: {
|
_config+:: {
|
||||||
imageRepos:: {
|
imageRepos:: {
|
||||||
[field]: substituteRepository(oldRepos[field], repository),
|
[field]: substituteRepository(oldRepos[field], repository)
|
||||||
for field in std.objectFields(oldRepos)
|
for field in std.objectFields(oldRepos)
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -133,7 +133,6 @@
|
|||||||
metadata: {
|
metadata: {
|
||||||
name: 'custom-metrics-server-resources',
|
name: 'custom-metrics-server-resources',
|
||||||
},
|
},
|
||||||
|
|
||||||
roleRef: {
|
roleRef: {
|
||||||
apiGroup: 'rbac.authorization.k8s.io',
|
apiGroup: 'rbac.authorization.k8s.io',
|
||||||
kind: 'ClusterRole',
|
kind: 'ClusterRole',
|
||||||
@ -151,7 +150,6 @@
|
|||||||
metadata: {
|
metadata: {
|
||||||
name: 'hpa-controller-custom-metrics',
|
name: 'hpa-controller-custom-metrics',
|
||||||
},
|
},
|
||||||
|
|
||||||
roleRef: {
|
roleRef: {
|
||||||
apiGroup: 'rbac.authorization.k8s.io',
|
apiGroup: 'rbac.authorization.k8s.io',
|
||||||
kind: 'ClusterRole',
|
kind: 'ClusterRole',
|
||||||
|
@ -19,14 +19,14 @@ local service(name, namespace, labels, selector, ports) = {
|
|||||||
'kube-controller-manager-prometheus-discovery',
|
'kube-controller-manager-prometheus-discovery',
|
||||||
'kube-system',
|
'kube-system',
|
||||||
{ 'k8s-app': 'kube-controller-manager' },
|
{ 'k8s-app': 'kube-controller-manager' },
|
||||||
{ 'component': 'kube-controller-manager' },
|
{ component: 'kube-controller-manager' },
|
||||||
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
|
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
|
||||||
),
|
),
|
||||||
kubeSchedulerPrometheusDiscoveryService: service(
|
kubeSchedulerPrometheusDiscoveryService: service(
|
||||||
'kube-scheduler-prometheus-discovery',
|
'kube-scheduler-prometheus-discovery',
|
||||||
'kube-system',
|
'kube-system',
|
||||||
{ 'k8s-app': 'kube-scheduler' },
|
{ 'k8s-app': 'kube-scheduler' },
|
||||||
{ 'component': 'kube-scheduler' },
|
{ component: 'kube-scheduler' },
|
||||||
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
|
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
@ -15,7 +15,7 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
kubeStateMetrics+::
|
kubeStateMetrics+::
|
||||||
ksm + {
|
ksm {
|
||||||
local version = self.version,
|
local version = self.version,
|
||||||
name:: 'kube-state-metrics',
|
name:: 'kube-state-metrics',
|
||||||
namespace:: $._config.namespace,
|
namespace:: $._config.namespace,
|
||||||
@ -100,33 +100,33 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
} +
|
} +
|
||||||
(kubeRbacProxyContainer {
|
(kubeRbacProxyContainer {
|
||||||
config+:: {
|
config+:: {
|
||||||
kubeRbacProxy: {
|
kubeRbacProxy: {
|
||||||
local cfg = self,
|
local cfg = self,
|
||||||
image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
|
image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
|
||||||
name: 'kube-rbac-proxy-main',
|
name: 'kube-rbac-proxy-main',
|
||||||
securePortName: 'https-main',
|
securePortName: 'https-main',
|
||||||
securePort: 8443,
|
securePort: 8443,
|
||||||
secureListenAddress: ':%d' % self.securePort,
|
secureListenAddress: ':%d' % self.securePort,
|
||||||
upstream: 'http://127.0.0.1:8081/',
|
upstream: 'http://127.0.0.1:8081/',
|
||||||
tlsCipherSuites: $._config.tlsCipherSuites,
|
tlsCipherSuites: $._config.tlsCipherSuites,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}).deploymentMixin +
|
}).deploymentMixin +
|
||||||
(kubeRbacProxyContainer {
|
(kubeRbacProxyContainer {
|
||||||
config+:: {
|
config+:: {
|
||||||
kubeRbacProxy: {
|
kubeRbacProxy: {
|
||||||
local cfg = self,
|
local cfg = self,
|
||||||
image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
|
image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
|
||||||
name: 'kube-rbac-proxy-self',
|
name: 'kube-rbac-proxy-self',
|
||||||
securePortName: 'https-self',
|
securePortName: 'https-self',
|
||||||
securePort: 9443,
|
securePort: 9443,
|
||||||
secureListenAddress: ':%d' % self.securePort,
|
secureListenAddress: ':%d' % self.securePort,
|
||||||
upstream: 'http://127.0.0.1:8082/',
|
upstream: 'http://127.0.0.1:8082/',
|
||||||
tlsCipherSuites: $._config.tlsCipherSuites,
|
tlsCipherSuites: $._config.tlsCipherSuites,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}).deploymentMixin,
|
}).deploymentMixin,
|
||||||
}
|
}
|
||||||
|
@ -5,16 +5,16 @@ local imageName(image) =
|
|||||||
local parts = std.split(image, '/');
|
local parts = std.split(image, '/');
|
||||||
local len = std.length(parts);
|
local len = std.length(parts);
|
||||||
if len == 3 then
|
if len == 3 then
|
||||||
# registry.com/org/image
|
// registry.com/org/image
|
||||||
parts[2]
|
parts[2]
|
||||||
else if len == 2 then
|
else if len == 2 then
|
||||||
# org/image
|
// org/image
|
||||||
parts[1]
|
parts[1]
|
||||||
else if len == 1 then
|
else if len == 1 then
|
||||||
# image, ie. busybox
|
// image, ie. busybox
|
||||||
parts[0]
|
parts[0]
|
||||||
else
|
else
|
||||||
error 'unknown image format: ' + image;
|
error 'unknown image format: ' + image;
|
||||||
|
|
||||||
{
|
{
|
||||||
imageName:: imageName,
|
imageName:: imageName,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user