Merge pull request #2307 from geethub97/pushprox-bug

Fixed parsing error in pushprox caused by PSP updates.

charts/rancher-monitoring/101.1.0+up40.1.2/charts/hardenedKubelet/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/hardenedKubelet/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/hardenedNodeExporter/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/hardenedNodeExporter/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/k3sServer/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/k3sServer/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmControllerManager/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmControllerManager/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmEtcd/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmEtcd/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmProxy/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmProxy/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmScheduler/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/kubeAdmScheduler/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2ControllerManager/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2ControllerManager/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Etcd/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Etcd/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2IngressNginx/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2IngressNginx/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Proxy/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Proxy/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Scheduler/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rke2Scheduler/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeControllerManager/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeControllerManager/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeEtcd/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeEtcd/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeIngressNginx/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeIngressNginx/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeProxy/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeProxy/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeScheduler/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

charts/rancher-monitoring/101.1.0+up40.1.2/charts/rkeScheduler/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

index.yaml

@@ -8369,7 +8369,7 @@ entries:
       catalog.cattle.io/upstream-version: 19.0.3
     apiVersion: v2
     appVersion: 0.59.1
-    created: "2022-12-22T16:39:32.939289-08:00"
+    created: "2023-01-03T10:56:12.63741-08:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -8440,7 +8440,7 @@ entries:
     description: Collects several related Helm charts, Grafana dashboards, and Prometheus
       rules combined with documentation and scripts to provide easy to operate end-to-end
       Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
-    digest: 3facabbdf300c677ff31dead7fbe573dbe8eba2b98f69070ea18bdbd048c4bbe
+    digest: 1eb971b791af1e2b3241902465023e30ce39f47cedf42403b5fdc1a9f6017630
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
     keywords:

packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-clients-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-{{- end }}
   - {{ template "pushProxy.client.name" . }}
+{{- end }}
 {{- if and .Values.clients.https.enabled .Values.clients.https.useServiceAccountCredentials }}
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

packages/rancher-monitoring/rancher-pushprox/charts/templates/pushprox-proxy-rbac.yaml

@@ -11,8 +11,8 @@ rules:
   resources: ['podsecuritypolicies']
   verbs:     ['use']
   resourceNames:
-  {{- end }}
   - {{ template "pushProxy.proxy.name" . }}
+  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding