Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/api7/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.17.43
version: 0.17.44

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
4 changes: 1 addition & 3 deletions charts/api7/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# api7ee3

![Version: 0.17.43](https://img.shields.io/badge/Version-0.17.43-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.4](https://img.shields.io/badge/AppVersion-3.9.4-informational?style=flat-square)
![Version: 0.17.44](https://img.shields.io/badge/Version-0.17.44-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.4](https://img.shields.io/badge/AppVersion-3.9.4-informational?style=flat-square)

A Helm chart for Kubernetes

Expand All @@ -22,8 +22,6 @@ A Helm chart for Kubernetes
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| busybox.image.repository | string | `"docker.io/busybox"` | |
| busybox.image.tag | float | `1.28` | |
| dashboard.extraEnvVars | list | `[]` | |
| dashboard.extraVolumeMounts | list | `[]` | |
| dashboard.extraVolumes | list | `[]` | |
Expand Down
17 changes: 0 additions & 17 deletions charts/api7/templates/dashboard-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,6 @@ spec:
secret:
secretName: {{ .Values.prometheus.server.existingSecret | quote }}
{{- end }}
{{- if or .Values.postgresql.builtin .Values.prometheus.builtin }}
initContainers:
{{- if .Values.postgresql.builtin }}
- name: wait-for-postgresql
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
command: [ 'sh', '-c', "until nc -z -v -w3 {{ .Values.postgresql.fullnameOverride }} {{ .Values.postgresql.primary.service.ports.postgresql }}; do echo waiting for builtin postgresql service `date`; sleep 2; done;" ]
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
{{- if .Values.prometheus.builtin }}
- name: wait-for-prometheus
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
command: [ 'sh', '-c', "until wget --timeout=3 -q --spider http://{{ .Values.prometheus.fullnameOverride }}-server:{{ .Values.prometheus.server.service.ports.http }}; do echo waiting for builtin prometheus service `date`; sleep 2; done;" ]
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
{{- end }}
{{- end }}
containers:
- name: dashboard
securityContext:
Expand Down
10 changes: 0 additions & 10 deletions charts/api7/templates/developer-portal-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,6 @@ spec:
secret:
secretName: {{ .Values.developer_portal.keyCertSecret | quote }}
{{- end }}
initContainers:
- name: wait-for-dashboard
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
{{- if not .Values.dashboard_configuration.server.listen.disable }}
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.port }};do echo waiting for dashboard `date`; sleep 2; done;" ]
{{- else }}
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.tlsPort }};do echo waiting for dashboard `date`; sleep 2; done;" ]
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
containers:
- name: developer-portal
securityContext:
Expand Down
10 changes: 0 additions & 10 deletions charts/api7/templates/dp-manager-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ spec:
{{- if .Values.dashboard.extraVolumes }}
{{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }}
{{- end }}
initContainers:
- name: wait-for-dashboard
image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
{{- if not .Values.dashboard_configuration.server.listen.disable }}
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.port }};do echo waiting for dashboard `date`; sleep 2; done;" ]
{{- else }}
command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.tlsPort }};do echo waiting for dashboard `date`; sleep 2; done;" ]
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
containers:
- name: dp-manager
securityContext:
Expand Down
5 changes: 0 additions & 5 deletions charts/api7/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,6 @@ affinity: {}
# The value is evaluated as a template
topologySpreadConstraints: []

busybox:
image:
repository: docker.io/busybox
tag: 1.28

prometheus:
builtin: true
fullnameOverride: "api7-prometheus"
Expand Down
Loading