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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Currently, APISIX Ingress Controller automatically manipulates some APISIX resou
## Compatibility matrix

| | APISIX | APISIX Ingress | [DEPRECATED] APISIX Dashboard |
| :--------: | :----: | :------------: | :--------------: |
| Chart v2.x | v3.x | v1.x | v3.x |
| Chart v1.x | v3.x | v1.x | v3.x |
| Chart v0.x | v2.x | v1.x | v2.x |
|:----------:|:------:|:--------------:|:-----------------------------:|
| Chart v2.x | v3.x | v1.x v2.x | v3.x |
| Chart v1.x | v3.x | v1.x | v3.x |
| Chart v0.x | v2.x | v1.x | v2.x |

## Changelogs

Expand Down
6 changes: 3 additions & 3 deletions charts/apisix/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies:
version: 0.8.2
- name: apisix-ingress-controller
repository: https://charts.apiseven.com
version: 0.14.0
digest: sha256:8d727979670a2b62af7672c36ebb2a4d294bc967b16fb5d1e144ed77c948062d
generated: "2024-04-29T09:07:03.535941+02:00"
version: 1.0.1
digest: sha256:a05753b8273b1b0e64d5ad94acc325f6191480277ae245bd23d95b696ff72cfc
generated: "2025-07-03T18:18:51.915886+08:00"
4 changes: 2 additions & 2 deletions charts/apisix/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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: 2.11.0
version: 2.11.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
Expand All @@ -51,7 +51,7 @@ dependencies:
condition: dashboard.enabled
alias: dashboard
- name: apisix-ingress-controller
version: 0.14.0
version: 1.0.1
repository: https://charts.apiseven.com
condition: ingress-controller.enabled
alias: ingress-controller
Expand Down
5 changes: 4 additions & 1 deletion charts/apisix/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ The command removes all the Kubernetes components associated with the chart and
| apisix.customPlugins.plugins[0].configMap.name | string | `"configmap-name"` | name of configmap. |
| apisix.deployment.mode | string | `"traditional"` | Apache APISIX deployment mode Optional: traditional, decoupled, standalone ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
| apisix.deployment.role | string | `"traditional"` | Deployment role Optional: traditional, data_plane, control_plane ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
| apisix.deployment.role_traditional.config_provider | string | `"etcd"` | |
| apisix.discovery.enabled | bool | `false` | Enable or disable Apache APISIX integration service discovery |
| apisix.discovery.registry | object | `{}` | Registry is the same to the one in APISIX [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml#L281), and refer to such file for more setting details. also refer to [this documentation for integration service discovery](https://apisix.apache.org/docs/apisix/discovery) |
| apisix.dns.resolvers[0] | string | `"127.0.0.1"` | |
Expand Down Expand Up @@ -122,6 +123,8 @@ The command removes all the Kubernetes components associated with the chart and
| apisix.ssl.existingCASecret | string | `""` | Specifies the name of Secret contains trusted CA certificates in the PEM format used to verify the certificate when APISIX needs to do SSL/TLS handshaking with external services (e.g. etcd) |
| apisix.ssl.fallbackSNI | string | `""` | Define SNI to fallback if none is presented by client |
| apisix.ssl.sslProtocols | string | `"TLSv1.2 TLSv1.3"` | TLS protocols allowed to use. |
| apisix.status.ip | string | `"0.0.0.0"` | |
| apisix.status.port | int | `7085` | |
| apisix.stream_plugins | list | `[]` | Customize the list of APISIX stream_plugins to enable. By default, APISIX's default stream_plugins are automatically used. See [config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml) |
| apisix.vault.enabled | bool | `false` | Enable or disable the vault integration |
| apisix.vault.host | string | `""` | The host address where the vault server is running. |
Expand Down Expand Up @@ -184,7 +187,7 @@ The command removes all the Kubernetes components associated with the chart and
| image.repository | string | `"apache/apisix"` | Apache APISIX image repository |
| image.tag | string | `"3.13.0-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
| ingress | object | `{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"servicePort":null,"tls":[]}` | Using ingress access Apache APISIX service |
| ingress-controller | object | `{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress controller configuration |
| ingress-controller | object | `{"enabled":false}` | Ingress controller configuration |
| ingress.annotations | object | `{}` | Ingress annotations |
| ingress.servicePort | number | `nil` | Service port to send traffic. Defaults to `service.http.servicePort`. |
| initContainer.image | string | `"busybox"` | Init container image |
Expand Down
Binary file not shown.
Binary file not shown.
8 changes: 7 additions & 1 deletion charts/apisix/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ data:
{{- if and .Values.apisix.ssl.enabled .Values.apisix.ssl.fallbackSNI }}
fallback_sni: {{ .Values.apisix.ssl.fallbackSNI | quote }}
{{- end }}
{{- $useTraditionalYaml := and (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role_traditional.config_provider "yaml") }}
{{- if $useTraditionalYaml }}
status:
ip: {{ default "127.0.0.1" .Values.apisix.status.ip }}
port: {{ default "7085" (.Values.apisix.status.port | toString) }}
{{- end}}

nginx_config: # config for render the template to genarate nginx.conf
error_log: "{{ .Values.apisix.nginx.logs.errorLog }}"
Expand Down Expand Up @@ -299,7 +305,7 @@ data:

{{- if eq .Values.apisix.deployment.role "traditional" }}
role_traditional:
config_provider: etcd
config_provider: {{ default "etcd" .Values.apisix.deployment.role_traditional.config_provider }}
{{- end }}

{{- if eq .Values.apisix.deployment.role "control_plane" }}
Expand Down
12 changes: 12 additions & 0 deletions charts/apisix/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
priorityClassName: {{ . }}
{{- end }}
containers:
{{- $useTraditionalYaml := and (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role_traditional.config_provider "yaml") }}
- name: {{ .Chart.Name }}
{{- with .Values.securityContext }}
securityContext:
Expand Down Expand Up @@ -153,15 +154,26 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- if $useTraditionalYaml }}
- name: status
containerPort: {{ default 7085 .Values.apisix.status.port }}
protocol: TCP
{{- end}}

{{- if ne .Values.apisix.deployment.role "control_plane" }}
readinessProbe:
failureThreshold: 6
initialDelaySeconds: 10
periodSeconds: 10
successThreshold: 1
{{- if $useTraditionalYaml }}
httpGet:
path: /status/ready
port: {{ default 7085 .Values.apisix.status.port }}
{{- else }}
tcpSocket:
port: {{ .Values.service.http.containerPort }}
{{- end}}
timeoutSeconds: 1
{{- end }}
lifecycle:
Expand Down
10 changes: 7 additions & 3 deletions charts/apisix/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,9 @@ apisix:
#
# ref: https://apisix.apache.org/docs/apisix/deployment-modes/
role: "traditional"
role_traditional:
# enum: etcd, yaml
config_provider: "etcd"

admin:
# -- Enable Admin API
Expand Down Expand Up @@ -573,6 +576,10 @@ apisix:
- key: "the-file-name"
path: "mount-path"

status:
ip: "0.0.0.0"
port: 7085

# -- external etcd configuration. If etcd.enabled is false, these configuration will be used.
externalEtcd:
# -- if etcd.enabled is false, use external etcd, support multiple address, if your etcd cluster enables TLS, please use https scheme, e.g. https://127.0.0.1:2379.
Expand Down Expand Up @@ -649,6 +656,3 @@ dashboard:
# -- Ingress controller configuration
ingress-controller:
enabled: false
config:
apisix:
adminAPIVersion: "v3"