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.
This commit is contained in:
parent
319c56e112
commit
11a1191628
@ -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
|
||||||
@ -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 }}
|
||||||
@ -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
|
||||||
@ -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 }}
|
||||||
@ -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
|
||||||
@ -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:
|
||||||
@ -83,4 +85,4 @@ devops:
|
|||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
controlledResources:
|
controlledResources:
|
||||||
- cpu
|
- cpu
|
||||||
- memory
|
- memory
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user