Sync chart with bitnami/kubeapps chart (version 14.0.1) (#6949)

### Description of the change This is an automatic PR for synchronizing the changes performed externally at the [bitnami/kubeapps official chart](https://github.com/bitnami/charts/tree/main/bitnami/kubeapps) to the Kubeapps development version. ### Benefits The Kubeapps [development chart](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps) will get the newest changes, including image version updates and other updates. ### Possible drawbacks Although unlikely, some changes implemented by the Bitnami team may not be 100% compatible with the current Kubeapps version. ### Applicable issues N/A ### Additional information This PR is marked as a draft until a Kubeapps maintainer manually reviews it. --------- Signed-off-by: kubeapps-bot <[email protected]> Signed-off-by: Michael Nelson <[email protected]> Co-authored-by: kubeapps-bot <[email protected]> Co-authored-by: Michael Nelson <[email protected]>
vmware-tanzu · Oct 16, 2023 · 1785b97 · 1785b97
1 parent 9d192a2
commit 1785b97
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 125 deletions.
diff --git a/chart/kubeapps/Chart.lock b/chart/kubeapps/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 18.0.4
+  version: 18.1.4
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 12.11.2
+  version: 13.1.2
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.11.1
-digest: sha256:2972b09b53769241b290aede8d6f3d8903d9165b418d78cdcb3435f31a5e8316
-generated: "2023-09-20T14:36:05.795428+10:00"
+  version: 2.13.2
+digest: sha256:e818c6668ce8ddfd387635a5351b4b964cef13394de69efd7d1157a097b70e0c
+generated: "2023-10-12T09:15:53.00496388Z"
diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
@@ -6,48 +6,50 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: kubeapps-apis
-      image: docker.io/bitnami/kubeapps-apis:2.8.0-debian-11-r49
+      image: docker.io/bitnami/kubeapps-apis:2.9.0-debian-11-r10
     - name: kubeapps-apprepository-controller
-      image: docker.io/bitnami/kubeapps-apprepository-controller:2.8.0-debian-11-r20
+      image: docker.io/bitnami/kubeapps-apprepository-controller:2.9.0-debian-11-r10
     - name: kubeapps-asset-syncer
-      image: docker.io/bitnami/kubeapps-asset-syncer:2.8.0-debian-11-r20
+      image: docker.io/bitnami/kubeapps-asset-syncer:2.9.0-debian-11-r10
+    - name: kubeapps-oci-catalog
+      image: docker.io/bitnami/kubeapps-oci-catalog:2.9.0-debian-11-r4
     - name: kubeapps-pinniped-proxy
-      image: docker.io/bitnami/kubeapps-pinniped-proxy:2.8.0-debian-11-r49
+      image: docker.io/bitnami/kubeapps-pinniped-proxy:2.9.0-debian-11-r9
     - name: kubeapps-dashboard
-      image: docker.io/bitnami/kubeapps-dashboard:2.8.0-debian-11-r50
+      image: docker.io/bitnami/kubeapps-dashboard:2.9.0-debian-11-r11
     - name: nginx
-      image: docker.io/bitnami/nginx:1.25.2-debian-11-r8
+      image: docker.io/bitnami/nginx:1.25.2-debian-11-r46
     - name: oauth2-proxy
-      image: docker.io/bitnami/oauth2-proxy:7.4.0-debian-11-r281
+      image: docker.io/bitnami/oauth2-proxy:7.5.1-debian-11-r10
 apiVersion: v2
 appVersion: DEVEL
 dependencies:
-  - condition: packaging.flux.enabled
-    name: redis
-    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 18.x.x
-  - condition: packaging.helm.enabled
-    name: postgresql
-    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 12.x.x
-  - name: common
-    repository: oci://registry-1.docker.io/bitnamicharts
-    tags:
-      - bitnami-common
-    version: 2.x.x
+- condition: packaging.flux.enabled
+  name: redis
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 18.x.x
+- condition: packaging.helm.enabled
+  name: postgresql
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 13.x.x
+- name: common
+  repository: oci://registry-1.docker.io/bitnamicharts
+  tags:
+  - bitnami-common
+  version: 2.x.x
 description: Kubeapps is a web-based UI for launching and managing applications on Kubernetes. It allows users to deploy trusted applications and operators to control users access to the cluster.
 home: https://bitnami.com
 icon: https://bitnami.com/assets/stacks/kubeapps/img/kubeapps-stack-220x234.png
 keywords:
-  - helm
-  - dashboard
-  - service catalog
-  - deployment
+- helm
+- dashboard
+- service catalog
+- deployment
 kubeVersion: '>=1.21.0-0'
 maintainers:
-  - name: VMware, Inc.
-    url: https://github.com/bitnami/charts
+- name: VMware, Inc.
+  url: https://github.com/bitnami/charts
 name: kubeapps
 sources:
-  - https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
-version: 13.1.1
+- https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
+version: 14.0.2-dev
diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md
diff --git a/chart/kubeapps/templates/_helpers.tpl b/chart/kubeapps/templates/_helpers.tpl
@@ -117,6 +117,13 @@ Create name for the apprepository-controller based on the fullname
 {{- printf "%s-internal-apprepository-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create name for the apprepository-controller based on the namespace
+*/}}
+{{- define "kubeapps.apprepository.fullname.namespace" -}}
+{{- printf "%s-internal-apprepository-controller" (include "common.names.fullname.namespace" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create name for the dashboard based on the fullname
 */}}

diff --git a/chart/kubeapps/templates/apprepository/rbac.yaml b/chart/kubeapps/templates/apprepository/rbac.yaml
@@ -47,7 +47,7 @@ rules:
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ template "kubeapps.apprepository.fullname" . }}
+  name: {{ template "kubeapps.apprepository.fullname.namespace" . }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: apprepository
   {{- if .Values.commonAnnotations }}
@@ -90,7 +90,7 @@ subjects:
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
-  name: {{ template "kubeapps.apprepository.fullname" . }}
+  name: {{ template "kubeapps.apprepository.fullname.namespace" . }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: apprepository
   {{- if .Values.commonAnnotations }}
@@ -99,7 +99,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "kubeapps.apprepository.fullname" . }}
+  name: {{ template "kubeapps.apprepository.fullname.namespace" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "kubeapps.apprepository.serviceAccountName" . }}

