diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0f91a8d..d8b6c71 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,6 +30,7 @@ jobs: quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \ && helm repo add bitnami https://charts.bitnami.com/bitnami \ && helm repo add apisix https://charts.apiseven.com \ + && helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \ && ct lint \ --charts charts/api7 \ --charts charts/gateway \ @@ -52,6 +53,7 @@ jobs: quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \ && helm repo add bitnami https://charts.bitnami.com/bitnami \ && helm repo add apisix https://charts.apiseven.com \ + && helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \ && ct install \ --charts charts/api7 \ --charts charts/ingress-controller' @@ -67,6 +69,7 @@ jobs: quay.io/helmpack/chart-testing:v3.10.1 sh -c 'git config --global --add safe.directory /workdir \ && helm repo add bitnami https://charts.bitnami.com/bitnami \ && helm repo add apisix https://charts.apiseven.com \ + && helm repo add jaegertracing https://jaegertracing.github.io/helm-charts \ && ct install \ --charts charts/gateway --helm-extra-set-args "--set etcd.enabled=true --set apisix.extraEnvVars[0].name=API7_SKIP_FIRST_HEARTBEAT_DEBUG --set-string apisix.extraEnvVars[0].value=true"' diff --git a/charts/api7/Chart.lock b/charts/api7/Chart.lock index 308124b..7c9d7f3 100644 --- a/charts/api7/Chart.lock +++ b/charts/api7/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami version: 12.12.10 -digest: sha256:d549be7a94677d1d3b70748b8ebb0f8fb2a529c57a5ac9cc8d07a08298f29be0 -generated: "2023-12-27T11:58:16.494435714+08:00" +- name: jaeger + repository: https://jaegertracing.github.io/helm-charts + version: 4.4.7 +digest: sha256:057c643d7f9fdc0551ce4cb2184ac2923a0906f4f1c12493a71bcb2029e55c04 +generated: "2026-02-13T18:14:01.057403+08:00" diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml index 2c4f7ec..6254858 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.44 +version: 0.17.45 # 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.9.4" +appVersion: "3.9.5" maintainers: - name: API7 @@ -38,3 +38,8 @@ dependencies: condition: postgresql.builtin version: "12.12.10" repository: "https://charts.bitnami.com/bitnami" + + - name: jaeger + condition: jaeger.builtin + version: "4.4.7" + repository: "https://jaegertracing.github.io/helm-charts" diff --git a/charts/api7/README.md b/charts/api7/README.md index ff113ab..7433b58 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -1,6 +1,6 @@ # api7ee3 -![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) +![Version: 0.17.45](https://img.shields.io/badge/Version-0.17.45-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.5](https://img.shields.io/badge/AppVersion-3.9.5-informational?style=flat-square) A Helm chart for Kubernetes @@ -16,6 +16,7 @@ A Helm chart for Kubernetes |------------|------|---------| | https://charts.bitnami.com/bitnami | postgresql | 12.12.10 | | https://charts.bitnami.com/bitnami | prometheus | 0.5.1 | +| https://jaegertracing.github.io/helm-charts | jaeger | 4.4.7 | ## Values @@ -27,7 +28,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.9.4"` | | +| dashboard.image.tag | string | `"v3.9.5"` | | | dashboard.keyCertSecret | string | `""` | | | dashboard.livenessProbe.failureThreshold | int | `30` | | | dashboard.livenessProbe.initialDelaySeconds | int | `180` | | @@ -53,6 +54,8 @@ A Helm chart for Kubernetes | dashboard_configuration.developer_proxy.cache_failure_ttl | int | `15` | | | dashboard_configuration.developer_proxy.cache_success_count | int | `256` | | | dashboard_configuration.developer_proxy.cache_success_ttl | int | `15` | | +| dashboard_configuration.jaeger.addr | string | `"http://api7-jaeger:16686"` | | +| dashboard_configuration.jaeger.timeout | string | `"30s"` | | | dashboard_configuration.log.access_log | string | `"stdout"` | | | dashboard_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` | | dashboard_configuration.log.output | string | `"stderr"` | | @@ -110,7 +113,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.9.4"` | | +| developer_portal.image.tag | string | `"v3.9.5"` | | | developer_portal.keyCertSecret | string | `""` | | | developer_portal.livenessProbe.failureThreshold | int | `10` | | | developer_portal.livenessProbe.initialDelaySeconds | int | `60` | | @@ -155,7 +158,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.9.4"` | | +| dp_manager.image.tag | string | `"v3.9.5"` | | | dp_manager.livenessProbe.failureThreshold | int | `10` | | | dp_manager.livenessProbe.initialDelaySeconds | int | `60` | | | dp_manager.livenessProbe.periodSeconds | int | `3` | | @@ -175,6 +178,8 @@ A Helm chart for Kubernetes | dp_manager_configuration.developer_cache.evict_interval | string | `"5s"` | | | dp_manager_configuration.developer_cache.max_ttl | string | `"2h"` | | | dp_manager_configuration.developer_cache.size | int | `50000` | | +| dp_manager_configuration.jaeger.collector_addr | string | `"http://api7-jaeger:4318"` | | +| dp_manager_configuration.jaeger.timeout | string | `"30s"` | | | dp_manager_configuration.log.access_log | string | `"stdout"` | | | dp_manager_configuration.log.level | string | `"warn"` | Allowed values: `debug`, `info`, `warn`, `error` | | dp_manager_configuration.log.output | string | `"stderr"` | | @@ -216,6 +221,8 @@ A Helm chart for Kubernetes | fullnameOverride | string | `""` | | | global.storageClass | string | `""` | | | imagePullSecret | string | `""` | | +| jaeger.builtin | bool | `true` | | +| jaeger.fullnameOverride | string | `"api7-jaeger"` | | | nameOverride | string | `""` | | | nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | diff --git a/charts/api7/charts/jaeger-4.4.7.tgz b/charts/api7/charts/jaeger-4.4.7.tgz new file mode 100644 index 0000000..835ebc0 Binary files /dev/null and b/charts/api7/charts/jaeger-4.4.7.tgz differ diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml index 9c35f6a..dfb45f9 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.9.4" + tag: "v3.9.5" # 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.9.4" + tag: "v3.9.5" # 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.9.4" + tag: "v3.9.5" extraEnvVars: [] extraVolumes: [] @@ -266,6 +266,10 @@ prometheus: http: 9090 configuration: "" +jaeger: + builtin: true + fullnameOverride: "api7-jaeger" + postgresql: builtin: true fullnameOverride: "api7-postgresql" @@ -392,6 +396,9 @@ dashboard_configuration: response_code: 403 # license: # file_path: "/app/licenses/license.txt" # the file path of license file, (e.g. /app/licenses/license.txt) + jaeger: + addr: "http://api7-jaeger:16686" + timeout: 30s dp_manager_configuration: server: @@ -419,6 +426,9 @@ dp_manager_configuration: max_open_conns: 30 max_idle_time: 30s timeout: 5s + jaeger: + collector_addr: "http://api7-jaeger:4318" + timeout: 30s prometheus: addr: "http://api7-prometheus-server:9090" remote_write_path: "/api/v1/write" diff --git a/charts/gateway/Chart.yaml b/charts/gateway/Chart.yaml index afc2b6c..7bbd586 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.54 +version: 0.2.55 # 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.9.4" +appVersion: "3.9.5" maintainers: - name: API7 diff --git a/charts/gateway/README.md b/charts/gateway/README.md index 087220f..9411c3d 100644 --- a/charts/gateway/README.md +++ b/charts/gateway/README.md @@ -104,7 +104,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.9.4"` | API7 Gateway image tag Overrides the image tag whose default is the chart appVersion. | +| apisix.image.tag | string | `"3.9.5"` | 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 7f555f9..a3f135b 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -138,7 +138,7 @@ apisix: pullPolicy: Always # -- API7 Gateway image tag # Overrides the image tag whose default is the chart appVersion. - tag: 3.9.4 + tag: 3.9.5 # -- Use a `DaemonSet` or `Deployment` kind: Deployment