Skip to content

Commit 86013d0

Browse files
dspodspo
authored
chore: support standalone (#839)
1 parent e511431 commit 86013d0

9 files changed

Lines changed: 39 additions & 14 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ Currently, APISIX Ingress Controller automatically manipulates some APISIX resou
3030
## Compatibility matrix
3131

3232
| | APISIX | APISIX Ingress | [DEPRECATED] APISIX Dashboard |
33-
| :--------: | :----: | :------------: | :--------------: |
34-
| Chart v2.x | v3.x | v1.x | v3.x |
35-
| Chart v1.x | v3.x | v1.x | v3.x |
36-
| Chart v0.x | v2.x | v1.x | v2.x |
33+
|:----------:|:------:|:--------------:|:-----------------------------:|
34+
| Chart v2.x | v3.x | v1.x v2.x | v3.x |
35+
| Chart v1.x | v3.x | v1.x | v3.x |
36+
| Chart v0.x | v2.x | v1.x | v2.x |
3737

3838
## Changelogs
3939

‎charts/apisix/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies:
77
version: 0.8.2
88
- name: apisix-ingress-controller
99
repository: https://charts.apiseven.com
10-
version: 0.14.0
11-
digest: sha256:8d727979670a2b62af7672c36ebb2a4d294bc967b16fb5d1e144ed77c948062d
12-
generated: "2024-04-29T09:07:03.535941+02:00"
10+
version: 1.0.1
11+
digest: sha256:a05753b8273b1b0e64d5ad94acc325f6191480277ae245bd23d95b696ff72cfc
12+
generated: "2025-07-03T18:18:51.915886+08:00"

‎charts/apisix/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type: application
3131
# This is the chart version. This version number should be incremented each time you make changes
3232
# to the chart and its templates, including the app version.
3333
# Versions are expected to follow Semantic Versioning (https://semver.org/)
34-
version: 2.11.0
34+
version: 2.11.1
3535

3636
# This is the version number of the application being deployed. This version number should be
3737
# incremented each time you make changes to the application. Versions are not expected to
@@ -51,7 +51,7 @@ dependencies:
5151
condition: dashboard.enabled
5252
alias: dashboard
5353
- name: apisix-ingress-controller
54-
version: 0.14.0
54+
version: 1.0.1
5555
repository: https://charts.apiseven.com
5656
condition: ingress-controller.enabled
5757
alias: ingress-controller

‎charts/apisix/README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ The command removes all the Kubernetes components associated with the chart and
6767
| apisix.customPlugins.plugins[0].configMap.name | string | `"configmap-name"` | name of configmap. |
6868
| apisix.deployment.mode | string | `"traditional"` | Apache APISIX deployment mode Optional: traditional, decoupled, standalone ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
6969
| apisix.deployment.role | string | `"traditional"` | Deployment role Optional: traditional, data_plane, control_plane ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
70+
| apisix.deployment.role_traditional.config_provider | string | `"etcd"` | |
7071
| apisix.discovery.enabled | bool | `false` | Enable or disable Apache APISIX integration service discovery |
7172
| 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) |
7273
| apisix.dns.resolvers[0] | string | `"127.0.0.1"` | |
@@ -122,6 +123,8 @@ The command removes all the Kubernetes components associated with the chart and
122123
| 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) |
123124
| apisix.ssl.fallbackSNI | string | `""` | Define SNI to fallback if none is presented by client |
124125
| apisix.ssl.sslProtocols | string | `"TLSv1.2 TLSv1.3"` | TLS protocols allowed to use. |
126+
| apisix.status.ip | string | `"0.0.0.0"` | |
127+
| apisix.status.port | int | `7085` | |
125128
| 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) |
126129
| apisix.vault.enabled | bool | `false` | Enable or disable the vault integration |
127130
| apisix.vault.host | string | `""` | The host address where the vault server is running. |
@@ -184,7 +187,7 @@ The command removes all the Kubernetes components associated with the chart and
184187
| image.repository | string | `"apache/apisix"` | Apache APISIX image repository |
185188
| image.tag | string | `"3.13.0-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
186189
| ingress | object | `{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"servicePort":null,"tls":[]}` | Using ingress access Apache APISIX service |
187-
| ingress-controller | object | `{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress controller configuration |
190+
| ingress-controller | object | `{"enabled":false}` | Ingress controller configuration |
188191
| ingress.annotations | object | `{}` | Ingress annotations |
189192
| ingress.servicePort | number | `nil` | Service port to send traffic. Defaults to `service.http.servicePort`. |
190193
| initContainer.image | string | `"busybox"` | Init container image |

‎charts/apisix/charts/apisix-ingress-controller-0.14.0.tgz‎

-21.1 KB
Binary file not shown.

‎charts/apisix/charts/apisix-ingress-controller-1.0.1.tgz‎

106 KB
Binary file not shown.

‎charts/apisix/templates/configmap.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@ data:
169169
{{- if and .Values.apisix.ssl.enabled .Values.apisix.ssl.fallbackSNI }}
170170
fallback_sni: {{ .Values.apisix.ssl.fallbackSNI | quote }}
171171
{{- end }}
172+
{{- $useTraditionalYaml := and (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role_traditional.config_provider "yaml") }}
173+
{{- if $useTraditionalYaml }}
174+
status:
175+
ip: {{ default "127.0.0.1" .Values.apisix.status.ip }}
176+
port: {{ default "7085" (.Values.apisix.status.port | toString) }}
177+
{{- end}}
172178
173179
nginx_config: # config for render the template to genarate nginx.conf
174180
error_log: "{{ .Values.apisix.nginx.logs.errorLog }}"
@@ -299,7 +305,7 @@ data:
299305
300306
{{- if eq .Values.apisix.deployment.role "traditional" }}
301307
role_traditional:
302-
config_provider: etcd
308+
config_provider: {{ default "etcd" .Values.apisix.deployment.role_traditional.config_provider }}
303309
{{- end }}
304310
305311
{{- if eq .Values.apisix.deployment.role "control_plane" }}

‎charts/apisix/templates/deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ spec:
5959
priorityClassName: {{ . }}
6060
{{- end }}
6161
containers:
62+
{{- $useTraditionalYaml := and (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role_traditional.config_provider "yaml") }}
6263
- name: {{ .Chart.Name }}
6364
{{- with .Values.securityContext }}
6465
securityContext:
@@ -153,15 +154,26 @@ spec:
153154
{{- end }}
154155
{{- end }}
155156
{{- end }}
157+
{{- if $useTraditionalYaml }}
158+
- name: status
159+
containerPort: {{ default 7085 .Values.apisix.status.port }}
160+
protocol: TCP
161+
{{- end}}
156162

157163
{{- if ne .Values.apisix.deployment.role "control_plane" }}
158164
readinessProbe:
159165
failureThreshold: 6
160166
initialDelaySeconds: 10
161167
periodSeconds: 10
162168
successThreshold: 1
169+
{{- if $useTraditionalYaml }}
170+
httpGet:
171+
path: /status/ready
172+
port: {{ default 7085 .Values.apisix.status.port }}
173+
{{- else }}
163174
tcpSocket:
164175
port: {{ .Values.service.http.containerPort }}
176+
{{- end}}
165177
timeoutSeconds: 1
166178
{{- end }}
167179
lifecycle:

‎charts/apisix/values.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ apisix:
349349
#
350350
# ref: https://apisix.apache.org/docs/apisix/deployment-modes/
351351
role: "traditional"
352+
role_traditional:
353+
# enum: etcd, yaml
354+
config_provider: "etcd"
352355

353356
admin:
354357
# -- Enable Admin API
@@ -573,6 +576,10 @@ apisix:
573576
- key: "the-file-name"
574577
path: "mount-path"
575578

579+
status:
580+
ip: "0.0.0.0"
581+
port: 7085
582+
576583
# -- external etcd configuration. If etcd.enabled is false, these configuration will be used.
577584
externalEtcd:
578585
# -- 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.
@@ -649,6 +656,3 @@ dashboard:
649656
# -- Ingress controller configuration
650657
ingress-controller:
651658
enabled: false
652-
config:
653-
apisix:
654-
adminAPIVersion: "v3"

0 commit comments

Comments
 (0)