Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-08 17:27:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/apisix] Add IngressClass for Ingress Controller (#27568)

Browse Source
This commit is contained in:
Juan Ariza Toledano
2024-06-28 16:04:28 +02:00
committed by GitHub
parent 614604a747
commit 40b3153cf6
7 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.vib/apisix/vib-action.config Normal file
View File

@@ -0,0 +1 @@
verification-mode=SERIAL

9
bitnami/apisix/CHANGELOG.md
View File

@@ -1,8 +1,13 @@
# Changelog
## 3.2.5 (2024-06-18)
## 3.3.0 (2024-06-28)
* [bitnami/apisix] Fixes to support running Apisix in standalone mode ([#27062](https://github.com/bitnami/charts/pull/27062))
* [bitnami/apisix] Add IngressClass for Ingress Controller ([#27568](https://github.com/bitnami/charts/pull/27568))
## <small>3.2.5 (2024-06-20)</small>
* [bitnami/apisix] Fix typo Mastodon -> APISIX (#27433) ([a5d7c12](https://github.com/bitnami/charts/commit/a5d7c12f999559bd982cf0516f93241f6db253a1)), closes [#27433](https://github.com/bitnami/charts/issues/27433)
* [bitnami/apisix] Fixes to support running Apisix in standalone mode (#27062) ([272a58e](https://github.com/bitnami/charts/commit/272a58e82291f619fed91936bd117151e3d68db4)), closes [#27062](https://github.com/bitnami/charts/issues/27062)
## <small>3.2.4 (2024-06-18)</small>

2
bitnami/apisix/Chart.yaml
View File

@@ -45,4 +45,4 @@ sources:
- https://github.com/bitnami/charts/tree/main/bitnami/apisix
- https://github.com/bitnami/charts/tree/main/bitnami/apisix-dashboard
- https://github.com/bitnami/charts/tree/main/bitnami/apisix-ingress-controller
version: 3.2.5
version: 3.3.0

2
bitnami/apisix/README.md
View File

@@ -892,6 +892,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
| `ingressController.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the APISIX Ingress Controller container(s) | `[]` |
| `ingressController.sidecars` | Add additional sidecar containers to the APISIX Ingress Controller pod(s) | `[]` |
| `ingressController.initContainers` | Add additional init containers to the APISIX Ingress Controller pod(s) | `[]` |
| `ingressController.ingressClass.name` | IngressClass that will be be used to implement the APISIX Ingress | `apisix` |
| `ingressController.ingressClass.annotations` | Additional annotations for the APISIX IngressClass | `{}` |
| `ingressController.defaultConfig` | APISIX Dashboard configuration (evaluated as a template) | `""` |
| `ingressController.extraConfig` | Extra configuration parameters for APISIX Ingress Controller | `{}` |
| `ingressController.existingConfigMap` | name of a ConfigMap with existing configuration for the Dashboard | `""` |

8
bitnami/apisix/templates/NOTES.txt
View File

@@ -192,9 +192,15 @@ APISIX Data Plane:
{{- end }}
{{- end }}
{{- if .Values.ingressController.enabled }}
The Ingress Class name to use the APISIX Ingress Controller is: {{ .Values.ingressController.ingressClass.name | quote }}
{{- end }}
{{- include "common.warnings.rollingTag" .Values.image }}
{{- include "common.warnings.rollingTag" .Values.dashboard.image }}
{{- include "common.warnings.rollingTag" .Values.ingressController.image }}
{{- include "apisix.validateValues" . }}
{{- include "common.warnings.resources" (dict "sections" (list "controlPlane" "dashboard" "dataPlane" "ingressController") "context" $) }}
{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.image .Values.dashboard.image .Values.ingressController.image .Values.waitContainer.image) "context" $) }}
{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.image .Values.dashboard.image .Values.ingressController.image .Values.waitContainer.image) "context" $) }}

22
bitnami/apisix/templates/ingress-controller/ingress-class.yaml Normal file
View File

@@ -0,0 +1,22 @@
{{- /*
Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.ingressController.enabled }}
apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
kind: IngressClass
metadata:
name: {{ .Values.ingressController.ingressClass.name }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.ingressController.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/part-of: apisix
app.kubernetes.io/component: ingress-controller
{{- if or .Values.commonAnnotations .Values.ingressController.ingressClass.annotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingressController.ingressClass.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
controller: apisix.apache.org/apisix-ingress
{{- end }}

8
bitnami/apisix/values.yaml
View File

@@ -2676,6 +2676,12 @@ ingressController:
## command: ['sh', '-c', 'echo "hello world"']
##
initContainers: []
## @param ingressController.ingressClass.name IngressClass that will be be used to implement the APISIX Ingress
## @param ingressController.ingressClass.annotations Additional annotations for the APISIX IngressClass
##
ingressClass:
name: "apisix"
annotations: {}
## @param ingressController.defaultConfig [string] APISIX Dashboard configuration (evaluated as a template)
##
defaultConfig: |
@@ -2695,7 +2701,7 @@ ingressController:
kubeconfig: ""
resync_interval: "6h"
election_id: "{{ include "apisix.ingress-controller.fullname" . }}-leader"
ingress_class: "apisix"
ingress_class: {{ .Values.ingressController.ingressClass.name | quote }}
ingress_version: "networking/v1"
watch_endpointslices: false
apisix_route_version: "apisix.apache.org/v2"