Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • github-mirror/prometheus-operator/kube-prometheus
1 result
Show changes
Showing
with 31 additions and 31 deletions
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.8.2 app.kubernetes.io/version: 1.9.0
name: node-exporter name: node-exporter
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,6 +6,6 @@ metadata: ...@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: exporter app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.8.2 app.kubernetes.io/version: 1.9.0
name: node-exporter name: node-exporter
namespace: monitoring namespace: monitoring
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 1.8.2 app.kubernetes.io/version: 1.9.0
name: node-exporter name: node-exporter
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
rules: rules:
- apiGroups: - apiGroups:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: k8s name: k8s
namespace: monitoring namespace: monitoring
spec: spec:
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
port: web port: web
enableFeatures: [] enableFeatures: []
externalLabels: {} externalLabels: {}
image: quay.io/prometheus/prometheus:v3.1.0 image: quay.io/prometheus/prometheus:v3.2.0
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
podMetadata: podMetadata:
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
podMonitorNamespaceSelector: {} podMonitorNamespaceSelector: {}
podMonitorSelector: {} podMonitorSelector: {}
probeNamespaceSelector: {} probeNamespaceSelector: {}
...@@ -47,4 +47,4 @@ spec: ...@@ -47,4 +47,4 @@ spec:
serviceAccountName: prometheus-k8s serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {} serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {} serviceMonitorSelector: {}
version: 3.1.0 version: 3.2.0
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
prometheus: k8s prometheus: k8s
role: alert-rules role: alert-rules
name: prometheus-k8s-prometheus-rules name: prometheus-k8s-prometheus-rules
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s-config name: prometheus-k8s-config
namespace: monitoring namespace: monitoring
roleRef: roleRef:
......
...@@ -8,7 +8,7 @@ items: ...@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: default namespace: default
roleRef: roleRef:
...@@ -27,7 +27,7 @@ items: ...@@ -27,7 +27,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: kube-system namespace: kube-system
roleRef: roleRef:
...@@ -46,7 +46,7 @@ items: ...@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
roleRef: roleRef:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s-config name: prometheus-k8s-config
namespace: monitoring namespace: monitoring
rules: rules:
......
...@@ -8,7 +8,7 @@ items: ...@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: default namespace: default
rules: rules:
...@@ -46,7 +46,7 @@ items: ...@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: kube-system namespace: kube-system
rules: rules:
...@@ -84,7 +84,7 @@ items: ...@@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
rules: rules:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -7,6 +7,6 @@ metadata: ...@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.1.0 app.kubernetes.io/version: 3.2.0
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
rules: rules:
- apiGroups: - apiGroups:
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
...@@ -23,19 +23,19 @@ spec: ...@@ -23,19 +23,19 @@ spec:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
spec: spec:
automountServiceAccountToken: true automountServiceAccountToken: true
containers: containers:
- args: - args:
- --kubelet-service=kube-system/kubelet - --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.0 - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1
- --kubelet-endpoints=true - --kubelet-endpoints=true
- --kubelet-endpointslice=false - --kubelet-endpointslice=false
env: env:
- name: GOGC - name: GOGC
value: "30" value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.80.0 image: quay.io/prometheus-operator/prometheus-operator:v0.80.1
name: prometheus-operator name: prometheus-operator
ports: ports:
- containerPort: 8080 - containerPort: 8080
...@@ -57,7 +57,7 @@ spec: ...@@ -57,7 +57,7 @@ spec:
- --secure-listen-address=:8443 - --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/ - --upstream=http://127.0.0.1:8080/
image: quay.io/brancz/kube-rbac-proxy:v0.18.2 image: quay.io/brancz/kube-rbac-proxy:v0.19.0
name: kube-rbac-proxy name: kube-rbac-proxy
ports: ports:
- containerPort: 8443 - containerPort: 8443
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
......