wbsong111
3d3d508d04
hardened-containers가 apisix 3.17 라인 EOL로 3.18.0을 게이트 PASS로 새로 발행했다
(hardened-containers 커밋 3518f98: "3.17 line went EOL"). 이게 이 카탈로그의
차트 버전 갱신 트리거다 — appVersion을 3.18로 맞추려면 차트도 2.17.0(appVersion
3.18.0)으로 올려야 한다.
breaking_change_check: breaking=false. 다만 자동 diff가 못 잡는 실제 변경을
수동으로 하나 찾았다 — ingress-controller.enabled=true로 켜서 쓰는
apisix-ingress-controller 서브차트(1.2.0→1.3.0)에 새 CRD
l4routepolicies.apisix.apache.org가 추가됐다. helm_diff는 이 서브차트를 기본값
(off)으로만 렌더링해 애초에 스캔 대상에서 빠뜨린다 — CUSTOM-README.md에 수동
적용 안내를 남기고, 이 사각지대 자체를 catalog-update-pipeline SKILL.md에
기록해 다음 리뷰 때 놓치지 않게 했다.
catalog/image-map/{apisix,apisix-ingress-controller,adc}.env의 CHART_DIRS를
2.17.0으로 교체(2.16.0은 동결)하고, apply-published-tags.py로 발행된 실제 태그
(apisix 3.18.0-20260826, ingress-controller/adc는 최근 재스캔 리빌드분)를 반영했다.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
125 lines
4.5 KiB
YAML
125 lines
4.5 KiB
YAML
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
# The ASF licenses this file to You under the Apache License, Version 2.0
|
|
# (the "License"); you may not use this file except in compliance with
|
|
# the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: {{ include "apisix.fullname" . }}-gateway
|
|
namespace: {{ .Release.Namespace }}
|
|
annotations:
|
|
{{- range $key, $value := .Values.service.annotations }}
|
|
{{ $key }}: {{ $value | quote }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "apisix.labels" . | nindent 4 }}
|
|
app.kubernetes.io/service: apisix-gateway
|
|
spec:
|
|
type: {{ .Values.service.type }}
|
|
externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
|
|
{{- if eq .Values.service.type "LoadBalancer" }}
|
|
{{- if .Values.service.loadBalancerIP }}
|
|
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
|
|
{{- end }}
|
|
{{- if .Values.service.loadBalancerSourceRanges }}
|
|
loadBalancerSourceRanges:
|
|
{{- range $cidr := .Values.service.loadBalancerSourceRanges }}
|
|
- {{ $cidr }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if gt (len .Values.service.externalIPs) 0 }}
|
|
externalIPs:
|
|
{{- range $ip := .Values.service.externalIPs }}
|
|
- {{ $ip }}
|
|
{{- end }}
|
|
{{- end }}
|
|
ports:
|
|
{{- if .Values.service.http.enabled }}
|
|
- name: apisix-gateway
|
|
port: {{ .Values.service.http.servicePort }}
|
|
targetPort: {{ .Values.service.http.containerPort }}
|
|
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.http.nodePort))) }}
|
|
nodePort: {{ .Values.service.http.nodePort }}
|
|
{{- end }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- range .Values.service.http.additionalContainerPorts }}
|
|
- name: apisix-gateway-{{ .port | toString }}
|
|
port: {{ .port }}
|
|
targetPort: {{ .port }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- if or .Values.apisix.ssl.enabled }}
|
|
- name: apisix-gateway-tls
|
|
port: {{ .Values.service.tls.servicePort }}
|
|
targetPort: {{ .Values.apisix.ssl.containerPort }}
|
|
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.tls.nodePort))) }}
|
|
nodePort: {{ .Values.service.tls.nodePort }}
|
|
{{- end }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- range .Values.apisix.ssl.additionalContainerPorts }}
|
|
- name: apisix-gateway-tls-{{ .port | toString }}
|
|
port: {{ .port }}
|
|
targetPort: {{ .port }}
|
|
{{- end }}
|
|
{{- if .Values.apisix.proxyProtocol.listenHttpPort }}
|
|
- name: apisix-gateway-pp
|
|
port: {{ .Values.apisix.proxyProtocol.listenHttpPort }}
|
|
targetPort: {{ .Values.apisix.proxyProtocol.listenHttpPort }}
|
|
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.apisix.proxyProtocol.listenHttpNodePort))) }}
|
|
nodePort: {{ .Values.apisix.proxyProtocol.listenHttpNodePort }}
|
|
{{- end }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- if .Values.apisix.proxyProtocol.listenHttpsPort }}
|
|
- name: apisix-gateway-pp-tls
|
|
port: {{ .Values.apisix.proxyProtocol.listenHttpsPort }}
|
|
targetPort: {{ .Values.apisix.proxyProtocol.listenHttpsPort }}
|
|
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.apisix.proxyProtocol.listenHttpsNodePort))) }}
|
|
nodePort: {{ .Values.apisix.proxyProtocol.listenHttpsNodePort }}
|
|
{{- end }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- if and .Values.service.stream.enabled (or (gt (len .Values.service.stream.tcp) 0) (gt (len .Values.service.stream.udp) 0)) }}
|
|
{{- with .Values.service.stream }}
|
|
{{- if (gt (len .tcp) 0) }}
|
|
{{- range $index, $port := .tcp }}
|
|
- name: proxy-tcp-{{ $index | toString }}
|
|
{{- if kindIs "map" $port }}
|
|
port: {{ splitList ":" ($port.addr | toString) | last }}
|
|
targetPort: {{ splitList ":" ($port.addr | toString) | last }}
|
|
protocol: TCP
|
|
{{- else }}
|
|
port: {{ $port }}
|
|
targetPort: {{ $port }}
|
|
protocol: TCP
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if (gt (len .udp) 0) }}
|
|
{{- range $index, $port := .udp }}
|
|
- name: proxy-udp-{{ $index | toString }}
|
|
port: {{ $port }}
|
|
targetPort: {{ $port }}
|
|
protocol: UDP
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
selector:
|
|
{{- include "apisix.selectorLabels" . | nindent 4 }}
|