apisix 차트를 2.16.0에서 2.17.0으로 올리고 발행된 3.18.0 자체 빌드 태그를 반영한다
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>
This commit is contained in:
@@ -0,0 +1,202 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# -- Default values for apisix-ingress-controller.
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
#
|
||||
nameOverride: ""
|
||||
|
||||
fullnameOverride: ""
|
||||
|
||||
# -- Override default labels assigned to Apache APISIX ingress controller resource
|
||||
labelsOverride: {}
|
||||
# labelsOverride:
|
||||
# app.kubernetes.io/name: "{{ .Release.Name }}"
|
||||
# app.kubernetes.io/instance: '{{ include "apisix-ingress-controller.name" . }}'
|
||||
|
||||
# -- See https://kubernetes.io/docs/tasks/run-application/configure-pdb/ for more details
|
||||
podDisruptionBudget:
|
||||
# -- Enable or disable podDisruptionBudget
|
||||
enabled: false
|
||||
# -- Set the `minAvailable` of podDisruptionBudget. You can specify only one of `maxUnavailable` and `minAvailable` in a single PodDisruptionBudget.
|
||||
# See [Specifying a Disruption Budget for your Application](https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget)
|
||||
# for more details
|
||||
minAvailable: 90%
|
||||
# -- Set the maxUnavailable of podDisruptionBudget
|
||||
maxUnavailable: 1
|
||||
|
||||
autoscaling:
|
||||
enabled: false
|
||||
minReplicas: 1
|
||||
|
||||
deployment:
|
||||
# -- Add annotations to Apache APISIX ingress controller resource
|
||||
annotations: {}
|
||||
podAnnotations: {}
|
||||
replicas: 1
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
imagePullSecrets: []
|
||||
|
||||
# -- Set security context for the pod
|
||||
# fsGroup: 2000 ensures containers can share Unix socket files via a common group.
|
||||
podSecurityContext:
|
||||
fsGroup: 2000
|
||||
|
||||
# -- Topology Spread Constraints for pod assignment spread across your cluster among failure-domains
|
||||
# ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
|
||||
topologySpreadConstraints: []
|
||||
image:
|
||||
repository: apache/apisix-ingress-controller
|
||||
pullPolicy: IfNotPresent
|
||||
tag: "2.2.0"
|
||||
# -- Set pod resource requests & limits
|
||||
resources: {}
|
||||
|
||||
# -- Set adc sidecar container configuration
|
||||
adcContainer:
|
||||
image:
|
||||
repository: ghcr.io/api7/adc
|
||||
tag: "0.27.1"
|
||||
config:
|
||||
logLevel: "info"
|
||||
|
||||
config:
|
||||
logLevel: "info"
|
||||
controllerName: apisix.apache.org/apisix-ingress-controller
|
||||
leaderElection:
|
||||
id: "apisix-ingress-controller-leader"
|
||||
leaseDuration: "15s"
|
||||
renewDeadline: "10s"
|
||||
retryPeriod: "2s"
|
||||
disable: false
|
||||
metricsAddr: ":8080"
|
||||
enableHTTP2: false
|
||||
probeAddr: ":8081"
|
||||
secureMetrics: false
|
||||
execADCTimeout: "15s"
|
||||
disableGatewayAPI: false
|
||||
listenerPortMatchMode: "auto"
|
||||
provider:
|
||||
type: "apisix"
|
||||
syncPeriod: "1m"
|
||||
initSyncDelay: "20m"
|
||||
kubernetes:
|
||||
ingressClass: apisix
|
||||
defaultIngressClass: false
|
||||
|
||||
# Admission webhook configuration
|
||||
webhook:
|
||||
# -- Enable or disable admission webhook
|
||||
enabled: true
|
||||
# -- The port for the webhook server to listen on
|
||||
port: 9443
|
||||
# -- Failure policy for the webhook (Fail or Ignore)
|
||||
failurePolicy: Ignore
|
||||
# -- Timeout in seconds for the webhook
|
||||
timeoutSeconds: 10
|
||||
certificate:
|
||||
# -- Set to true if you want to provide your own certificate
|
||||
provided: false
|
||||
# -- Secret name containing the certificate (required if provided is true)
|
||||
# secretName: "my-webhook-cert"
|
||||
# -- CA bundle in base64 format (required if provided is true)
|
||||
# caBundle: ""
|
||||
|
||||
# The GatewayProxy resource configures gateway proxy instances including networking,
|
||||
# provider connection, global plugins, and plugin metadata.
|
||||
gatewayProxy:
|
||||
# -- Controls whether to create a default GatewayProxy custom resource.
|
||||
createDefault: false
|
||||
|
||||
# -- Configuration for the GatewayProxy provider connection
|
||||
provider:
|
||||
# -- Specifies the provider type for the GatewayProxy.
|
||||
type: ControlPlane
|
||||
|
||||
# -- ControlPlane provider specific configuration
|
||||
# Either `endpoints` or `service` must be specified, but not both.
|
||||
controlPlane:
|
||||
# -- List of APISIX control plane Admin API endpoints.
|
||||
# example: ["http://apisix-admin.default.svc.cluster.local:9180"]
|
||||
endpoints: []
|
||||
|
||||
# -- Alternatively, reference a Kubernetes Service for the APISIX Admin API.
|
||||
service:
|
||||
name: ""
|
||||
port: 9180
|
||||
|
||||
# -- Authentication configuration for control plane connection
|
||||
auth:
|
||||
# -- Authentication type. Only `AdminKey` is currently supported.
|
||||
# @default -- `AdminKey`
|
||||
type: AdminKey
|
||||
|
||||
# -- AdminKey authentication configuration.
|
||||
# Either `value` or `valueFrom` must be specified, but not both.
|
||||
adminKey:
|
||||
# -- The admin key value for authentication.
|
||||
value: "edd1c9f034335f136f87ad84b625c8f1"
|
||||
|
||||
# -- Reference to admin key stored in a Kubernetes Secret
|
||||
valueFrom: {}
|
||||
# secretKeyRef:
|
||||
# name: apisix-admin-secret
|
||||
# key: admin-key
|
||||
|
||||
# -- List of global plugins to be enabled on the GatewayProxy.
|
||||
plugins: []
|
||||
# - name: cors
|
||||
# enabled: true
|
||||
# config:
|
||||
# allow_origins: "*"
|
||||
# allow_methods: "GET,POST,PUT,DELETE"
|
||||
# - name: ip-restriction
|
||||
# enabled: false
|
||||
# config:
|
||||
# whitelist:
|
||||
# - 10.0.0.0/8
|
||||
# - 192.168.0.0/16
|
||||
|
||||
# -- Global plugin metadata shared by all instances of the same plugin.
|
||||
pluginMetadata: {}
|
||||
# prometheus:
|
||||
# disable: false
|
||||
# export_uri: /apisix/prometheus/metrics
|
||||
|
||||
apisix:
|
||||
adminService:
|
||||
namespace: apisix-ingress
|
||||
name: apisix-admin
|
||||
port: 9180
|
||||
|
||||
serviceMonitor:
|
||||
# -- Enable or disable ServiceMonitor
|
||||
enabled: false
|
||||
# -- @param serviceMonitor.namespace Namespace in which to create the ServiceMonitor
|
||||
namespace: "monitoring"
|
||||
# -- @param serviceMonitor.interval Interval at which metrics should be scraped
|
||||
interval: 15s
|
||||
# -- @param serviceMonitor.labels ServiceMonitor extra labels
|
||||
labels: {}
|
||||
# -- @param serviceMonitor.annotations ServiceMonitor annotations
|
||||
annotations: {}
|
||||
# -- @param serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples before ingestion.
|
||||
# ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
|
||||
metricRelabelings: {}
|
||||
Reference in New Issue
Block a user