chore: upgrade api7 to v3.2.14.1 (#126)

Signed-off-by: Nic <[email protected]>

Author: nic-6443

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.16.0
+version: 0.16.1
 
 # 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

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.14](https://img.shields.io/badge/AppVersion-3.2.14-informational?style=flat-square)
+![Version: 0.16.1](https://img.shields.io/badge/Version-0.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.14](https://img.shields.io/badge/AppVersion-3.2.14-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -19,9 +19,11 @@ A Helm chart for Kubernetes
 | busybox.image.repository | string | `"docker.io/busybox"` |  |
 | busybox.image.tag | float | `1.28` |  |
 | dashboard.extraEnvVars | list | `[]` |  |
+| dashboard.extraVolumeMounts | list | `[]` |  |
+| dashboard.extraVolumes | list | `[]` |  |
 | dashboard.image.pullPolicy | string | `"Always"` |  |
 | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` |  |
-| dashboard.image.tag | string | `"v3.2.14.0"` |  |
+| dashboard.image.tag | string | `"v3.2.14.1"` |  |
 | dashboard.keyCertSecret | string | `""` |  |
 | dashboard.replicaCount | int | `1` |  |
 | dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` |  |
@@ -99,23 +101,22 @@ A Helm chart for Kubernetes
 | dashboard_configuration.plugins[6] | string | `"mocking"` |  |
 | dashboard_configuration.plugins[70] | string | `"graphql-proxy-cache"` |  |
 | dashboard_configuration.plugins[71] | string | `"ext-plugin-post-req"` |  |
-| dashboard_configuration.plugins[72] | string | `"inspect"` |  |
-| dashboard_configuration.plugins[73] | string | `"graphql-limit-count"` |  |
-| dashboard_configuration.plugins[74] | string | `"elasticsearch-logger"` |  |
-| dashboard_configuration.plugins[75] | string | `"kafka-logger"` |  |
-| dashboard_configuration.plugins[76] | string | `"body-transformer"` |  |
-| dashboard_configuration.plugins[77] | string | `"traffic-split"` |  |
-| dashboard_configuration.plugins[78] | string | `"degraphql"` |  |
-| dashboard_configuration.plugins[79] | string | `"http-logger"` |  |
+| dashboard_configuration.plugins[72] | string | `"graphql-limit-count"` |  |
+| dashboard_configuration.plugins[73] | string | `"elasticsearch-logger"` |  |
+| dashboard_configuration.plugins[74] | string | `"kafka-logger"` |  |
+| dashboard_configuration.plugins[75] | string | `"body-transformer"` |  |
+| dashboard_configuration.plugins[76] | string | `"traffic-split"` |  |
+| dashboard_configuration.plugins[77] | string | `"degraphql"` |  |
+| dashboard_configuration.plugins[78] | string | `"http-logger"` |  |
+| dashboard_configuration.plugins[79] | string | `"cas-auth"` |  |
 | dashboard_configuration.plugins[7] | string | `"serverless-pre-function"` |  |
-| dashboard_configuration.plugins[80] | string | `"cas-auth"` |  |
-| dashboard_configuration.plugins[81] | string | `"traffic-label"` |  |
-| dashboard_configuration.plugins[82] | string | `"oas-validator"` |  |
-| dashboard_configuration.plugins[83] | string | `"api7-traffic-split"` |  |
-| dashboard_configuration.plugins[84] | string | `"limit-conn"` |  |
-| dashboard_configuration.plugins[85] | string | `"prometheus"` |  |
-| dashboard_configuration.plugins[86] | string | `"syslog"` |  |
-| dashboard_configuration.plugins[87] | string | `"ip-restriction"` |  |
+| dashboard_configuration.plugins[80] | string | `"traffic-label"` |  |
+| dashboard_configuration.plugins[81] | string | `"oas-validator"` |  |
+| dashboard_configuration.plugins[82] | string | `"api7-traffic-split"` |  |
+| dashboard_configuration.plugins[83] | string | `"limit-conn"` |  |
+| dashboard_configuration.plugins[84] | string | `"prometheus"` |  |
+| dashboard_configuration.plugins[85] | string | `"syslog"` |  |
+| dashboard_configuration.plugins[86] | string | `"ip-restriction"` |  |
 | dashboard_configuration.plugins[8] | string | `"batch-requests"` |  |
 | dashboard_configuration.plugins[9] | string | `"ua-restriction"` |  |
 | dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
@@ -159,7 +160,7 @@ A Helm chart for Kubernetes
 | developer_portal.extraEnvVars | list | `[]` |  |
 | developer_portal.image.pullPolicy | string | `"IfNotPresent"` |  |
 | developer_portal.image.repository | string | `"api7/api7-developer-portal"` |  |
-| developer_portal.image.tag | string | `"v0.0.5"` |  |
+| developer_portal.image.tag | string | `"v0.0.6"` |  |
 | developer_portal.replicaCount | int | `1` |  |
 | developer_portal_configuration.enable | bool | `true` |  |
 | developer_portal_configuration.server.listen.host | string | `"0.0.0.0"` |  |
@@ -175,9 +176,11 @@ A Helm chart for Kubernetes
 | developer_portal_service.port | int | `4321` |  |
 | developer_portal_service.type | string | `"ClusterIP"` |  |
 | dp_manager.extraEnvVars | list | `[]` |  |
+| dp_manager.extraVolumeMounts | list | `[]` |  |
+| dp_manager.extraVolumes | list | `[]` |  |
 | dp_manager.image.pullPolicy | string | `"Always"` |  |
 | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` |  |
-| dp_manager.image.tag | string | `"v3.2.14.0"` |  |
+| dp_manager.image.tag | string | `"v3.2.14.1"` |  |
 | dp_manager.replicaCount | int | `1` |  |
 | dp_manager_configuration.database.dsn | string | `"postgres://api7ee:changeme@api7-postgresql:5432/api7ee"` |  |
 | dp_manager_configuration.database.max_idle_conns | int | `2` |  |

charts/api7/templates/dashboard-deploy.yaml

@@ -33,6 +33,9 @@ spec:
         - name: config
           configMap:
             name: {{ include "api7ee3.fullname" . }}-dashboard-config
+      {{- if .Values.dashboard.extraVolumes }}
+      {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }}
+      {{- end }}
       {{- if .Values.dashboard.keyCertSecret }}
         - name: ssl
           secret:
@@ -102,6 +105,9 @@ spec:
               name: prometheus_ssl
               readOnly: true
           {{- end }}
+          {{- if .Values.dashboard.extraVolumeMounts }}
+          {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

charts/api7/templates/dp-manager-deploy.yaml

@@ -38,6 +38,9 @@ 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 }}
+      {{- end }}
       initContainers:
         - name: wait-for-dashboard
           image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
@@ -87,6 +90,9 @@ spec:
               name: prometheus_ssl
               readOnly: true
           {{- end }}
+          {{- if .Values.dashboard.extraVolumeMounts }}
+          {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

charts/api7/values.yaml

@@ -10,25 +10,29 @@ dashboard:
     repository: api7/api7-ee-3-integrated
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.14.0"
+    tag: "v3.2.14.1"
   extraEnvVars: []
+  extraVolumes: []
+  extraVolumeMounts: []
 
 dp_manager:
   replicaCount: 1
   image:
     repository: api7/api7-ee-dp-manager
     pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.14.0"
+    tag: "v3.2.14.1"
   extraEnvVars: []
+  extraVolumes: []
+  extraVolumeMounts: []
 
 developer_portal:
   replicaCount: 1
   image:
     repository: api7/api7-developer-portal
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v0.0.5"
+    tag: "v0.0.6"
   extraEnvVars: []
 
 imagePullSecret: ""
@@ -328,7 +332,6 @@ dashboard_configuration:
     - openfunction
     - graphql-proxy-cache
     - ext-plugin-post-req
-    - inspect
     #- log-rotate
     - graphql-limit-count
     - elasticsearch-logger