Updates README, docs/walkthrough and deploy/

Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>
2026-04-06 09:47:54 +00:00 · 2022-09-08 11:13:57 +01:00 · 2022-09-08 11:13:57 +01:00 · 372dfc9d3a
commit 372dfc9d3a
parent 3afe2c74bc
17 changed files with 114 additions and 97 deletions
--- 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
--- 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"
--- 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:
--- 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:
--- 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:
--- 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:
--- 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,18 +32,11 @@ 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":
-            "instance":
+            "node":
              "resource": "node"
            "namespace":
              "resource": "namespace"
@ -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
--- 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
--- 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:
--- 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:
--- 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:
--- 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
--- a/deploy/manifests/service-monitor.yaml
+++ b/deploy/manifests/service-monitor.yaml
@ -1,26 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.9.1
-  name: prometheus-adapter
-  namespace: monitoring
-spec:
-  endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
-    metricRelabelings:
-    - action: drop
-      regex: (apiserver_client_certificate_.*|apiserver_envelope_.*|apiserver_flowcontrol_.*|apiserver_storage_.*|apiserver_webhooks_.*|workqueue_.*)
-      sourceLabels:
-      - __name__
-    port: https
-    scheme: https
-    tlsConfig:
-      insecureSkipVerify: true
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: metrics-adapter
-      app.kubernetes.io/name: prometheus-adapter
--- 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: