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

[bitnami/apisix] chore: ♻️ ⬆️ Update common and remove k8s < 1.23 references (#33335)

Browse Source
This commit is contained in:
Javier J. Salmerón García
2025-05-06 17:49:56 +02:00
committed by GitHub
parent b7f58b18d9
commit 21f0df7910
11 changed files with 15 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/apisix/CHANGELOG.md
View File

@@ -1,8 +1,12 @@
# Changelog
## 4.2.3 (2025-05-01)
## 4.2.4 (2025-05-06)
* [bitnami/apisix] Release 4.2.3 ([#33277](https://github.com/bitnami/charts/pull/33277))
* [bitnami/apisix] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33335](https://github.com/bitnami/charts/pull/33335))
## <small>4.2.3 (2025-05-01)</small>
* [bitnami/apisix] Release 4.2.3 (#33277) ([89b5e15](https://github.com/bitnami/charts/commit/89b5e15a29e6dbdcb8582e951ac9b647fbf96f27)), closes [#33277](https://github.com/bitnami/charts/issues/33277)
## <small>4.2.2 (2025-04-01)</small>

8
bitnami/apisix/Chart.lock
View File

@@ -1,9 +1,9 @@
dependencies:
- name: etcd
repository: oci://registry-1.docker.io/bitnamicharts
version: 11.3.0
version: 11.3.1
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.30.2
digest: sha256:807ee24cb1dba72058f000e12e7d90edeb75682b9df74acd589ad80f4c367b8a
generated: "2025-05-01T09:12:47.894270481Z"
version: 2.31.0
digest: sha256:8d8beef787f2298795fa51532d23c9b5008463801dbeb1921fa93b2284701459
generated: "2025-05-06T09:50:47.923015451+02:00"

2
bitnami/apisix/Chart.yaml
View File

@@ -46,4 +46,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: 4.2.3
version: 4.2.4

8
bitnami/apisix/templates/control-plane/hpa.yaml
View File

@@ -25,24 +25,16 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.controlPlane.autoscaling.hpa.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.controlPlane.autoscaling.hpa.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.controlPlane.autoscaling.hpa.targetMemory }}
- type: Resource
resource:
name: memory
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.controlPlane.autoscaling.hpa.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.controlPlane.autoscaling.hpa.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

6
bitnami/apisix/templates/control-plane/ingress.yaml
View File

@@ -17,7 +17,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.controlPlane.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
{{- if .Values.controlPlane.ingress.ingressClassName }}
ingressClassName: {{ .Values.controlPlane.ingress.ingressClassName | quote }}
{{- end }}
rules:
@@ -30,9 +30,7 @@ spec:
{{- toYaml .Values.controlPlane.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.controlPlane.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.controlPlane.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.control-plane.fullname" . | trunc 63 | trimSuffix "-") "servicePort" $servicePort "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.controlPlane.ingress.extraHosts }}
@@ -40,9 +38,7 @@ spec:
http:
paths:
- path: {{ default "/" .path }}
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.control-plane.fullname" $ | trunc 63 | trimSuffix "-") "servicePort" $servicePort "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.controlPlane.ingress.extraRules }}

8
bitnami/apisix/templates/dashboard/hpa.yaml
View File

@@ -27,24 +27,16 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.dashboard.autoscaling.hpa.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.dashboard.autoscaling.hpa.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.dashboard.autoscaling.hpa.targetMemory }}
- type: Resource
resource:
name: memory
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.dashboard.autoscaling.hpa.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.dashboard.autoscaling.hpa.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

6
bitnami/apisix/templates/dashboard/ingress.yaml
View File

@@ -19,7 +19,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.dashboard.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
{{- if .Values.dashboard.ingress.ingressClassName }}
ingressClassName: {{ .Values.dashboard.ingress.ingressClassName | quote }}
{{- end }}
rules:
@@ -31,9 +31,7 @@ spec:
{{- toYaml .Values.dashboard.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.dashboard.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.dashboard.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.dashboard.fullname" . | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.dashboard.ingress.extraHosts }}
@@ -41,9 +39,7 @@ spec:
http:
paths:
- path: {{ default "/" .path }}
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.dashboard.fullname" $ | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.dashboard.ingress.extraRules }}

8
bitnami/apisix/templates/data-plane/hpa.yaml
View File

@@ -25,24 +25,16 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.dataPlane.autoscaling.hpa.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.dataPlane.autoscaling.hpa.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.dataPlane.autoscaling.hpa.targetMemory }}
- type: Resource
resource:
name: memory
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.dataPlane.autoscaling.hpa.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.dataPlane.autoscaling.hpa.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

6
bitnami/apisix/templates/data-plane/ingress.yaml
View File

@@ -17,7 +17,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.dataPlane.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
{{- if .Values.dataPlane.ingress.ingressClassName }}
ingressClassName: {{ .Values.dataPlane.ingress.ingressClassName | quote }}
{{- end }}
rules:
@@ -29,9 +29,7 @@ spec:
{{- toYaml .Values.dataPlane.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.dataPlane.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.dataPlane.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.data-plane.fullname" . | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.dataPlane.ingress.extraHosts }}
@@ -39,9 +37,7 @@ spec:
http:
paths:
- path: {{ default "/" .path }}
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.data-plane.fullname" $ | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.dataPlane.ingress.extraRules }}

8
bitnami/apisix/templates/ingress-controller/hpa.yaml
View File

@@ -27,24 +27,16 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.ingressController.autoscaling.hpa.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.ingressController.autoscaling.hpa.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.ingressController.autoscaling.hpa.targetMemory }}
- type: Resource
resource:
name: memory
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.ingressController.autoscaling.hpa.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.ingressController.autoscaling.hpa.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

6
bitnami/apisix/templates/ingress-controller/ingress.yaml
View File

@@ -19,7 +19,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.ingressController.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
{{- if .Values.ingressController.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingressController.ingress.ingressClassName | quote }}
{{- end }}
rules:
@@ -31,9 +31,7 @@ spec:
{{- toYaml .Values.ingressController.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.ingressController.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingressController.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.ingress-controller.fullname" . | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingressController.ingress.extraHosts }}
@@ -41,9 +39,7 @@ spec:
http:
paths:
- path: {{ default "/" .path }}
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "apisix.ingress-controller.fullname" $ | trunc 63 | trimSuffix "-") "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.ingressController.ingress.extraRules }}