From 9fd882f180477d85c65857be1721b50be94f7668 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 24 Jul 2025 21:21:14 +0800 Subject: [PATCH] fix: add K_8S compatibility keys to reconciler-config secret --- .../reconciler/templates/reconciler/deployment.yaml | 12 +++++++++++- .../templates/reconciler/reconciler-config.yaml | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/deployment.yaml b/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/deployment.yaml index 138c37d3..385e7e09 100644 --- a/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/deployment.yaml +++ b/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/deployment.yaml @@ -6,10 +6,12 @@ metadata: app.kubernetes.io/name: "reconciler" app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} +{{/* logIngest related code commented out {{- if .Values.logIngest.enabled }} annotations: opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }} {{- end }} +*/}} name: "reconciler" namespace: {{ .Release.Namespace | quote }} spec: @@ -29,14 +31,18 @@ spec: app.kubernetes.io/instance: {{ .Release.Name }} annotations: app.kubernetes.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/reconciler-config.yaml") . | sha256sum }} +{{/* logIngest related code commented out {{- if .Values.logIngest.enabled }} opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }} sidecar.opentelemetry.io/inject: "{{ .Release.Namespace}}/{{ .Release.Name }}-opentelemetry-collector" {{- end }} +*/}} spec: +{{/* logIngest related code commented out {{- if .Values.logIngest.enabled }} serviceAccountName: "{{ .Release.Name }}-otel-collector" {{- end }} +*/}} containers: - name: "reconciler" image: "{{ coalesce .Values.reconciler.image.registry .Values.global.registry "docker.io"}}/{{ coalesce .Values.reconciler.image.repository .Values.global.repository }}/{{ .Values.reconciler.image.name }}:{{ .Values.reconciler.image.tag | default "latest" }}" @@ -109,13 +115,17 @@ spec: name: reconciler-config key: {{ $key | snakecase | upper }} {{- end }} +{{/* logIngest related code commented out {{- if .Values.logIngest.enabled }} volumeMounts: - name: app-logs mountPath: {{ .Values.logIngest.logPath }} {{- end }} +*/}} +{{/* logIngest related code commented out {{- if .Values.logIngest.enabled }} volumes: - name: app-logs emptyDir: {} -{{- end }} \ No newline at end of file +{{- end }} +*/}} \ No newline at end of file diff --git a/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/reconciler-config.yaml b/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/reconciler-config.yaml index e8e8cc45..da905c8c 100644 --- a/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/reconciler-config.yaml +++ b/freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/reconciler-config.yaml @@ -7,6 +7,8 @@ type: Opaque data: DEBUG: {{ .Values.reconciler.configs.debug | b64enc | quote }} K8S_CLUSTER_DOMAIN: {{ .Values.reconciler.configs.k8sClusterDomain | b64enc | quote }} + K_8S_CLUSTER_DOMAIN: {{ .Values.reconciler.configs.k8sClusterDomain | b64enc | quote }} + AUTO_DISCOVER_K8S_CLUSTER_DOMAIN_MAX_RETRIES: {{ .Values.reconciler.configs.autoDiscoverK8sClusterDomainMaxRetries | toString | b64enc | quote }} AUTO_DISCOVER_K_8S_CLUSTER_DOMAIN_MAX_RETRIES: {{ .Values.reconciler.configs.autoDiscoverK8sClusterDomainMaxRetries | toString | b64enc | quote }} RABBITMQ_HOST: {{ .Values.reconciler.configs.rabbitmqHost | b64enc | quote }} RABBITMQ_PORT: {{ .Values.reconciler.configs.rabbitmqPort | toString | b64enc | quote }}