diff --git a/chart/kubeapps/templates/kubeappsapis/deployment.yaml b/chart/kubeapps/templates/kubeappsapis/deployment.yaml
@@ -262,6 +262,7 @@ spec:
             {{- if .Values.ociCatalog.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.ociCatalog.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
+          {{- if or .Values.ociCatalog.extraEnvVarsCM .Values.ociCatalog.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.ociCatalog.extraEnvVarsCM }}
             - configMapRef:
@@ -271,6 +272,7 @@ spec:
             - secretRef:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.ociCatalog.extraEnvVarsSecret "context" $) }}
             {{- end }}
+          {{- end }}
           ports:
             - name: grpc
               containerPort: {{ .Values.ociCatalog.containerPorts.grpc }}

diff --git a/chart/kubeapps/templates/kubeappsapis/service.yaml b/chart/kubeapps/templates/kubeappsapis/service.yaml
@@ -21,7 +21,7 @@ spec:
       targetPort: grpc-http
       protocol: TCP
       name: grpc-http
-  {{- $podLabels := merge .Values.kubeappsapis.podLabels .Values.commonLabels }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.kubeappsapis.podLabels .Values.commonLabels ) "context" . ) }}
     {{- if .Values.ociCatalog.enabled }}
     - port: {{ .Values.ociCatalog.containerPorts.grpc }}
       targetPort: grpc

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -208,7 +208,7 @@ frontend:
   image:
     registry: docker.io
     repository: bitnami/nginx
-    tag: 1.25.2-debian-11-r8
+    tag: 1.25.2-debian-11-r46
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -1145,7 +1145,7 @@ authProxy:
   image:
     registry: docker.io
     repository: bitnami/oauth2-proxy
-    tag: 7.4.0-debian-11-r281
+    tag: 7.5.1-debian-11-r10
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -1855,7 +1855,7 @@ ociCatalog:
   ## @param ociCatalog.image.tag OCI Catalog image tag (immutable tags are recommended)
   ## @param ociCatalog.image.digest OCI Catalog image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag
   ## @param ociCatalog.image.pullPolicy OCI Catalog image pull policy
-  ## @param ociCatalog.image.pullSecrets Dashboard image pull secrets
+  ## @param ociCatalog.image.pullSecrets OCI Catalog image pull secrets
   ## @param ociCatalog.image.debug Enable image debug mode
   ##
   image: