Sync chart with bitnami/kubeapps chart (version 14.4.0) (#7484)

### 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 <tanzu-kubeapps-team@vmware.com> Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Co-authored-by: kubeapps-bot <tanzu-kubeapps-team@vmware.com> Co-authored-by: Antonio Gamez Diaz <agamez@vmware.com>
vmware-tanzu · Feb 16, 2024 · 83ab41b · 83ab41b
1 parent 7bf53f3
commit 83ab41b
Show file tree

Hide file tree

Showing 9 changed files with 559 additions and 512 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.12.0
+  version: 18.13.0
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 13.4.4
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.14.1
-digest: sha256:ca023ab4f20b7a77e612af0ce3d62ba092f82f4007706b05ffe27fa432a0c677
-generated: "2024-02-03T00:30:46.579772593Z"
+  version: 2.15.3
+digest: sha256:61a39d7b32265650695e24f219e285e92063f1f074315dd05db99a2f381f0f74
+generated: "2024-02-14T15:18:16.239696889+01:00"
diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
@@ -52,4 +52,4 @@ maintainers:
 name: kubeapps
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
-version: 14.3.4-dev
+version: 14.4.1-dev
diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md
diff --git a/chart/kubeapps/templates/NOTES.txt b/chart/kubeapps/templates/NOTES.txt
@@ -85,3 +85,4 @@ To access Kubeapps from outside your K8s cluster, follow the steps below:
 
 {{- include "kubeapps.checkRollingTags" . }}
 {{- include "kubeapps.validateValues" . }}
+{{- include "common.warnings.resources" (dict "sections" (list "apprepository" "authProxy" "dashboard" "frontend" "kubeappsapis" "ociCatalog" "pinnipedProxy" "postgresql") "context" $) }}
diff --git a/chart/kubeapps/templates/apprepository/deployment.yaml b/chart/kubeapps/templates/apprepository/deployment.yaml
@@ -147,6 +147,8 @@ spec:
           {{- end }}
           {{- if .Values.apprepository.resources }}
           resources: {{- toYaml .Values.apprepository.resources | nindent 12 }}
+          {{- else if ne .Values.apprepository.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.apprepository.resourcesPreset) | nindent 12 }}
           {{- end }}
         {{- if .Values.apprepository.sidecars }}
         {{- include "common.tplvalues.render" (dict "value" .Values.apprepository.sidecars "context" $) | trim | nindent 8 }}

diff --git a/chart/kubeapps/templates/dashboard/deployment.yaml b/chart/kubeapps/templates/dashboard/deployment.yaml
@@ -134,6 +134,8 @@ spec:
           {{- end }}
           {{- if .Values.dashboard.resources }}
           resources: {{- toYaml .Values.dashboard.resources | nindent 12 }}
+          {{- else if ne .Values.dashboard.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.dashboard.resourcesPreset) | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: vhost

diff --git a/chart/kubeapps/templates/frontend/deployment.yaml b/chart/kubeapps/templates/frontend/deployment.yaml
@@ -133,6 +133,8 @@ spec:
           {{- end }}
           {{- if .Values.frontend.resources }}
           resources: {{- toYaml .Values.frontend.resources | nindent 12 }}
+          {{- else if ne .Values.frontend.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.frontend.resourcesPreset) | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: vhost
@@ -220,6 +222,8 @@ spec:
               containerPort: {{ .Values.authProxy.containerPorts.proxy }}
           {{- if .Values.authProxy.resources }}
           resources: {{- toYaml .Values.authProxy.resources | nindent 12 }}
+          {{- else if ne .Values.authProxy.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.authProxy.resourcesPreset) | nindent 12 }}
           {{- end }}
           {{- if .Values.authProxy.extraVolumeMounts }}
           volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.authProxy.extraVolumeMounts "context" $) | nindent 12 }}
@@ -284,6 +288,8 @@ spec:
               containerPort: {{ .Values.pinnipedProxy.containerPorts.pinnipedProxy }}
           {{- if .Values.pinnipedProxy.resources }}
           resources: {{- toYaml .Values.pinnipedProxy.resources | nindent 12 }}
+          {{- else if ne .Values.pinnipedProxy.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.pinnipedProxy.resourcesPreset) | nindent 12 }}
           {{- end }}
           volumeMounts:
             {{- if .Values.pinnipedProxy.tls.existingSecret }}

