From ccc69c8e2a9babfdd9782eea9638cfdcb181bea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ibone=20Gonz=C3=A1lez=20Mauraza?= <gibone@bitnami.com>
Date: Fri, 10 Apr 2020 11:12:04 +0200
Subject: [PATCH] [bitnami/apache] Change in the command of apache-exporter 
 (#2280)

* Change -scrape_uri to --scrape_uri

* [bitnami/apache] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
---
 bitnami/apache/Chart.yaml                | 2 +-
 bitnami/apache/templates/deployment.yaml | 2 +-
 bitnami/apache/values.yaml               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml
index 42344f138..d5f73a37d 100644
--- a/bitnami/apache/Chart.yaml
+++ b/bitnami/apache/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: apache
-version: 7.3.12
+version: 7.3.13
 appVersion: 2.4.43
 description: Chart for Apache HTTP Server
 keywords:
diff --git a/bitnami/apache/templates/deployment.yaml b/bitnami/apache/templates/deployment.yaml
index ba9e03499..b91668d28 100644
--- a/bitnami/apache/templates/deployment.yaml
+++ b/bitnami/apache/templates/deployment.yaml
@@ -119,7 +119,7 @@ spec:
         - name: metrics
           image: {{ template "apache.metrics.image" . }}
           imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
-          command: ['/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:8080/server-status/?auto']
+          command: ['/bin/apache_exporter', '--scrape_uri', 'http://status.localhost:8080/server-status/?auto']
           ports:
             - name: metrics
               containerPort: 9117
diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml
index f47717ec7..13745e932 100644
--- a/bitnami/apache/values.yaml
+++ b/bitnami/apache/values.yaml
@@ -13,7 +13,7 @@
 image:
   registry: docker.io
   repository: bitnami/apache
-  tag: 2.4.43-debian-10-r6
+  tag: 2.4.43-debian-10-r10
   ## Specify a imagePullPolicy
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
@@ -36,7 +36,7 @@ image:
 git:
   registry: docker.io
   repository: bitnami/git
-  tag: 2.26.0-debian-10-r14
+  tag: 2.26.0-debian-10-r18
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
@@ -200,7 +200,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/apache-exporter
-    tag: 0.8.0-debian-10-r0
+    tag: 0.8.0-debian-10-r4
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.