diff --git a/charts/apisix-ingress-controller/README.md b/charts/apisix-ingress-controller/README.md index 62e57ddd..5436ab04 100644 --- a/charts/apisix-ingress-controller/README.md +++ b/charts/apisix-ingress-controller/README.md @@ -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` | | @@ -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. | diff --git a/charts/apisix-ingress-controller/crds/apisixic-crds.yaml b/charts/apisix-ingress-controller/crds/apisixic-crds.yaml index c58c05ba..7dc2e951 100644 --- a/charts/apisix-ingress-controller/crds/apisixic-crds.yaml +++ b/charts/apisix-ingress-controller/crds/apisixic-crds.yaml @@ -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: |- @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: @@ -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`. diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml b/charts/apisix-ingress-controller/templates/configmap.yaml index 82a6da62..799aa012 100644 --- a/charts/apisix-ingress-controller/templates/configmap.yaml +++ b/charts/apisix-ingress-controller/templates/configmap.yaml @@ -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" }} diff --git a/charts/apisix-ingress-controller/values.yaml b/charts/apisix-ingress-controller/values.yaml index 246b72da..da48023f 100644 --- a/charts/apisix-ingress-controller/values.yaml +++ b/charts/apisix-ingress-controller/values.yaml @@ -64,7 +64,7 @@ deployment: image: repository: apache/apisix-ingress-controller pullPolicy: IfNotPresent - tag: "2.0.0-rc5" + tag: "2.0.0" # -- Set pod resource requests & limits resources: {} @@ -72,7 +72,7 @@ deployment: adcContainer: image: repository: ghcr.io/api7/adc - tag: "0.22.1" + tag: "0.23.1" config: logLevel: "info" @@ -90,6 +90,7 @@ config: probeAddr: ":8081" secureMetrics: false execADCTimeout: "15s" + disableGatewayAPI: false provider: type: "apisix" syncPeriod: "1m" diff --git a/charts/apisix/README.md b/charts/apisix/README.md index 4faed5bd..5761e983 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -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"` | |