From 93b8c72bcfe28778eeb95301e62bf6ad32b03a1c Mon Sep 17 00:00:00 2001
From: Arvind Iyengar <arvind.iyengar@rancher.com>
Date: Mon, 7 Jun 2021 23:15:44 -0700
Subject: [PATCH] Update rancher-prometheus-adapter to new base
 50b719af447594abbae7beeb4d6458a19f8e9689

---
 .../generated-changes/patch/Chart.yaml.patch  | 10 ++----
 .../generated-changes/patch/README.md.patch   | 20 -----------
 .../patch/templates/psp.yaml.patch            | 12 -------
 .../patch/templates/serviceaccount.yaml.patch | 11 ------
 .../generated-changes/patch/values.yaml.patch | 36 ++-----------------
 .../rancher-prometheus-adapter/package.yaml   |  4 +--
 6 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 packages/rancher-prometheus-adapter/generated-changes/patch/README.md.patch
 delete mode 100644 packages/rancher-prometheus-adapter/generated-changes/patch/templates/psp.yaml.patch
 delete mode 100644 packages/rancher-prometheus-adapter/generated-changes/patch/templates/serviceaccount.yaml.patch

diff --git a/packages/rancher-prometheus-adapter/generated-changes/patch/Chart.yaml.patch b/packages/rancher-prometheus-adapter/generated-changes/patch/Chart.yaml.patch
index 799f367120..2d97a05e58 100644
--- a/packages/rancher-prometheus-adapter/generated-changes/patch/Chart.yaml.patch
+++ b/packages/rancher-prometheus-adapter/generated-changes/patch/Chart.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -1,7 +1,13 @@
+@@ -1,5 +1,11 @@
 +annotations:
 +  catalog.rancher.io/certified: rancher
 +  catalog.rancher.io/namespace: cattle-monitoring-system
@@ -9,11 +9,7 @@
 +  catalog.cattle.io/os: linux
  apiVersion: v1
 -name: prometheus-adapter
--version: 2.12.1
--appVersion: v0.8.3
 +name: rancher-prometheus-adapter
-+version: 2.14.0
-+appVersion: v0.8.4
+ version: 2.14.0
+ appVersion: v0.8.4
  description: A Helm chart for k8s prometheus adapter
- home: https://github.com/DirectXMan12/k8s-prometheus-adapter
- keywords:
diff --git a/packages/rancher-prometheus-adapter/generated-changes/patch/README.md.patch b/packages/rancher-prometheus-adapter/generated-changes/patch/README.md.patch
deleted file mode 100644
index 8bf33158dc..0000000000
--- a/packages/rancher-prometheus-adapter/generated-changes/patch/README.md.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- charts-original/README.md
-+++ charts/README.md
-@@ -118,7 +118,7 @@
- rules:
-   resource:
-     cpu:
--      containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
-+      containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, container!=""}[3m])) by (<<.GroupBy>>)
-       nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
-       resources:
-         overrides:
-@@ -130,7 +130,7 @@
-             resource: pod
-       containerLabel: container
-     memory:
--      containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
-+      containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>, container!=""}) by (<<.GroupBy>>)
-       nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
-       resources:
-         overrides:
diff --git a/packages/rancher-prometheus-adapter/generated-changes/patch/templates/psp.yaml.patch b/packages/rancher-prometheus-adapter/generated-changes/patch/templates/psp.yaml.patch
deleted file mode 100644
index cb262a8a38..0000000000
--- a/packages/rancher-prometheus-adapter/generated-changes/patch/templates/psp.yaml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- charts-original/templates/psp.yaml
-+++ charts/templates/psp.yaml
-@@ -12,6 +12,9 @@
- spec:
-   {{- if .Values.hostNetwork.enabled }}
-   hostNetwork: true
-+  hostPorts:
-+    - min: {{ .Values.listenPort }}
-+      max: {{ .Values.listenPort }}
-   {{- end }}
-   fsGroup:
-     rule: RunAsAny
diff --git a/packages/rancher-prometheus-adapter/generated-changes/patch/templates/serviceaccount.yaml.patch b/packages/rancher-prometheus-adapter/generated-changes/patch/templates/serviceaccount.yaml.patch
deleted file mode 100644
index 98c1eb804a..0000000000
--- a/packages/rancher-prometheus-adapter/generated-changes/patch/templates/serviceaccount.yaml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- charts-original/templates/serviceaccount.yaml
-+++ charts/templates/serviceaccount.yaml
-@@ -9,4 +9,8 @@
-     heritage: {{ .Release.Service }}
-   name: {{ template "k8s-prometheus-adapter.serviceAccountName" . }}
-   namespace: {{ .Release.Namespace }}
-+{{- if .Values.serviceAccount.annotations }}
-+  annotations:
-+{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
-+{{- end }}
- {{- end -}}
diff --git a/packages/rancher-prometheus-adapter/generated-changes/patch/values.yaml.patch b/packages/rancher-prometheus-adapter/generated-changes/patch/values.yaml.patch
index f6a3bfc662..d28b16a4ef 100644
--- a/packages/rancher-prometheus-adapter/generated-changes/patch/values.yaml.patch
+++ b/packages/rancher-prometheus-adapter/generated-changes/patch/values.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1,9 +1,13 @@
+@@ -1,8 +1,12 @@
  # Default values for k8s-prometheus-adapter..
 +global:
 +  cattle:
@@ -10,39 +10,7 @@
  
  image:
 -  repository: directxman12/k8s-prometheus-adapter-amd64
--  tag: v0.8.3
 +  repository: rancher/mirrored-directxman12-k8s-prometheus-adapter
-+  tag: v0.8.4
+   tag: v0.8.4
    pullPolicy: IfNotPresent
  
- logLevel: 4
-@@ -39,6 +43,11 @@
-   # The name of the service account to use.
-   # If not set and create is true, a name is generated using the fullname template
-   name:
-+  # ServiceAccount annotations.
-+  # Use case: AWS EKS IAM roles for service accounts
-+  # ref: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
-+  annotations: {}
-+
- # Custom DNS configuration to be added to prometheus-adapter pods
- dnsConfig: {}
- # nameservers:
-@@ -81,7 +90,7 @@
- #   metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>)
-   resource: {}
- #   cpu:
--#     containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
-+#     containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, container!=""}[3m])) by (<<.GroupBy>>)
- #     nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
- #     resources:
- #       overrides:
-@@ -93,7 +102,7 @@
- #           resource: pod
- #     containerLabel: container
- #   memory:
--#     containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
-+#     containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>, container!=""}) by (<<.GroupBy>>)
- #     nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
- #     resources:
- #       overrides:
diff --git a/packages/rancher-prometheus-adapter/package.yaml b/packages/rancher-prometheus-adapter/package.yaml
index 49446e6335..a984dc1546 100644
--- a/packages/rancher-prometheus-adapter/package.yaml
+++ b/packages/rancher-prometheus-adapter/package.yaml
@@ -1,4 +1,4 @@
 url: https://github.com/prometheus-community/helm-charts.git
 subdirectory: charts/prometheus-adapter
-commit: 75a88bfdb3cccb9a5b48148c0aee12e94d4128d4
-packageVersion: 0
+commit: 50b719af447594abbae7beeb4d6458a19f8e9689
+packageVersion: 01