mirror of
				https://github.com/prometheus-operator/kube-prometheus.git
				synced 2025-11-04 01:51:01 +01:00 
			
		
		
		
	Merge pull request #1041 from lilic/ksm-2.0.0-rc.0
This commit is contained in:
		
						commit
						ea12911e4f
					
				@ -53,7 +53,7 @@
 | 
				
			|||||||
          "subdir": "jsonnet/kube-state-metrics"
 | 
					          "subdir": "jsonnet/kube-state-metrics"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "version": "release-1.9"
 | 
					      "version": "release-2.0"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      "source": {
 | 
					      "source": {
 | 
				
			||||||
@ -62,7 +62,7 @@
 | 
				
			|||||||
          "subdir": "jsonnet/kube-state-metrics-mixin"
 | 
					          "subdir": "jsonnet/kube-state-metrics-mixin"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "version": "master"
 | 
					      "version": "release-2.0"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      "source": {
 | 
					      "source": {
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
  "alertmanager": "0.21.0",
 | 
					  "alertmanager": "0.21.0",
 | 
				
			||||||
  "blackboxExporter": "0.18.0",
 | 
					  "blackboxExporter": "0.18.0",
 | 
				
			||||||
  "grafana": "7.4.3",
 | 
					  "grafana": "7.4.3",
 | 
				
			||||||
  "kubeStateMetrics": "1.9.8",
 | 
					  "kubeStateMetrics": "2.0.0-rc.0",
 | 
				
			||||||
  "nodeExporter": "1.1.1",
 | 
					  "nodeExporter": "1.1.1",
 | 
				
			||||||
  "prometheus": "2.25.0",
 | 
					  "prometheus": "2.25.0",
 | 
				
			||||||
  "prometheusAdapter": "0.8.3",
 | 
					  "prometheusAdapter": "0.8.3",
 | 
				
			||||||
 | 
				
			|||||||
@ -79,8 +79,8 @@
 | 
				
			|||||||
          "subdir": "jsonnet/kube-state-metrics"
 | 
					          "subdir": "jsonnet/kube-state-metrics"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "version": "89aaf6c524ee891140c4c8f2a05b1b16f5847309",
 | 
					      "version": "8fb9b23f7376be9014f110b83a83fe930e027726",
 | 
				
			||||||
      "sum": "zD/pbQLnQq+5hegEelaheHS8mn1h09GTktFO74iwlBI="
 | 
					      "sum": "aE6e4P6NiMf5eQMv0w4hy+oSeLBzwCrjUSkP+DSgrro="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      "source": {
 | 
					      "source": {
 | 
				
			||||||
@ -89,7 +89,7 @@
 | 
				
			|||||||
          "subdir": "jsonnet/kube-state-metrics-mixin"
 | 
					          "subdir": "jsonnet/kube-state-metrics-mixin"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "version": "72d6d3106861f992b7d6ecc0a88abe9b12ad5427",
 | 
					      "version": "8fb9b23f7376be9014f110b83a83fe930e027726",
 | 
				
			||||||
      "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo="
 | 
					      "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
rules:
 | 
					rules:
 | 
				
			||||||
- apiGroups:
 | 
					- apiGroups:
 | 
				
			||||||
@ -32,7 +32,6 @@ rules:
 | 
				
			|||||||
  - daemonsets
 | 
					  - daemonsets
 | 
				
			||||||
  - deployments
 | 
					  - deployments
 | 
				
			||||||
  - replicasets
 | 
					  - replicasets
 | 
				
			||||||
  - ingresses
 | 
					 | 
				
			||||||
  verbs:
 | 
					  verbs:
 | 
				
			||||||
  - list
 | 
					  - list
 | 
				
			||||||
  - watch
 | 
					  - watch
 | 
				
			||||||
@ -107,6 +106,14 @@ rules:
 | 
				
			|||||||
  - networking.k8s.io
 | 
					  - networking.k8s.io
 | 
				
			||||||
  resources:
 | 
					  resources:
 | 
				
			||||||
  - networkpolicies
 | 
					  - networkpolicies
 | 
				
			||||||
 | 
					  - ingresses
 | 
				
			||||||
 | 
					  verbs:
 | 
				
			||||||
 | 
					  - list
 | 
				
			||||||
 | 
					  - watch
 | 
				
			||||||
 | 
					- apiGroups:
 | 
				
			||||||
 | 
					  - coordination.k8s.io
 | 
				
			||||||
 | 
					  resources:
 | 
				
			||||||
 | 
					  - leases
 | 
				
			||||||
  verbs:
 | 
					  verbs:
 | 
				
			||||||
  - list
 | 
					  - list
 | 
				
			||||||
  - watch
 | 
					  - watch
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
roleRef:
 | 
					roleRef:
 | 
				
			||||||
  apiGroup: rbac.authorization.k8s.io
 | 
					  apiGroup: rbac.authorization.k8s.io
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
  namespace: monitoring
 | 
					  namespace: monitoring
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
@ -21,7 +21,7 @@ spec:
 | 
				
			|||||||
        app.kubernetes.io/component: exporter
 | 
					        app.kubernetes.io/component: exporter
 | 
				
			||||||
        app.kubernetes.io/name: kube-state-metrics
 | 
					        app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
        app.kubernetes.io/part-of: kube-prometheus
 | 
					        app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
        app.kubernetes.io/version: 1.9.8
 | 
					        app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
      - args:
 | 
					      - args:
 | 
				
			||||||
@ -29,7 +29,7 @@ spec:
 | 
				
			|||||||
        - --port=8081
 | 
					        - --port=8081
 | 
				
			||||||
        - --telemetry-host=127.0.0.1
 | 
					        - --telemetry-host=127.0.0.1
 | 
				
			||||||
        - --telemetry-port=8082
 | 
					        - --telemetry-port=8082
 | 
				
			||||||
        image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v1.9.8
 | 
					        image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.0
 | 
				
			||||||
        name: kube-state-metrics
 | 
					        name: kube-state-metrics
 | 
				
			||||||
        resources:
 | 
					        resources:
 | 
				
			||||||
          limits:
 | 
					          limits:
 | 
				
			||||||
@ -38,6 +38,8 @@ spec:
 | 
				
			|||||||
          requests:
 | 
					          requests:
 | 
				
			||||||
            cpu: 10m
 | 
					            cpu: 10m
 | 
				
			||||||
            memory: 190Mi
 | 
					            memory: 190Mi
 | 
				
			||||||
 | 
					        securityContext:
 | 
				
			||||||
 | 
					          runAsUser: 65534
 | 
				
			||||||
      - args:
 | 
					      - args:
 | 
				
			||||||
        - --logtostderr
 | 
					        - --logtostderr
 | 
				
			||||||
        - --secure-listen-address=:8443
 | 
					        - --secure-listen-address=:8443
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
    prometheus: k8s
 | 
					    prometheus: k8s
 | 
				
			||||||
    role: alert-rules
 | 
					    role: alert-rules
 | 
				
			||||||
  name: kube-state-metrics-rules
 | 
					  name: kube-state-metrics-rules
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
  namespace: monitoring
 | 
					  namespace: monitoring
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,6 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
  namespace: monitoring
 | 
					  namespace: monitoring
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@ metadata:
 | 
				
			|||||||
    app.kubernetes.io/component: exporter
 | 
					    app.kubernetes.io/component: exporter
 | 
				
			||||||
    app.kubernetes.io/name: kube-state-metrics
 | 
					    app.kubernetes.io/name: kube-state-metrics
 | 
				
			||||||
    app.kubernetes.io/part-of: kube-prometheus
 | 
					    app.kubernetes.io/part-of: kube-prometheus
 | 
				
			||||||
    app.kubernetes.io/version: 1.9.8
 | 
					    app.kubernetes.io/version: 2.0.0-rc.0
 | 
				
			||||||
  name: kube-state-metrics
 | 
					  name: kube-state-metrics
 | 
				
			||||||
  namespace: monitoring
 | 
					  namespace: monitoring
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user