-
Notifications
You must be signed in to change notification settings - Fork 212
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Due to the refactoring of APISIX Helm chart, we plan to maintain it through the dev branch. Signed-off-by: Jintao Zhang <[email protected]>
Signed-off-by: Ling Samuel (WSL) <[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
Signed-off-by: Nic <[email protected]>
nic-6443
force-pushed
the
nic/merge-dev-to-main
branch
from
March 18, 2024 09:55
5eda944
to
b34bca2
Compare
nic-6443
requested review from
starsz,
Revolyssup,
AlinsRan and
shreemaan-abhishek
March 18, 2024 09:56
Revolyssup
approved these changes
Mar 18, 2024
Co-authored-by: Abhishek Choudhary <[email protected]>
shreemaan-abhishek
approved these changes
Mar 19, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.