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

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.

Browse Source
This commit is contained in:
Nicolas 2025-07-21 17:04:53 +08:00
parent 319c56e112
commit 11a1191628
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeleaps/helm-pkg/devops/templates/authentication/certificate.yaml → freeleaps/helm-pkg/devops/templates/devops/certificate.yaml
View File

@ -2,7 +2,7 @@
{{ $appVersion := .Chart.AppVersion | quote }} {{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseCertificate := .Release.Service }} {{ $releaseCertificate := .Release.Service }}
{{ $releaseName := .Release.Name }} {{ $releaseName := .Release.Name }}
{{- range $ingress := .Values.authentication.ingresses }} {{- range $ingress := .Values.devops.ingresses }}
{{- if not $ingress.tls.exists }} {{- if not $ingress.tls.exists }}
--- ---
apiVersion: cert-manager.io/v1 apiVersion: cert-manager.io/v1

2
freeleaps/helm-pkg/devops/templates/authentication/deployment.yaml → freeleaps/helm-pkg/devops/templates/devops/deployment.yaml
View File

@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
# {{- if .Values.logIngest.enabled }} # {{- if .Values.logIngest.enabled }}
# annotations: # 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 }} # {{- end }}
name: "devops" name: "devops"
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}

0
freeleaps/helm-pkg/devops/templates/authentication/devops-config.yaml → freeleaps/helm-pkg/devops/templates/devops/devops-config.yaml
View File

2
freeleaps/helm-pkg/devops/templates/authentication/ingress.yaml → freeleaps/helm-pkg/devops/templates/devops/ingress.yaml
View File

@ -2,7 +2,7 @@
{{ $appVersion := .Chart.AppVersion | quote }} {{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseIngress := .Release.Service }} {{ $releaseIngress := .Release.Service }}
{{ $releaseName := .Release.Name }} {{ $releaseName := .Release.Name }}
{{- range $ingress := .Values.authentication.ingresses }} {{- range $ingress := .Values.devops.ingresses }}
--- ---
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress

4
freeleaps/helm-pkg/devops/templates/authentication/service.yaml → freeleaps/helm-pkg/devops/templates/devops/service.yaml
View File

@ -2,7 +2,7 @@
{{ $appVersion := .Chart.AppVersion | quote }} {{ $appVersion := .Chart.AppVersion | quote }}
{{ $releaseService := .Release.Service }} {{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }} {{ $releaseName := .Release.Name }}
{{- range $service := .Values.authentication.services }} {{- range $service := .Values.devops.services }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -20,7 +20,7 @@ spec:
targetPort: {{ $service.targetPort }} targetPort: {{ $service.targetPort }}
selector: selector:
app.kubernetes.io/version: {{ $appVersion }} app.kubernetes.io/version: {{ $appVersion }}
app.kubernetes.io/name: "authentication" app.kubernetes.io/name: "devops"
app.kubernetes.io/managed-by: {{ $releaseService }} app.kubernetes.io/managed-by: {{ $releaseService }}
app.kubernetes.io/instance: {{ $releaseName }} app.kubernetes.io/instance: {{ $releaseName }}
{{- end }} {{- end }}

2
freeleaps/helm-pkg/devops/templates/authentication/servicemonitor.yaml → freeleaps/helm-pkg/devops/templates/devops/servicemonitor.yaml
View File

@ -3,7 +3,7 @@
{{ $releaseService := .Release.Service }} {{ $releaseService := .Release.Service }}
{{ $releaseName := .Release.Name }} {{ $releaseName := .Release.Name }}
{{- range $service := .Values.authentication.services }} {{- range $service := .Values.devops.services }}
{{- if $service.serviceMonitor.enabled }} {{- if $service.serviceMonitor.enabled }}
--- ---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1

0
freeleaps/helm-pkg/devops/templates/authentication/vpa.yaml → freeleaps/helm-pkg/devops/templates/devops/vpa.yaml
View File

2
freeleaps/helm-pkg/devops/values.alpha.yaml
View File

@ -2,6 +2,8 @@ global:
registry: docker.io registry: docker.io
repository: freeleaps repository: freeleaps
nodeSelector: {} nodeSelector: {}
logIngest:
enabled: false
devops: devops:
replicas: 1 replicas: 1
image: image: