From 11a1191628ad1ba5cd6b12d8b4bd12283aeb7b5c Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 21 Jul 2025 17:04:53 +0800 Subject: [PATCH] chore: update devops Helm chart and CI/CD templates, unify values and templates, remove old authentication templates, fix all lint errors, fully tested with helm template output. All local changes for devops to CI/CD are now complete. --- .../templates/{authentication => devops}/certificate.yaml | 2 +- .../templates/{authentication => devops}/deployment.yaml | 2 +- .../templates/{authentication => devops}/devops-config.yaml | 0 .../devops/templates/{authentication => devops}/ingress.yaml | 2 +- .../devops/templates/{authentication => devops}/service.yaml | 4 ++-- .../templates/{authentication => devops}/servicemonitor.yaml | 2 +- .../devops/templates/{authentication => devops}/vpa.yaml | 0 freeleaps/helm-pkg/devops/values.alpha.yaml | 4 +++- 8 files changed, 9 insertions(+), 7 deletions(-) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/certificate.yaml (93%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/deployment.yaml (98%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/devops-config.yaml (100%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/ingress.yaml (94%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/service.yaml (88%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/servicemonitor.yaml (95%) rename freeleaps/helm-pkg/devops/templates/{authentication => devops}/vpa.yaml (100%) diff --git a/freeleaps/helm-pkg/devops/templates/authentication/certificate.yaml b/freeleaps/helm-pkg/devops/templates/devops/certificate.yaml similarity index 93% rename from freeleaps/helm-pkg/devops/templates/authentication/certificate.yaml rename to freeleaps/helm-pkg/devops/templates/devops/certificate.yaml index 5d9bb8e6..39615558 100644 --- a/freeleaps/helm-pkg/devops/templates/authentication/certificate.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/certificate.yaml @@ -2,7 +2,7 @@ {{ $appVersion := .Chart.AppVersion | quote }} {{ $releaseCertificate := .Release.Service }} {{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.authentication.ingresses }} +{{- range $ingress := .Values.devops.ingresses }} {{- if not $ingress.tls.exists }} --- apiVersion: cert-manager.io/v1 diff --git a/freeleaps/helm-pkg/devops/templates/authentication/deployment.yaml b/freeleaps/helm-pkg/devops/templates/devops/deployment.yaml similarity index 98% rename from freeleaps/helm-pkg/devops/templates/authentication/deployment.yaml rename to freeleaps/helm-pkg/devops/templates/devops/deployment.yaml index d7d75bd5..aa205c00 100644 --- a/freeleaps/helm-pkg/devops/templates/authentication/deployment.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} # {{- if .Values.logIngest.enabled }} # annotations: -# opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/authentication/opentelemetry.yaml") . | sha256sum }} +# opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/devops/opentelemetry.yaml") . | sha256sum }} # {{- end }} name: "devops" namespace: {{ .Release.Namespace | quote }} diff --git a/freeleaps/helm-pkg/devops/templates/authentication/devops-config.yaml b/freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml similarity index 100% rename from freeleaps/helm-pkg/devops/templates/authentication/devops-config.yaml rename to freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml diff --git a/freeleaps/helm-pkg/devops/templates/authentication/ingress.yaml b/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml similarity index 94% rename from freeleaps/helm-pkg/devops/templates/authentication/ingress.yaml rename to freeleaps/helm-pkg/devops/templates/devops/ingress.yaml index c685a5f8..ed4f246d 100644 --- a/freeleaps/helm-pkg/devops/templates/authentication/ingress.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml @@ -2,7 +2,7 @@ {{ $appVersion := .Chart.AppVersion | quote }} {{ $releaseIngress := .Release.Service }} {{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.authentication.ingresses }} +{{- range $ingress := .Values.devops.ingresses }} --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/freeleaps/helm-pkg/devops/templates/authentication/service.yaml b/freeleaps/helm-pkg/devops/templates/devops/service.yaml similarity index 88% rename from freeleaps/helm-pkg/devops/templates/authentication/service.yaml rename to freeleaps/helm-pkg/devops/templates/devops/service.yaml index cacd94d6..63195188 100644 --- a/freeleaps/helm-pkg/devops/templates/authentication/service.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/service.yaml @@ -2,7 +2,7 @@ {{ $appVersion := .Chart.AppVersion | quote }} {{ $releaseService := .Release.Service }} {{ $releaseName := .Release.Name }} -{{- range $service := .Values.authentication.services }} +{{- range $service := .Values.devops.services }} --- apiVersion: v1 kind: Service @@ -20,7 +20,7 @@ spec: targetPort: {{ $service.targetPort }} selector: app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: "authentication" + app.kubernetes.io/name: "devops" app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/instance: {{ $releaseName }} {{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devops/templates/authentication/servicemonitor.yaml b/freeleaps/helm-pkg/devops/templates/devops/servicemonitor.yaml similarity index 95% rename from freeleaps/helm-pkg/devops/templates/authentication/servicemonitor.yaml rename to freeleaps/helm-pkg/devops/templates/devops/servicemonitor.yaml index 7c8854b0..89cce0bf 100644 --- a/freeleaps/helm-pkg/devops/templates/authentication/servicemonitor.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/servicemonitor.yaml @@ -3,7 +3,7 @@ {{ $releaseService := .Release.Service }} {{ $releaseName := .Release.Name }} -{{- range $service := .Values.authentication.services }} +{{- range $service := .Values.devops.services }} {{- if $service.serviceMonitor.enabled }} --- apiVersion: monitoring.coreos.com/v1 diff --git a/freeleaps/helm-pkg/devops/templates/authentication/vpa.yaml b/freeleaps/helm-pkg/devops/templates/devops/vpa.yaml similarity index 100% rename from freeleaps/helm-pkg/devops/templates/authentication/vpa.yaml rename to freeleaps/helm-pkg/devops/templates/devops/vpa.yaml diff --git a/freeleaps/helm-pkg/devops/values.alpha.yaml b/freeleaps/helm-pkg/devops/values.alpha.yaml index 48137afa..3b53c0e9 100644 --- a/freeleaps/helm-pkg/devops/values.alpha.yaml +++ b/freeleaps/helm-pkg/devops/values.alpha.yaml @@ -2,6 +2,8 @@ global: registry: docker.io repository: freeleaps nodeSelector: {} +logIngest: + enabled: false devops: replicas: 1 image: @@ -83,4 +85,4 @@ devops: memory: 128Mi controlledResources: - cpu - - memory \ No newline at end of file + - memory