Skip to content

Commit

Permalink
Sync chart with bitnami/kubeapps chart (version 14.3.1) (#7384)
Browse files Browse the repository at this point in the history
### 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: Antonio Gamez Diaz <[email protected]>
Co-authored-by: kubeapps-bot <[email protected]>
Co-authored-by: Antonio Gamez Diaz <[email protected]>
  • Loading branch information
3 people authored Feb 2, 2024
1 parent 005a752 commit db51aaf
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 39 deletions.
2 changes: 2 additions & 0 deletions chart/kubeapps/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
.project
.idea/
*.tmproj
# img folder
img/
8 changes: 4 additions & 4 deletions chart/kubeapps/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 18.6.1
version: 18.7.0
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.2.27
version: 13.3.0
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.14.1
digest: sha256:59efa1225e885e89047c2ffa575734c318ef80c6402a6828c2810e2e9b5e4f89
generated: "2023-12-31T18:23:50.02824993Z"
digest: sha256:bd738736884db34fb4b37b16c5ff366f98e819524a7c9a1d40c2349b41879042
generated: "2024-01-17T19:59:33.473442596Z"
12 changes: 6 additions & 6 deletions chart/kubeapps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ annotations:
licenses: Apache-2.0
images: |
- name: kubeapps-apis
image: docker.io/bitnami/kubeapps-apis:2.9.0-debian-11-r14
image: docker.io/bitnami/kubeapps-apis:2.9.0-debian-11-r16
- name: kubeapps-apprepository-controller
image: docker.io/bitnami/kubeapps-apprepository-controller:2.9.0-debian-11-r13
image: docker.io/bitnami/kubeapps-apprepository-controller:2.9.0-debian-11-r15
- name: kubeapps-asset-syncer
image: docker.io/bitnami/kubeapps-asset-syncer:2.9.0-debian-11-r14
image: docker.io/bitnami/kubeapps-asset-syncer:2.9.0-debian-11-r16
- name: kubeapps-oci-catalog
image: docker.io/bitnami/kubeapps-oci-catalog:2.9.0-debian-11-r8
- name: kubeapps-pinniped-proxy
image: docker.io/bitnami/kubeapps-pinniped-proxy:2.9.0-debian-11-r12
- name: kubeapps-dashboard
image: docker.io/bitnami/kubeapps-dashboard:2.9.0-debian-11-r19
- name: nginx
image: docker.io/bitnami/nginx:1.25.3-debian-11-r3
image: docker.io/bitnami/nginx:1.25.3-debian-11-r4
- name: oauth2-proxy
image: docker.io/bitnami/oauth2-proxy:7.5.1-debian-11-r12
image: docker.io/bitnami/oauth2-proxy:7.5.1-debian-11-r14
apiVersion: v2
appVersion: DEVEL
dependencies:
Expand Down Expand Up @@ -52,4 +52,4 @@ maintainers:
name: kubeapps
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
version: 14.1.4-dev
version: 14.3.2-dev
33 changes: 28 additions & 5 deletions chart/kubeapps/README.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions chart/kubeapps/templates/apprepository/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
spec:
{{- include "kubeapps.imagePullSecrets" . | indent 6 }}
serviceAccountName: {{ template "kubeapps.apprepository.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.apprepository.automountServiceAccountToken }}
{{- if .Values.apprepository.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.apprepository.hostAliases "context" $) | nindent 8 }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions chart/kubeapps/templates/dashboard/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
app.kubernetes.io/component: dashboard
spec:
{{- include "kubeapps.imagePullSecrets" . | indent 6 }}
automountServiceAccountToken: {{ .Values.dashboard.automountServiceAccountToken }}
{{- if .Values.dashboard.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.hostAliases "context" $) | nindent 8 }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions chart/kubeapps/templates/frontend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
app.kubernetes.io/component: frontend
spec:
{{- include "kubeapps.imagePullSecrets" . | indent 6 }}
automountServiceAccountToken: {{ .Values.frontend.automountServiceAccountToken }}
{{- if .Values.frontend.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.hostAliases "context" $) | nindent 8 }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions chart/kubeapps/templates/kubeappsapis/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ spec:
spec:
{{- include "kubeapps.imagePullSecrets" . | indent 6 }}
serviceAccountName: {{ template "kubeapps.kubeappsapis.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.kubeappsapis.automountServiceAccountToken }}
{{- if .Values.kubeappsapis.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.hostAliases "context" $) | nindent 8 }}
{{- end }}
Expand Down
98 changes: 74 additions & 24 deletions chart/kubeapps/values.yaml

Large diffs are not rendered by default.

0 comments on commit db51aaf

Please sign in to comment.