3aa69e5eda
k8s 1.33 에서 Deployment/ReplicaSet 에 추가된 .status.terminatingReplicas 를
ArgoCD v2.14.5(k8s 라이브러리 0.31/0.32)가 몰라, 클러스터가 1.33 이상이면
ServerSideApply=true 인 Application 이 전부 아래 오류로 죽는다.
ComparisonError: failed to calculate diff: error calculating structured
merge diff: .status.terminatingReplicas: field not declared in schema
v3.5.1 은 k8s 라이브러리 0.36.1 을 써서 해소된다. dev 클러스터(1.35.7+rke2r1)
에서 실제 발생·해소를 확인했다.
- manifests/helm/argo-cd/10.4.0/ 추가 (chart_updater 로 생성)
- custom-values.yaml 을 실제 배포 기준(dipup argo-cd-values.yaml.tpl)에 맞춤:
kong → apisix, server.extraArgs(--insecure), configs.cm/rbac 추가
- configs.params.controller.resource.health.persist=true 지정 —
ArgoCD v3.0 부터 리소스 health 를 CR 에 저장하지 않는 것이 기본값인데,
dip-console-api 가 .status.resources[].health 를 읽는다
- CUSTOM-README.md 는 현재 차트 기준 배포 가이드로 재작성.
승계된 cert-manager 예시가 10.4.0 에 없는 구버전 스키마(hosts/tls 리스트)라
Ingress 가 생성되지 않는 상태였던 것도 함께 수정
- breaking_change_check: breaking=false (제거 26건이 전부 미사용 key)
- scripts/deploy-test/deploy-test-argo-cd.sh 신규
같은 클러스터에 두 번째 argo-cd 를 띄우려면 crds.install=false 가 필수다 —
CRD 3종이 클러스터 전역이고 운영 릴리스가 소유해 Helm 이 ownership 충돌로
거부한다. Ingress 도 항상 끈다(운영과 host 충돌).
검증: 워크로드 롤아웃 / health.persist / api 버전 / admin 로그인
- argo-cd/7.8.11/BUILD-README.md 에 `helm repo add argo ...` 추가
chart_version_detector 가 이 한 줄을 정규식으로 뽑아 업스트림 레포를 정하는데,
argo-cd 에는 없어서 신규 버전 자동 감지가 조용히 실패하고 있었다
(repo: null → latest_version: null). CLAUDE.md 의 "변경 금지" 규정도
실제 파싱 계약에 맞게 정정했다.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
224 lines
9.1 KiB
YAML
224 lines
9.1 KiB
YAML
{{- $redisHa := index .Values "redis-ha" -}}
|
|
{{- if and .Values.redis.enabled (not $redisHa.enabled) -}}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
{{- with (mergeOverwrite (deepCopy .Values.global.deploymentAnnotations) .Values.redis.deploymentAnnotations) }}
|
|
annotations:
|
|
{{- range $key, $value := . }}
|
|
{{ $key }}: {{ $value | quote }}
|
|
{{- end }}
|
|
{{- end }}
|
|
name: {{ include "argo-cd.redis.fullname" . }}
|
|
namespace: {{ include "argo-cd.namespace" . }}
|
|
labels:
|
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 4 }}
|
|
{{- with (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.redis.deploymentLabels) }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
spec:
|
|
replicas: 1
|
|
revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
|
|
selector:
|
|
matchLabels:
|
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 8 }}
|
|
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.redis.podLabels) }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.redis.podAnnotations) }}
|
|
annotations:
|
|
{{- range $key, $value := . }}
|
|
{{ $key }}: {{ $value | quote }}
|
|
{{- end }}
|
|
{{- end }}
|
|
spec:
|
|
{{- with .Values.redis.runtimeClassName | default .Values.global.runtimeClassName }}
|
|
runtimeClassName: {{ . }}
|
|
{{- end }}
|
|
{{- with .Values.redis.imagePullSecrets | default .Values.global.imagePullSecrets }}
|
|
imagePullSecrets:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.global.hostAliases }}
|
|
hostAliases:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.securityContext }}
|
|
securityContext:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.priorityClassName | default .Values.global.priorityClassName }}
|
|
priorityClassName: {{ . }}
|
|
{{- end }}
|
|
{{- if .Values.redis.terminationGracePeriodSeconds }}
|
|
terminationGracePeriodSeconds: {{ .Values.redis.terminationGracePeriodSeconds }}
|
|
{{- end }}
|
|
serviceAccountName: {{ include "argo-cd.redis.serviceAccountName" . }}
|
|
automountServiceAccountToken: {{ .Values.redis.automountServiceAccountToken }}
|
|
containers:
|
|
- name: {{ .Values.redis.name }}
|
|
image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
|
|
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.redis.image.imagePullPolicy }}
|
|
args:
|
|
{{- with .Values.redis.extraArgs }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
- --save
|
|
- ""
|
|
- --appendonly
|
|
- "no"
|
|
- --requirepass $(REDIS_PASSWORD)
|
|
env:
|
|
- name: REDIS_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: argocd-redis
|
|
key: auth
|
|
{{- with (concat .Values.global.env .Values.redis.env) }}
|
|
{{- tpl (toYaml .) $ | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.envFrom }}
|
|
envFrom:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.redis.livenessProbe.enabled }}
|
|
livenessProbe:
|
|
initialDelaySeconds: {{ .Values.redis.livenessProbe.initialDelaySeconds }}
|
|
periodSeconds: {{ .Values.redis.livenessProbe.periodSeconds }}
|
|
timeoutSeconds: {{ .Values.redis.livenessProbe.timeoutSeconds }}
|
|
successThreshold: {{ .Values.redis.livenessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.redis.livenessProbe.failureThreshold }}
|
|
exec:
|
|
command:
|
|
- sh
|
|
- -c
|
|
- /health/redis_liveness.sh
|
|
{{- end }}
|
|
{{- if .Values.redis.readinessProbe.enabled }}
|
|
readinessProbe:
|
|
initialDelaySeconds: {{ .Values.redis.readinessProbe.initialDelaySeconds }}
|
|
periodSeconds: {{ .Values.redis.readinessProbe.periodSeconds }}
|
|
timeoutSeconds: {{ .Values.redis.readinessProbe.timeoutSeconds }}
|
|
successThreshold: {{ .Values.redis.readinessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.redis.readinessProbe.failureThreshold }}
|
|
exec:
|
|
command:
|
|
- sh
|
|
- -c
|
|
- /health/redis_readiness.sh
|
|
{{- end }}
|
|
ports:
|
|
- name: redis
|
|
containerPort: {{ .Values.redis.containerPorts.redis }}
|
|
protocol: TCP
|
|
resources:
|
|
{{- toYaml .Values.redis.resources | nindent 10 }}
|
|
{{- with .Values.redis.containerSecurityContext }}
|
|
securityContext:
|
|
{{- toYaml . | nindent 10 }}
|
|
{{- end }}
|
|
volumeMounts:
|
|
- mountPath: /health
|
|
name: health
|
|
{{- with .Values.redis.volumeMounts }}
|
|
{{- toYaml . | nindent 10 }}
|
|
{{- end }}
|
|
{{- if .Values.redis.exporter.enabled }}
|
|
- name: metrics
|
|
image: {{ .Values.redis.exporter.image.repository }}:{{ .Values.redis.exporter.image.tag }}
|
|
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.redis.exporter.image.imagePullPolicy }}
|
|
env:
|
|
- name: REDIS_ADDR
|
|
value: {{ printf "redis://localhost:%v" .Values.redis.containerPorts.redis }}
|
|
- name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
|
|
value: {{ printf "0.0.0.0:%v" .Values.redis.containerPorts.metrics }}
|
|
- name: REDIS_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: argocd-redis
|
|
key: auth
|
|
{{- with (concat .Values.global.env .Values.redis.exporter.env) }}
|
|
{{- tpl (toYaml .) $ | nindent 8 }}
|
|
{{- end }}
|
|
ports:
|
|
- name: metrics
|
|
containerPort: {{ .Values.redis.containerPorts.metrics }}
|
|
protocol: TCP
|
|
{{- if .Values.redis.exporter.livenessProbe.enabled }}
|
|
livenessProbe:
|
|
httpGet:
|
|
path: /metrics
|
|
port: {{ .Values.redis.containerPorts.metrics }}
|
|
initialDelaySeconds: {{ .Values.redis.exporter.livenessProbe.initialDelaySeconds }}
|
|
timeoutSeconds: {{ .Values.redis.exporter.livenessProbe.timeoutSeconds }}
|
|
periodSeconds: {{ .Values.redis.exporter.livenessProbe.periodSeconds }}
|
|
successThreshold: {{ .Values.redis.exporter.livenessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.redis.exporter.livenessProbe.failureThreshold }}
|
|
{{- end }}
|
|
{{- if .Values.redis.exporter.readinessProbe.enabled }}
|
|
readinessProbe:
|
|
httpGet:
|
|
path: /metrics
|
|
port: {{ .Values.redis.containerPorts.metrics }}
|
|
initialDelaySeconds: {{ .Values.redis.exporter.readinessProbe.initialDelaySeconds }}
|
|
timeoutSeconds: {{ .Values.redis.exporter.readinessProbe.timeoutSeconds }}
|
|
periodSeconds: {{ .Values.redis.exporter.readinessProbe.periodSeconds }}
|
|
successThreshold: {{ .Values.redis.exporter.readinessProbe.successThreshold }}
|
|
failureThreshold: {{ .Values.redis.exporter.readinessProbe.failureThreshold }}
|
|
{{- end }}
|
|
resources:
|
|
{{- toYaml .Values.redis.exporter.resources | nindent 10 }}
|
|
{{- with .Values.redis.exporter.containerSecurityContext }}
|
|
securityContext:
|
|
{{- toYaml . | nindent 10 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- with .Values.redis.extraContainers }}
|
|
{{- tpl (toYaml .) $ | nindent 6 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.initContainers }}
|
|
initContainers:
|
|
{{- tpl (toYaml .) $ | nindent 6 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.nodeSelector | default .Values.global.nodeSelector }}
|
|
nodeSelector:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.tolerations | default .Values.global.tolerations }}
|
|
tolerations:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with include "argo-cd.affinity" (dict "context" . "component" .Values.redis) }}
|
|
affinity:
|
|
{{- trim . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.redis.topologySpreadConstraints | default .Values.global.topologySpreadConstraints }}
|
|
topologySpreadConstraints:
|
|
{{- range $constraint := . }}
|
|
- {{ toYaml $constraint | nindent 8 | trim }}
|
|
{{- if not $constraint.labelSelector }}
|
|
labelSelector:
|
|
matchLabels:
|
|
app.kubernetes.io/name: {{ include "argo-cd.name" $ }}-{{ $.Values.redis.name }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
volumes:
|
|
- name: health
|
|
configMap:
|
|
name: {{ include "argo-cd.redis.fullname" . }}-health-configmap
|
|
defaultMode: 493
|
|
{{- with .Values.redis.volumes }}
|
|
{{- toYaml . | nindent 8}}
|
|
{{- end }}
|
|
{{- with .Values.redis.dnsConfig }}
|
|
dnsConfig:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
dnsPolicy: {{ .Values.redis.dnsPolicy }}
|
|
{{- end }}
|