Merge pull request #1331 from christianhuth/christianhuth-patch-1

[popeye] Fix Pushgateway flags

charts/popeye/CHANGELOG.md

@@ -1,7 +1,7 @@
 # popeye
 
-## 2.2.1
+## 2.2.2
 
-### Changed
+### Fixed
 
-- App version to 0.22.1
+- wrong flags for Pushgateway

charts/popeye/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: popeye
 description: Popeye - A Kubernetes Cluster Sanitizer
 type: application
-version: 2.2.1
+version: 2.2.2
 appVersion: "v0.22.1"
 home: https://github.com/christianhuth/helm-charts
 icon: https://raw.githubusercontent.com/derailed/popeye/master/assets/popeye_logo.png
@@ -14,8 +14,8 @@ sources:
 annotations:
   artifacthub.io/category: security
   artifacthub.io/changes: |
-    - kind: changed
-      description: App version to 0.22.1
+    - kind: fixed
+      description: wrong flags for Pushgateway
   artifacthub.io/screenshots: |
     - title: Popeye is a utility that scans live Kubernetes cluster and reports potential issues with deployed resources and configurations.
       url: https://popeyecli.io/assets/d_score.png

charts/popeye/templates/cronjob.yaml

@@ -43,10 +43,10 @@ spec:
                 - --force-exit-zero=true
                 - --out={{ .Values.cronJob.outputFormat }}
                 {{- if and (eq .Values.cronJob.outputFormat "prometheus") (.Values.cronJob.prometheus.pushgatewayAddress) }}
-                - --pushgateway-address={{ .Values.cronJob.prometheus.pushgatewayAddress }}
+                - --push-gtwy-url={{ .Values.cronJob.prometheus.pushgatewayAddress }}
                 {{- if .Values.cronJob.prometheus.basicAuth.enabled }}
-                - --pushgateway-basic-auth-user={{ .Values.cronJob.prometheus.basicAuth.user }}
-                - --pushgateway-basic-auth-pass=$PUSHGATEWAY_BASIC_AUTH_PASSWORD
+                - --push-gtwy-user={{ .Values.cronJob.prometheus.basicAuth.user }}
+                - --push-gtwy-password=$PUSHGATEWAY_BASIC_AUTH_PASSWORD
                 {{- end }}
                 {{- end }}
                 {{- if .Values.cronJob.s3.bucket }}