diff --git a/chart/kubeapps/templates/kubeappsapis/deployment.yaml b/chart/kubeapps/templates/kubeappsapis/deployment.yaml
@@ -209,6 +209,8 @@ spec:
           {{- end }}
           {{- if .Values.kubeappsapis.resources }}
           resources: {{- toYaml .Values.kubeappsapis.resources | nindent 12 }}
+          {{- else if ne .Values.kubeappsapis.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.kubeappsapis.resourcesPreset) | nindent 12 }}
           {{- end }}
           volumeMounts:
           {{- if .Values.clusters }}
@@ -304,6 +306,8 @@ spec:
           {{- end }}
           {{- if .Values.ociCatalog.resources }}
           resources: {{- toYaml .Values.ociCatalog.resources | nindent 12 }}
+          {{- else if ne .Values.ociCatalog.resourcesPreset "none" }}
+          resources: {{- include "common.resources.preset" (dict "type" .Values.ociCatalog.resourcesPreset) | nindent 12 }}
           {{- end }}
           volumeMounts:
           {{- if .Values.ociCatalog.extraVolumeMounts }}

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -18,7 +18,6 @@ global:
   ##
   imagePullSecrets: []
   storageClass: ""
-
 ## @section Common parameters
 
 ## @param kubeVersion Override Kubernetes version
@@ -42,7 +41,6 @@ extraDeploy: []
 ## @param enableIPv6 Enable IPv6 configuration
 ##
 enableIPv6: false
-
 ## Enable diagnostic mode in the deployment
 ##
 diagnosticMode:
@@ -57,7 +55,6 @@ diagnosticMode:
   ##
   args:
     - infinity
-
 ## @section Traffic Exposure Parameters
 
 ## Configure the ingress resource that allows you to access the Kubeapps installation
@@ -101,7 +98,6 @@ ingress:
   ##   - Rely on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
   ##
   tls: false
-
   ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
   ##
   selfSigned: false
@@ -169,7 +165,6 @@ ingress:
   ##             name: http
   ##
   extraRules: []
-
 ## @section Kubeapps packaging options
 ## Note: the helm and flux plugins are mutually exclusive, you can only
 ## enable one or the other since they both operate on Helm release objects.
@@ -189,7 +184,6 @@ packaging:
   ## @param packaging.flux.enabled Enable support for Flux (v2) packaging.
   flux:
     enabled: false
-
 ## @section Frontend parameters
 
 ## Frontend parameters
@@ -255,6 +249,10 @@ frontend:
     type: RollingUpdate
   ## Frontend containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param frontend.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if frontend.resources is set (frontend.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param frontend.resources.limits.cpu The CPU limits for the NGINX container
   ## @param frontend.resources.limits.memory The memory limits for the NGINX container
   ## @param frontend.resources.requests.cpu The requested CPU for the NGINX container
@@ -528,7 +526,6 @@ frontend:
     ##     timeoutSeconds: 300
     ##
     sessionAffinityConfig: {}
-
 ## @section Dashboard parameters
 
 ## Dashboard parameters
@@ -646,6 +643,10 @@ dashboard:
     http: 8080
   ## Dashboard containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param dashboard.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if dashboard.resources is set (dashboard.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param dashboard.resources.limits.cpu The CPU limits for the Dashboard container
   ## @param dashboard.resources.limits.memory The memory limits for the Dashboard container
   ## @param dashboard.resources.requests.cpu The requested CPU for the Dashboard container
@@ -862,7 +863,6 @@ dashboard:
     ## @param dashboard.service.annotations Additional custom annotations for Dashboard service
     ##
     annotations: {}
-
 ## @section AppRepository Controller parameters
 
 ## AppRepository Controller parameters
@@ -1016,6 +1016,10 @@ apprepository:
     type: RollingUpdate
   ## AppRepository Controller containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param apprepository.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if apprepository.resources is set (apprepository.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param apprepository.resources.limits.cpu The CPU limits for the AppRepository Controller container
   ## @param apprepository.resources.limits.memory The memory limits for the AppRepository Controller container
   ## @param apprepository.resources.requests.cpu The requested CPU for the AppRepository Controller container
@@ -1192,7 +1196,6 @@ apprepository:
     name: ""
     automountServiceAccountToken: false
     annotations: {}
-
 ## @section Auth Proxy parameters
 
 ## Auth Proxy configuration for OIDC support
@@ -1333,6 +1336,10 @@ authProxy:
       type: "RuntimeDefault"
   ## OAuth2 Proxy containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param authProxy.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if authProxy.resources is set (authProxy.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param authProxy.resources.limits.cpu The CPU limits for the OAuth2 Proxy container
   ## @param authProxy.resources.limits.memory The memory limits for the OAuth2 Proxy container
   ## @param authProxy.resources.requests.cpu The requested CPU for the OAuth2 Proxy container
