diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml index f71e39c..8ea83c6 100644 --- a/charts/api7/Chart.yaml +++ b/charts/api7/Chart.yaml @@ -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.55 +version: 0.18.0 # 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 diff --git a/charts/api7/README.md b/charts/api7/README.md index 9518cf7..051756f 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -1,6 +1,6 @@ # api7ee3 -![Version: 0.17.55](https://img.shields.io/badge/Version-0.17.55-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.12](https://img.shields.io/badge/AppVersion-3.9.12-informational?style=flat-square) +![Version: 0.18.0](https://img.shields.io/badge/Version-0.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.12](https://img.shields.io/badge/AppVersion-3.9.12-informational?style=flat-square) A Helm chart for Kubernetes @@ -24,6 +24,7 @@ A Helm chart for Kubernetes |-----|------|---------|-------------| | affinity | object | `{}` | | | dashboard.extraEnvVars | list | `[]` | | +| dashboard.extraInitContainers | list | `[]` | | | dashboard.extraVolumeMounts | list | `[]` | | | dashboard.extraVolumes | list | `[]` | | | dashboard.image.pullPolicy | string | `"Always"` | | @@ -114,6 +115,7 @@ A Helm chart for Kubernetes | dashboard_service.tlsPort | int | `7443` | | | dashboard_service.type | string | `"ClusterIP"` | | | developer_portal.extraEnvVars | list | `[]` | | +| developer_portal.extraInitContainers | list | `[]` | | | developer_portal.extraVolumeMounts | list | `[]` | | | developer_portal.extraVolumes | list | `[]` | | | developer_portal.image.pullPolicy | string | `"Always"` | | @@ -159,6 +161,7 @@ A Helm chart for Kubernetes | developer_portal_service.port | int | `4321` | | | developer_portal_service.type | string | `"ClusterIP"` | | | dp_manager.extraEnvVars | list | `[]` | | +| dp_manager.extraInitContainers | list | `[]` | | | dp_manager.extraVolumeMounts | list | `[]` | | | dp_manager.extraVolumes | list | `[]` | | | dp_manager.image.pullPolicy | string | `"Always"` | | diff --git a/charts/api7/templates/dashboard-deploy.yaml b/charts/api7/templates/dashboard-deploy.yaml index 692eb0f..701a23d 100644 --- a/charts/api7/templates/dashboard-deploy.yaml +++ b/charts/api7/templates/dashboard-deploy.yaml @@ -51,6 +51,10 @@ spec: secret: secretName: {{ .Values.prometheus.server.existingSecret | quote }} {{- end }} + {{- if .Values.dashboard.extraInitContainers }} + initContainers: + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraInitContainers "context" $) | nindent 8 }} + {{- end }} containers: - name: dashboard securityContext: diff --git a/charts/api7/templates/developer-portal-deploy.yaml b/charts/api7/templates/developer-portal-deploy.yaml index 5c20431..2b581bd 100644 --- a/charts/api7/templates/developer-portal-deploy.yaml +++ b/charts/api7/templates/developer-portal-deploy.yaml @@ -47,6 +47,10 @@ spec: secret: secretName: {{ .Values.developer_portal.keyCertSecret | quote }} {{- end }} + {{- if .Values.developer_portal.extraInitContainers }} + initContainers: + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraInitContainers "context" $) | nindent 8 }} + {{- end }} containers: - name: developer-portal securityContext: diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml index f055f94..bbf52dd 100644 --- a/charts/api7/templates/dp-manager-deploy.yaml +++ b/charts/api7/templates/dp-manager-deploy.yaml @@ -43,8 +43,12 @@ spec: secret: secretName: {{ .Values.prometheus.server.existingSecret | quote }} {{- end }} - {{- if .Values.dashboard.extraVolumes }} - {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }} + {{- if .Values.dp_manager.extraVolumes }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraVolumes "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.dp_manager.extraInitContainers }} + initContainers: + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraInitContainers "context" $) | nindent 8 }} {{- end }} containers: - name: dp-manager @@ -85,8 +89,8 @@ spec: name: prometheus_ssl readOnly: true {{- end }} - {{- if .Values.dashboard.extraVolumeMounts }} - {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }} + {{- if .Values.dp_manager.extraVolumeMounts }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} resources: {{- if .Values.dp_manager.resources }} diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml index c2fa2c5..7f481d8 100644 --- a/charts/api7/values.yaml +++ b/charts/api7/values.yaml @@ -34,6 +34,7 @@ dashboard: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ @@ -70,6 +71,7 @@ dp_manager: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ @@ -113,6 +115,7 @@ developer_portal: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/