icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add K_8S compatibility keys to reconciler-config secret

Browse Source
This commit is contained in:
Nicolas 2025-07-24 21:21:14 +08:00
parent ce5929d44f
commit 9fd882f180
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/deployment.yaml
View File

@ -6,10 +6,12 @@ metadata:
app.kubernetes.io/name: "reconciler" app.kubernetes.io/name: "reconciler"
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{/* logIngest related code commented out
{{- if .Values.logIngest.enabled }} {{- if .Values.logIngest.enabled }}
annotations: annotations:
opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }} opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }}
{{- end }} {{- end }}
*/}}
name: "reconciler" name: "reconciler"
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
spec: spec:
@ -29,14 +31,18 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
annotations: annotations:
app.kubernetes.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/reconciler-config.yaml") . | sha256sum }} app.kubernetes.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/reconciler-config.yaml") . | sha256sum }}
{{/* logIngest related code commented out
{{- if .Values.logIngest.enabled }} {{- if .Values.logIngest.enabled }}
opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }} opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/reconciler/opentelemetry.yaml") . | sha256sum }}
sidecar.opentelemetry.io/inject: "{{ .Release.Namespace}}/{{ .Release.Name }}-opentelemetry-collector" sidecar.opentelemetry.io/inject: "{{ .Release.Namespace}}/{{ .Release.Name }}-opentelemetry-collector"
{{- end }} {{- end }}
*/}}
spec: spec:
{{/* logIngest related code commented out
{{- if .Values.logIngest.enabled }} {{- if .Values.logIngest.enabled }}
serviceAccountName: "{{ .Release.Name }}-otel-collector" serviceAccountName: "{{ .Release.Name }}-otel-collector"
{{- end }} {{- end }}
*/}}
containers: containers:
- name: "reconciler" - 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" }}" 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 name: reconciler-config
key: {{ $key | snakecase | upper }} key: {{ $key | snakecase | upper }}
{{- end }} {{- end }}
{{/* logIngest related code commented out
{{- if .Values.logIngest.enabled }} {{- if .Values.logIngest.enabled }}
volumeMounts: volumeMounts:
- name: app-logs - name: app-logs
mountPath: {{ .Values.logIngest.logPath }} mountPath: {{ .Values.logIngest.logPath }}
{{- end }} {{- end }}
*/}}
{{/* logIngest related code commented out
{{- if .Values.logIngest.enabled }} {{- if .Values.logIngest.enabled }}
volumes: volumes:
- name: app-logs - name: app-logs
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
*/}}

2
freeleaps-devops-reconciler/helm-pkg/reconciler/templates/reconciler/reconciler-config.yaml
View File

@ -7,6 +7,8 @@ type: Opaque
data: data:
DEBUG: {{ .Values.reconciler.configs.debug | b64enc | quote }} DEBUG: {{ .Values.reconciler.configs.debug | b64enc | quote }}
K8S_CLUSTER_DOMAIN: {{ .Values.reconciler.configs.k8sClusterDomain | 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 }} AUTO_DISCOVER_K_8S_CLUSTER_DOMAIN_MAX_RETRIES: {{ .Values.reconciler.configs.autoDiscoverK8sClusterDomainMaxRetries | toString | b64enc | quote }}
RABBITMQ_HOST: {{ .Values.reconciler.configs.rabbitmqHost | b64enc | quote }} RABBITMQ_HOST: {{ .Values.reconciler.configs.rabbitmqHost | b64enc | quote }}
RABBITMQ_PORT: {{ .Values.reconciler.configs.rabbitmqPort | toString | b64enc | quote }} RABBITMQ_PORT: {{ .Values.reconciler.configs.rabbitmqPort | toString | b64enc | quote }}