@@ -1345,7 +1352,6 @@ authProxy:
     requests:
       cpu: 25m
       memory: 32Mi
-
 ## @section Pinniped Proxy parameters
 
 ## Pinniped Proxy configuration for converting user OIDC tokens to k8s client authorization certs
@@ -1459,6 +1465,12 @@ pinnipedProxy:
       type: "RuntimeDefault"
   ## Pinniped Proxy containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param pinnipedProxy.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if pinnipedProxy.resources is set (pinnipedProxy.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
+  ## Pinniped Proxy containers' resource requests and limits
+  ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
   ## @param pinnipedProxy.resources.limits.cpu The CPU limits for the Pinniped Proxy container
   ## @param pinnipedProxy.resources.limits.memory The memory limits for the Pinniped Proxy container
   ## @param pinnipedProxy.resources.requests.cpu The requested CPU for the Pinniped Proxy container
@@ -1516,14 +1528,12 @@ pinnipedProxy:
 clusters:
   - name: default
     domain: cluster.local
-
 ## RBAC configuration
 ##
 rbac:
   ## @param rbac.create Specifies whether RBAC resources should be created
   ##
   create: true
-
 ## @section Feature flags
 ##
 ## Opt-in features intended for development and advanced use cases.
@@ -1547,7 +1557,6 @@ featureFlags:
     ## @param featureFlags.schemaEditor.enabled Enable a visual editor for customizing the package schemas
     ##
     enabled: false
-
 ## @section Database Parameters
 
 ## PostgreSQL chart configuration
@@ -1581,6 +1590,10 @@ postgresql:
     enabled: false
   ## PostgreSQL containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param postgresql.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if postgresql.resources is set (postgresql.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param postgresql.resources.limits The resources limits for the PostgreSQL container
   ## @param postgresql.resources.requests.cpu The requested CPU for the PostgreSQL container
   ## @param postgresql.resources.requests.memory The requested memory for the PostgreSQL container
@@ -1590,7 +1603,6 @@ postgresql:
     requests:
       memory: 256Mi
       cpu: 250m
-
 ## @section kubeappsapis parameters
 kubeappsapis:
   ## @param kubeappsapis.enabledPlugins Manually override which plugins are enabled for the Kubeapps-APIs service
@@ -1734,6 +1746,10 @@ kubeappsapis:
     http: 50051
   ## KubeappsAPIs containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param kubeappsapis.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if kubeappsapis.resources is set (kubeappsapis.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param kubeappsapis.resources.limits.cpu The CPU limits for the KubeappsAPIs container
   ## @param kubeappsapis.resources.limits.memory The memory limits for the KubeappsAPIs container
   ## @param kubeappsapis.resources.requests.cpu The requested CPU for the KubeappsAPIs container
@@ -1962,7 +1978,6 @@ kubeappsapis:
     name: ""
     automountServiceAccountToken: false
     annotations: {}
-
 ## @section OCI Catalog chart configuration
 ociCatalog:
   ## @param ociCatalog.enabled Enable the OCI catalog gRPC service for cataloging
@@ -2021,6 +2036,10 @@ ociCatalog:
     grpc: 50061
   ## OCI Catalog containers' resource requests and limits
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+  ## @param ociCatalog.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if ociCatalog.resources is set (ociCatalog.resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  ##
+  resourcesPreset: "none"
   ## @param ociCatalog.resources.limits.cpu The CPU limits for the OCI Catalog container
   ## @param ociCatalog.resources.limits.memory The memory limits for the OCI Catalog container
   ## @param ociCatalog.resources.requests.cpu The requested CPU for the OCI Catalog container
@@ -2127,7 +2146,6 @@ ociCatalog:
   ## @param ociCatalog.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the OCI Catalog container(s)
   ##
   extraVolumeMounts: []
-
 ## @section Redis&reg; chart configuration
 ## ref: https://github.com/bitnami/charts/blob/main/bitnami/redis/values.yaml
 ##
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ To access Kubeapps from outside your K8s cluster, follow the steps below:

		{{- include "kubeapps.checkRollingTags" . }}
		{{- include "kubeapps.validateValues" . }}
		{{- include "common.warnings.resources" (dict "sections" (list "apprepository" "authProxy" "dashboard" "frontend" "kubeappsapis" "ociCatalog" "pinnipedProxy" "postgresql") "context" $) }}