Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: promote apisix v2.x helm chart to default branch #733

Merged
merged 20 commits into from
Mar 19, 2024

Conversation

nic-6443
Copy link
Member

@nic-6443 nic-6443 commented Mar 18, 2024

The 2.x Helm chart maintained on the dev branch has undergone several iterations and is also set as the default installation version for the helm install apisix apisix/apisix command. It is time to merge the 2.x version into the master branch as the active development version going forward.

lingsamuel and others added 19 commits June 8, 2023 16:27
Due to the refactoring of APISIX Helm chart, we plan to maintain it
through the dev branch.

Signed-off-by: Jintao Zhang <[email protected]>
Depending on the setup, it can be useful to change this value. For
example, if using load balancer which already has 60 second timeout,
then this timeout should be larger to avoid ungraceful TCP connection
closes.

This is the same as `upstream-keepalive-timeout` in ingress nginx
controller.
Previously it used `service.http.servicePort` in the Ingress manifest.
This made it impossible to forward ingress traffic to TLS port. One
option was to disable `http` and change `http.servicePort` to `443`, but
then regular HTTP couldn't be used.

This commit allows changing Ingress service port using
`ingress.servicePort`. It still falls back to `service.http.servicePort`
to keep backwards compatibility.
The `extraDeploy` option is something that is available in many helm
charts (expecially bitnami charts). It is useful for deploying extra
resources with the release. E.g. with Apisix you could deploy
ApisixGlobalRule.

This commit adds a very simple version of the extraDeploy.

E.g. Using as a string:

```
extraDeploy:
  - |
    apiVersion: apisix.apache.org/v2
    kind: ApisixGlobalRule
    metadata:
      name: global
    spec:
      plugins:
        - name: response-rewrite
          enable: true
          config:
            headers:
              remove:
                - Server
```

can also use it as a map:

```
  - apiVersion: apisix.apache.org/v2
    kind: ApisixGlobalRule
    metadata:
      name: global
    spec:
      plugins:
        - name: response-rewrite
          enable: true
          config:
            headers:
              remove:
                - Server
```
This was introduced for the chart v1 in [546][1]. This commit introduced
the same functionality for the chart v2 as well.

[1]: apache#546
* add standalone support with helm chart

Signed-off-by: Ashish Tiwari <[email protected]>

* Update charts/apisix/templates/apisix-config-cm.yml

---------

Signed-off-by: Ashish Tiwari <[email protected]>
Co-authored-by: Abhishek Choudhary <[email protected]>
apache#684)

Changes included:
* e91048d - feat: add standalone support with helm chart (apache#671)
* apisix-ingress-controller chart version change from 0.12.2 to 0.13.0
* apisix-dashboard chart version change from 0.8.0 to 0.8.1
.github/workflows/ci.yaml Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Co-authored-by: Abhishek Choudhary <[email protected]>
@nic-6443 nic-6443 merged commit d75cc71 into apache:master Mar 19, 2024
8 checks passed
@nic-6443 nic-6443 deleted the nic/merge-dev-to-main branch March 19, 2024 13:34
nic-6443 added a commit to nic-6443/apisix-helm-chart that referenced this pull request Mar 20, 2024
nic-6443 added a commit that referenced this pull request Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants