Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync chart with bitnami/kubeapps chart (version 11.0.0) #5443

Merged
merged 4 commits into from
Oct 8, 2022
Merged

Sync chart with bitnami/kubeapps chart (version 11.0.0) #5443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb7e8f
bump chart version to 11.0.0
kubeapps-bot Oct 7, 2022
a409eec
Revert "bump chart version to 11.0.0"
kubeapps-bot Oct 7, 2022
5ed0d6c
Add dev changes back
antgamdia Oct 7, 2022
2ee580e
Add wrongly deleted change
antgamdia Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions chart/kubeapps/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 17.1.2
version: 17.3.2
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 11.8.1
version: 11.9.7
- name: common
repository: https://charts.bitnami.com/bitnami
version: 2.0.1
digest: sha256:24538586d30c7c446a655691e576732a1547fa9fdab919e1d258655acb0fa3ff
generated: "2022-08-25T05:14:23.93821441Z"
version: 2.0.3
digest: sha256:26a5f52564804f1cb15ff4a4724c6e6a2d4314bda8c215df9db64196abad096c
generated: "2022-10-06T13:35:27.6052444+02:00"
2 changes: 1 addition & 1 deletion chart/kubeapps/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ maintainers:
name: kubeapps
sources:
- https://github.com/vmware-tanzu/kubeapps
version: 10.4.0-dev0
version: 11.0.1-dev0
417 changes: 188 additions & 229 deletions chart/kubeapps/README.md
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions chart/kubeapps/templates/dashboard/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,28 +104,28 @@ spec:
- name: http
containerPort: {{ .Values.dashboard.containerPorts.http }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.dashboard.livenessProbe.enabled }}
{{- if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: http
{{- else if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.readinessProbe.enabled }}
{{- if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: http
{{- else if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.startupProbe.enabled }}
{{- if .Values.dashboard.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.dashboard.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.dashboard.resources }}
Expand Down
18 changes: 9 additions & 9 deletions chart/kubeapps/templates/frontend/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,28 +104,28 @@ spec:
- name: http
containerPort: {{ .Values.frontend.containerPorts.http }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.frontend.livenessProbe.enabled }}
{{- if .Values.frontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.frontend.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /healthz
port: http
{{- else if .Values.frontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.frontend.readinessProbe.enabled }}
{{- if .Values.frontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.frontend.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: http
{{- else if .Values.frontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.frontend.startupProbe.enabled }}
{{- if .Values.frontend.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.frontend.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.frontend.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.frontend.resources }}
Expand Down
18 changes: 9 additions & 9 deletions chart/kubeapps/templates/kubeappsapis/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,28 +174,28 @@ spec:
- name: grpc-http
containerPort: {{ .Values.kubeappsapis.containerPorts.http }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.kubeappsapis.livenessProbe.enabled }}
{{- if .Values.kubeappsapis.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.kubeappsapis.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /core/plugins/v1alpha1/configured-plugins
port: grpc-http
{{- else if .Values.kubeappsapis.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.kubeappsapis.readinessProbe.enabled }}
{{- if .Values.kubeappsapis.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.kubeappsapis.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /core/plugins/v1alpha1/configured-plugins
port: grpc-http
{{- else if .Values.kubeappsapis.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.kubeappsapis.startupProbe.enabled }}
{{- if .Values.kubeappsapis.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.kubeappsapis.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.kubeappsapis.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: grpc-http
{{- else if .Values.kubeappsapis.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.kubeappsapis.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.kubeappsapis.resources }}
Expand Down
4 changes: 2 additions & 2 deletions chart/kubeapps/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ frontend:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.23.1-debian-11-r15
tag: 1.23.1-debian-11-r27
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down Expand Up @@ -1139,7 +1139,7 @@ authProxy:
image:
registry: docker.io
repository: bitnami/oauth2-proxy
tag: 7.3.0-debian-11-r29
tag: 7.3.0-debian-11-r40
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down