Updates README, docs/walkthrough and deploy/

kubernetes-sigs · Sep 8, 2022 · 9557cd4 · 9557cd4
1 parent 3afe2c7
commit 9557cd4
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Prometheus Adapter for Kubernetes Metrics APIs
 
 This repository contains an implementation of the Kubernetes
-[resource metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/resource-metrics-api.md),
-[custom metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/custom-metrics-api.md), and
-[external metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/external-metrics-api.md) APIs.
+[resource metrics](https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/resource-metrics-api.md),
+[custom metrics](https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/custom-metrics-api.md), and
+[external metrics](https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/external-metrics-api.md) APIs.
 
 This adapter is therefore suitable for use with the autoscaling/v2 Horizontal Pod Autoscaler in Kubernetes 1.6+.  
 It can also replace the [metrics server](https://github.com/kubernetes-incubator/metrics-server) on clusters that already run Prometheus and collect the appropriate metrics.
@@ -51,7 +51,7 @@ will attempt to using [Kubernetes in-cluster
 config](https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod)
 to connect to the cluster.
 
-It takes the following addition arguments specific to configuring how the
+It takes the following additional arguments specific to configuring how the
 adapter talks to Prometheus and the main Kubernetes cluster:
 
 - `--lister-kubeconfig=<path-to-kubeconfig>`: This configures

diff --git a/deploy/README.md b/deploy/README.md
@@ -1,20 +1,11 @@
 Example Deployment
 ==================
 
-1. Make sure you've built the included Dockerfile with `TAG=latest make container`. The image should be tagged as `gcr.io/k8s-staging-prometheus-adapter:latest`.
+1. Make sure you've built the included Dockerfile with `TAG=latest make container`. The image should be tagged as `registry.k8s.io/prometheus-adapter/staging-prometheus-adapter:latest`.
 
-2. Create a secret called `cm-adapter-serving-certs` with two values:
-   `serving.crt` and `serving.key`. These are the serving certificates used
-   by the adapter for serving HTTPS traffic.  For more information on how to
-   generate these certificates, see the [auth concepts
-   documentation](https://github.com/kubernetes-incubator/apiserver-builder/blob/master/docs/concepts/auth.md)
-   in the apiserver-builder repository.
-   The kube-prometheus project published two scripts [gencerts.sh](https://github.com/prometheus-operator/kube-prometheus/blob/62fff622e9900fade8aecbd02bc9c557b736ef85/experimental/custom-metrics-api/gencerts.sh)
-   and [deploy.sh](https://github.com/prometheus-operator/kube-prometheus/blob/62fff622e9900fade8aecbd02bc9c557b736ef85/experimental/custom-metrics-api/deploy.sh) to create the `cm-adapter-serving-certs` secret.
-
-3. `kubectl create namespace custom-metrics` to ensure that the namespace that we're installing
+2. `kubectl create namespace monitoring` to ensure that the namespace that we're installing
    the custom metrics adapter in exists.
 
-4. `kubectl create -f manifests/`, modifying the Deployment as necessary to
+3. `kubectl create -f manifests/`, modifying the Deployment as necessary to
    point to your Prometheus server, and the ConfigMap to contain your desired
    metrics discovery configuration.
diff --git a/deploy/manifests/api-service.yaml b/deploy/manifests/api-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: v1beta1.metrics.k8s.io
 spec:
   group: metrics.k8s.io

diff --git a/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml b/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"

diff --git a/deploy/manifests/cluster-role-binding-delegator.yaml b/deploy/manifests/cluster-role-binding-delegator.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: resource-metrics:system:auth-delegator
   namespace: monitoring
 roleRef:

diff --git a/deploy/manifests/cluster-role-binding.yaml b/deploy/manifests/cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 roleRef:

diff --git a/deploy/manifests/cluster-role-metrics-server-resources.yaml b/deploy/manifests/cluster-role-metrics-server-resources.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: resource-metrics-server-resources
 rules:
 - apiGroups:

diff --git a/deploy/manifests/cluster-role.yaml b/deploy/manifests/cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
 rules:
 - apiGroups:

diff --git a/deploy/manifests/config-map.yaml b/deploy/manifests/config-map.yaml
@@ -12,16 +12,8 @@ data:
           )
         "nodeQuery": |
           sum by (<<.GroupBy>>) (
-            1 - irate(
-              node_cpu_seconds_total{mode="idle"}[4m]
-            )
-            * on(namespace, pod) group_left(node) (
-              node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}
-            )
-          )
-          or sum by (<<.GroupBy>>) (
-            1 - irate(
-              windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[4m]
+            irate(
+                container_cpu_usage_seconds_total{<<.LabelMatchers>>,id='/'}[4m]
             )
           )
         "resources":
@@ -40,14 +32,7 @@ data:
           )
         "nodeQuery": |
           sum by (<<.GroupBy>>) (
-            node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>}
-            -
-            node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}
-          )
-          or sum by (<<.GroupBy>>) (
-            windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>}
-            -
-            windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>}
+            container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}
           )
         "resources":
           "overrides":
@@ -63,6 +48,6 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: adapter-config
   namespace: monitoring
diff --git a/deploy/manifests/deployment.yaml b/deploy/manifests/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 spec:
@@ -22,7 +22,7 @@ spec:
       labels:
         app.kubernetes.io/component: metrics-adapter
         app.kubernetes.io/name: prometheus-adapter
-        app.kubernetes.io/version: 0.9.1
+        app.kubernetes.io/version: 0.10.0
     spec:
       automountServiceAccountToken: true
       containers:
@@ -31,7 +31,7 @@ spec:
         - --config=/etc/adapter/config.yaml
         - --logtostderr=true
         - --metrics-relist-interval=1m
-        - --prometheus-url=https://setup-monit-prometheus.monitoring.svc:9090/
+        - --prometheus-url=https://prometheus.monitoring.svc:9090/
         - --secure-port=6443
         - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
         image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.10.0

diff --git a/deploy/manifests/network-policy.yaml b/deploy/manifests/network-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 spec:

diff --git a/deploy/manifests/pod-disruption-budget.yaml b/deploy/manifests/pod-disruption-budget.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 spec:

diff --git a/deploy/manifests/role-binding-auth-reader.yaml b/deploy/manifests/role-binding-auth-reader.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: resource-metrics-auth-reader
   namespace: kube-system
 roleRef:

diff --git a/deploy/manifests/service-account.yaml b/deploy/manifests/service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
diff --git a/deploy/manifests/service-monitor.yaml b/deploy/manifests/service-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 spec:

diff --git a/deploy/manifests/service.yaml b/deploy/manifests/service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
+    app.kubernetes.io/version: 0.10.0
   name: prometheus-adapter
   namespace: monitoring
 spec: