diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml index 6f7e315..979fa03 100644 --- a/charts/api7/Chart.yaml +++ b/charts/api7/Chart.yaml @@ -15,13 +15,13 @@ 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.33 +version: 0.17.34 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.8.19" +appVersion: "3.8.18" maintainers: - name: API7 diff --git a/charts/api7/README.md b/charts/api7/README.md index ce904f3..4b491b4 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -1,6 +1,6 @@ # api7ee3 -![Version: 0.17.33](https://img.shields.io/badge/Version-0.17.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.19](https://img.shields.io/badge/AppVersion-3.8.19-informational?style=flat-square) +![Version: 0.17.34](https://img.shields.io/badge/Version-0.17.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.18](https://img.shields.io/badge/AppVersion-3.8.18-informational?style=flat-square) A Helm chart for Kubernetes @@ -29,7 +29,7 @@ A Helm chart for Kubernetes | dashboard.extraVolumes | list | `[]` | | | dashboard.image.pullPolicy | string | `"Always"` | | | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | | -| dashboard.image.tag | string | `"v3.8.19"` | | +| dashboard.image.tag | string | `"v3.8.18"` | | | dashboard.keyCertSecret | string | `""` | | | dashboard.livenessProbe.failureThreshold | int | `30` | | | dashboard.livenessProbe.initialDelaySeconds | int | `180` | | @@ -110,7 +110,7 @@ A Helm chart for Kubernetes | developer_portal.extraVolumes | list | `[]` | | | developer_portal.image.pullPolicy | string | `"Always"` | | | developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | | -| developer_portal.image.tag | string | `"v3.8.19"` | | +| developer_portal.image.tag | string | `"v3.8.18"` | | | developer_portal.keyCertSecret | string | `""` | | | developer_portal.livenessProbe.failureThreshold | int | `10` | | | developer_portal.livenessProbe.initialDelaySeconds | int | `60` | | @@ -150,7 +150,7 @@ A Helm chart for Kubernetes | 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.8.19"` | | +| dp_manager.image.tag | string | `"v3.8.18"` | | | dp_manager.livenessProbe.failureThreshold | int | `10` | | | dp_manager.livenessProbe.initialDelaySeconds | int | `60` | | | dp_manager.livenessProbe.periodSeconds | int | `3` | | diff --git a/charts/api7/templates/dashboard-service.yaml b/charts/api7/templates/dashboard-service.yaml index 6e212a4..d897818 100644 --- a/charts/api7/templates/dashboard-service.yaml +++ b/charts/api7/templates/dashboard-service.yaml @@ -16,10 +16,17 @@ spec: targetPort: http protocol: TCP name: http + {{- if (and (eq .Values.dashboard_service.type "NodePort") (not (empty .Values.dashboard_service.nodePort))) }} + nodePort: {{ .Values.dashboard_service.nodePort }} + {{- end }} + - port: {{ .Values.dashboard_service.tlsPort }} targetPort: https protocol: TCP name: https + {{- if (and (eq .Values.dashboard_service.type "NodePort") (not (empty .Values.dashboard_service.tlsNodePort))) }} + nodePort: {{ .Values.dashboard_service.tlsNodePort }} + {{- end }} selector: {{- include "api7ee3.selectorLabels" . | nindent 4 }} diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml index 4086910..b3aba9f 100644 --- a/charts/api7/values.yaml +++ b/charts/api7/values.yaml @@ -18,7 +18,7 @@ dashboard: repository: api7/api7-ee-3-integrated pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "v3.8.19" + tag: "v3.8.18" # Resources of the deployment. # It has a higher priority than the common resources configuration: # when this field is configured, it is used first in the deployment, @@ -54,7 +54,7 @@ dp_manager: repository: api7/api7-ee-dp-manager pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "v3.8.19" + tag: "v3.8.18" # Resources of the deployment. # It has a higher priority than the common resources configuration: # when this field is configured, it is used first in the deployment, @@ -92,7 +92,7 @@ developer_portal: repository: api7/api7-ee-developer-portal pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "v3.8.19" + tag: "v3.8.18" extraEnvVars: [] extraVolumes: [] @@ -142,6 +142,8 @@ dashboard_service: annotations: {} port: 7080 tlsPort: 7443 + # nodePort: 30080 + # tlsNodePort: 30443 ingress: enabled: false className: "" diff --git a/charts/gateway/Chart.yaml b/charts/gateway/Chart.yaml index a021d97..37a0910 100644 --- a/charts/gateway/Chart.yaml +++ b/charts/gateway/Chart.yaml @@ -14,12 +14,12 @@ 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.2.38 +version: 0.2.37 # 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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "3.8.19" +appVersion: "3.8.18" maintainers: - name: API7 diff --git a/charts/gateway/README.md b/charts/gateway/README.md index 9af7b86..d537052 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -102,7 +102,7 @@ The command removes all the Kubernetes components associated with the chart and | apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix handles routing: - radixtree_uri: match route by uri(base on radixtree) - radixtree_host_uri: match route by host + uri(base on radixtree) - radixtree_uri_with_parameter: match route by uri with parameters | | apisix.image.pullPolicy | string | `"Always"` | API7 Gateway image pull policy | | apisix.image.repository | string | `"api7/api7-ee-3-gateway"` | API7 Gateway image repository | -| apisix.image.tag | string | `"3.8.19"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. | +| apisix.image.tag | string | `"3.8.18"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. | | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` | | apisix.lru | object | `{"secret":{"count":512,"neg_count":512,"neg_ttl":60,"ttl":300}}` | fine tune the parameters of LRU cache for some features like secret | | apisix.lru.secret.neg_ttl | int | `60` | in seconds | diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 441e2e5..ff2a55c 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -135,7 +135,7 @@ apisix: pullPolicy: Always # -- API7 Gateway image tag # Overrides the image tag whose default is the chart appVersion. - tag: 3.8.19 + tag: 3.8.18 # -- Use a `DaemonSet` or `Deployment` kind: Deployment