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
5 changes: 3 additions & 2 deletions charts/apisix-ingress-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ The same for container level, you need to set:
| autoscaling.enabled | bool | `false` | |
| autoscaling.minReplicas | int | `1` | |
| config.controllerName | string | `"apisix.apache.org/apisix-ingress-controller"` | |
| config.disableGatewayAPI | bool | `false` | |
| config.enableHTTP2 | bool | `false` | |
| config.execADCTimeout | string | `"15s"` | |
| config.kubernetes.defaultIngressClass | bool | `false` | |
Expand All @@ -127,12 +128,12 @@ The same for container level, you need to set:
| config.provider.syncPeriod | string | `"1m"` | |
| config.provider.type | string | `"apisix"` | |
| config.secureMetrics | bool | `false` | |
| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.22.1"}}` | Set adc sidecar container configuration |
| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.23.1"}}` | Set adc sidecar container configuration |
| deployment.affinity | object | `{}` | |
| deployment.annotations | object | `{}` | Add annotations to Apache APISIX ingress controller resource |
| deployment.image.pullPolicy | string | `"IfNotPresent"` | |
| deployment.image.repository | string | `"apache/apisix-ingress-controller"` | |
| deployment.image.tag | string | `"2.0.0-rc5"` | |
| deployment.image.tag | string | `"2.0.0"` | |
| deployment.nodeSelector | object | `{}` | |
| deployment.podAnnotations | object | `{}` | |
| deployment.podSecurityContext | object | `{"fsGroup":2000}` | Set security context for the pod fsGroup: 2000 ensures containers can share Unix socket files via a common group. |
Expand Down
32 changes: 18 additions & 14 deletions charts/apisix-ingress-controller/crds/apisixic-crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ spec:
name: v2
schema:
openAPIV3Schema:
description: ApisixRoute is defines configuration for HTTP and stream routes.
description: ApisixRoute defines configuration for HTTP and stream routes.
properties:
apiVersion:
description: |-
Expand Down Expand Up @@ -1027,7 +1027,7 @@ spec:
Each rule specifies conditions to match TCP/UDP traffic and how to forward them.
items:
description: ApisixRouteStream defines the configuration for a Layer
4 (TCP/UDP) route. Currently not supported.
4 (TCP/UDP) route.
properties:
backend:
description: Backend specifies the destination service to which
Expand Down Expand Up @@ -1585,9 +1585,8 @@ spec:
minimum: 0
type: integer
timeout:
description: |-
Timeout sets health check timeout in seconds.
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
description: Timeout sets the number of timeouts to define
an unhealthy target.
maximum: 254
minimum: 1
type: integer
Expand Down Expand Up @@ -1649,9 +1648,8 @@ spec:
minimum: 0
type: integer
timeout:
description: |-
Timeout sets health check timeout in seconds.
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
description: Timeout sets the number of timeouts to define
an unhealthy target.
maximum: 254
minimum: 1
type: integer
Expand Down Expand Up @@ -1846,9 +1844,8 @@ spec:
minimum: 0
type: integer
timeout:
description: |-
Timeout sets health check timeout in seconds.
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
description: Timeout sets the number of timeouts
to define an unhealthy target.
maximum: 254
minimum: 1
type: integer
Expand Down Expand Up @@ -1910,9 +1907,8 @@ spec:
minimum: 0
type: integer
timeout:
description: |-
Timeout sets health check timeout in seconds.
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
description: Timeout sets the number of timeouts
to define an unhealthy target.
maximum: 254
minimum: 1
type: integer
Expand Down Expand Up @@ -3029,6 +3025,11 @@ spec:
type: string
minItems: 1
type: array
mode:
description: |-
Mode specifies the mode of control plane provider.
Can be `apisix` or `apisix-standalone`.
type: string
service:
properties:
name:
Expand All @@ -3052,6 +3053,9 @@ spec:
type: object
x-kubernetes-validations:
- rule: has(self.endpoints) != has(self.service)
- message: mode is immutable
rule: oldSelf == null || (!has(self.mode) && !has(oldSelf.mode))
|| self.mode == oldSelf.mode
type:
description: Type specifies the type of provider. Can only be
`ControlPlane`.
Expand Down
1 change: 1 addition & 0 deletions charts/apisix-ingress-controller/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ data:
probe_addr: {{ .Values.config.probeAddr | default ":8081" }}
secure_metrics: {{ .Values.config.secureMetrics | default false }}
exec_adc_timeout: {{ .Values.config.execADCTimeout | default "15s" }}
disable_gateway_api: {{ .Values.config.disableGatewayAPI | default false }}
provider:
type: {{ .Values.config.provider.type | default "apisix" }}
sync_period: {{ .Values.config.provider.syncPeriod | default "1s" }}
Expand Down
5 changes: 3 additions & 2 deletions charts/apisix-ingress-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ deployment:
image:
repository: apache/apisix-ingress-controller
pullPolicy: IfNotPresent
tag: "2.0.0-rc5"
tag: "2.0.0"
# -- Set pod resource requests & limits
resources: {}

# -- Set adc sidecar container configuration
adcContainer:
image:
repository: ghcr.io/api7/adc
tag: "0.22.1"
tag: "0.23.1"
config:
logLevel: "info"

Expand All @@ -90,6 +90,7 @@ config:
probeAddr: ":8081"
secureMetrics: false
execADCTimeout: "15s"
disableGatewayAPI: false
provider:
type: "apisix"
syncPeriod: "1m"
Expand Down
2 changes: 1 addition & 1 deletion charts/apisix/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ 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.deployment.standalone | object | `{"config":"routes:\n-\n uri: /hi\n upstream:\n nodes:\n \"127.0.0.1:1980\": 1\n type: roundrobin\n","existingConfigMap":""}` | Standalone rules configuration ref: https://apisix.apache.org/docs/apisix/deployment-modes/#standalone |
| apisix.deployment.standalone.config | string | `"routes:\n-\n uri: /hi\n upstream:\n nodes:\n \"127.0.0.1:1980\": 1\n type: roundrobin\n"` | Rules which are set to the default apisix.yaml configmap. If apisix.delpoyment.standalone.existingConfigMap is empty, these are used. |
| apisix.deployment.standalone.existingConfigMap | string | `""` | Specifies the name of the ConfigMap that contains the rule configurations. The configuration must be set to the key named `apisix.yaml` in the configmap. |
| 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 | `{}` | Service discovery registry. Refer to [configuration under discovery](https://github.com/apache/apisix/blob/master/conf/config.yaml.example#L307) for example. Also see [example of using external service discovery](https://apisix.apache.org/docs/ingress-controller/1.8.0/tutorials/external-service-discovery/). |
| apisix.dns.resolvers[0] | string | `"127.0.0.1"` | |
Expand Down