From d5bddfcc36725440abfb383dcfbf661158727bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20G=C3=A1mez?= <antgamdia@gmail.com>
Date: Thu, 29 Apr 2021 10:42:25 +0200
Subject: [PATCH] [bitnami/kubeapps] bump chart version to 6.1.1 (#6245)

* kubeapps: bump chart version to 6.1.1

* Update chart.lock

* Remove trailing space
---
 bitnami/kubeapps/Chart.lock                        |  8 ++++----
 bitnami/kubeapps/Chart.yaml                        |  2 +-
 bitnami/kubeapps/templates/_helpers.tpl            |  4 ++--
 bitnami/kubeapps/templates/kubeops-deployment.yaml |  6 ++++++
 bitnami/kubeapps/values.yaml                       | 12 +++++++++++-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bitnami/kubeapps/Chart.lock b/bitnami/kubeapps/Chart.lock
index 8ae073271..c2430c7a6 100644
--- a/bitnami/kubeapps/Chart.lock
+++ b/bitnami/kubeapps/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.4.1
+  version: 1.4.3
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.3.13
-digest: sha256:cf07bec4f0cbca067c8aa1327bb0df11924e3cd19b956b21c3e41513a0c2de16
-generated: "2021-03-23T13:14:24.11473167+01:00"
+  version: 10.3.18
+digest: sha256:7e02170e3674d24949c420931e5d008449c185c44d05fe73d72c96a8514c9a67
+generated: "2021-04-27T17:09:59.360429792+02:00"
diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml
index 53643b719..8adbf0e19 100644
--- a/bitnami/kubeapps/Chart.yaml
+++ b/bitnami/kubeapps/Chart.yaml
@@ -25,4 +25,4 @@ maintainers:
 name: kubeapps
 sources:
   - https://github.com/kubeapps/kubeapps
-version: 6.0.1
+version: 6.1.1
diff --git a/bitnami/kubeapps/templates/_helpers.tpl b/bitnami/kubeapps/templates/_helpers.tpl
index e6eefbb32..a89d6728b 100644
--- a/bitnami/kubeapps/templates/_helpers.tpl
+++ b/bitnami/kubeapps/templates/_helpers.tpl
@@ -183,11 +183,11 @@ a defined apiServiceURL.
         {{- fail "At least one cluster must be defined." }}
     {{- end }}
     {{- range .Values.clusters }}
-        {{- if eq (.apiServiceURL | toString) "<nil>" }}
+        {{- if or .isKubeappsCluster ( eq (.apiServiceURL | toString) "<nil>") }}
             {{- if eq $kubeappsCluster "" }}
                 {{- $kubeappsCluster = .name }}
             {{- else }}
-                {{- fail "Only one cluster can be specified without an apiServiceURL to refer to the cluster on which Kubeapps is installed." }}
+                {{- fail "Only one cluster can be configured using either 'isKubeappsCluster: true' or without an apiServiceURL to refer to the cluster on which Kubeapps is installed. Please check the provided 'clusters' configuration." }}
             {{- end }}
         {{- end }}
     {{- end }}
diff --git a/bitnami/kubeapps/templates/kubeops-deployment.yaml b/bitnami/kubeapps/templates/kubeops-deployment.yaml
index a03284b9a..d228ea873 100644
--- a/bitnami/kubeapps/templates/kubeops-deployment.yaml
+++ b/bitnami/kubeapps/templates/kubeops-deployment.yaml
@@ -63,6 +63,12 @@ spec:
             {{- if .Values.kubeops.QPS }}
             - --qps={{ .Values.kubeops.QPS }}
             {{- end }}
+            {{- if .Values.kubeops.namespaceHeaderName }}
+            - --ns-header-name={{ .Values.kubeops.namespaceHeaderName }}
+            {{- end }}
+            {{- if .Values.kubeops.namespaceHeaderPattern }}
+            - --ns-header-pattern={{ .Values.kubeops.namespaceHeaderPattern }}
+            {{- end }}
           {{- if .Values.clusters }}
           volumeMounts:
             - name: kubeops-config
diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml
index 89be88567..9b0ca039c 100644
--- a/bitnami/kubeapps/values.yaml
+++ b/bitnami/kubeapps/values.yaml
@@ -37,6 +37,9 @@ enableIPv6: false
 #   serviceToken: ...
 clusters:
   - name: default
+    # isKubeappsCluster is an optional parameter that allows defining the cluster in which Kubeapps is installed;
+    # this param is useful when every cluster is using an apiServiceURL (e.g., when using the Pinniped Impersonation Proxy) as the chart cannot infer the cluster on which Kubeapps is installed in that case.
+    # isKubeappsCluster: true
 
 ## Force target Kubernetes version (using Helm capabilites if not set)
 ##
@@ -404,6 +407,13 @@ kubeops:
   ## Used when requesting namespaces
   # QPS: 10
   # burst: 15
+  ## Kubeops additional header parameters for trusted namespaces.
+  ## - namespaceHeaderName -  header field name, it can be injected by autorization proxy.
+  ## - namespaceHeaderPattern - regular expression that matches only single item from the header list.
+  ##     The first capturing group must match the namespace.
+  ## example: X-Consumer-Groups: namespace:ns1:read, namespace:ns2:write
+  # namespaceHeaderName: X-Consumer-Groups
+  # namespaceHeaderPattern: namespace:^([\w-]+):\w+$
 
 ## Assetsvc is used to serve assets metadata over a REST API.
 ##
@@ -712,7 +722,7 @@ pinnipedProxy:
   defaultPinnipedNamespace: pinniped-concierge
   defaultAuthenticatorType: JWTAuthenticator
   defaultAuthenticatorName: jwt-authenticator
-  ## The defaultPinnipedAPISuffix flag is not fully supported yet, 
+  ## The defaultPinnipedAPISuffix flag is not fully supported yet,
   ## please use the default value "pinniped.dev"
   defaultPinnipedAPISuffix: pinniped.dev