dex common remove,only dex-app

giantswarm · Jan 15, 2024 · d214943 · d214943
1 parent 2a4fb50
commit d214943
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 24 deletions.
diff --git a/helm/dex-app/templates/_helpers.tpl b/helm/dex-app/templates/_helpers.tpl
@@ -12,6 +12,13 @@ Helpers for dex.
 dex
 {{- end -}}
 
+{{/*
+Helpers for dex-app.
+*/}}
+{{- define "dex-app.name" -}}
+dex
+{{- end -}}
+
 {{/*
 Common dex labels
 */}}
@@ -25,8 +32,18 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
 giantswarm.io/service-type: "managed"
 {{- end -}}
+
+{{/*
+Common dex-app labels
+*/}}
 {{- define "dex-app.labels.common" -}}
 {{ include "dex-app.labels.selector" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
+giantswarm.io/service-type: "managed"
 {{- end -}}
 {{/*
 Selector dex labels
@@ -38,11 +55,11 @@ app.kubernetes.io/instance: {{ .Release.Name | quote }}
 {{- end -}}
 
 {{/*
-Selector dex labels
+Selector dex-app labels
 */}}
 {{- define "dex-app.labels.selector" -}}
-app.kubernetes.io/name: dex-app
-app.kubernetes.io/component: dex-app
+app.kubernetes.io/name: {{ include "dex-app.name" . }}
+app.kubernetes.io/component: {{ include "dex-app.name" . }}
 {{- end -}}
 
 {{/*

diff --git a/helm/dex-app/templates/dex/certs-secret.yaml b/helm/dex-app/templates/dex/certs-secret.yaml
@@ -5,7 +5,6 @@ kind: Secret
 type: kubernetes.io/tls
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   name: {{ include "resource.dex.name" . }}-tls
 data:

diff --git a/helm/dex-app/templates/dex/clusterrole.yaml b/helm/dex-app/templates/dex/clusterrole.yaml
@@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   name: {{ include "resource.dex.name" . }}
 rules:
@@ -26,7 +25,6 @@ kind: ClusterRole
 metadata:
   name: {{ include "resource.dex.name"  . }}-metrics
   labels:
-  {{- include "dex.labels.common" . | nindent 4 }}
   {{- include "dex-app.labels.common" . | nindent 4 }}
 rules:
 - nonResourceURLs:

diff --git a/helm/dex-app/templates/dex/clusterrolebinding.yaml b/helm/dex-app/templates/dex/clusterrolebinding.yaml
@@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   name: {{ include "resource.dex.name" . }}
 roleRef:

diff --git a/helm/dex-app/templates/dex/deployment.yaml b/helm/dex-app/templates/dex/deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: {{ include "resource.dex.name" . }}
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   annotations:
     app.giantswarm.io/secret-checksum: {{ include (print .Template.BasePath "/dex/secret.yaml") . | sha256sum | quote }}
@@ -16,12 +15,10 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      {{- include "dex.labels.selector" . | nindent 6 }}
       {{- include "dex-app.labels.selector" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "dex.labels.common" . | nindent 8 }}
         {{- include "dex-app.labels.common" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print .Template.BasePath "/dex/secret.yaml") . | sha256sum | quote }}
@@ -32,7 +29,6 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  {{- include "dex.labels.selector" . | nindent 18 }}
                   {{- include "dex-app.labels.selector" . | nindent 18 }}
               topologyKey: kubernetes.io/hostname
             weight: 100

diff --git a/helm/dex-app/templates/dex/ingress.yaml b/helm/dex-app/templates/dex/ingress.yaml
@@ -7,7 +7,6 @@ kind: Ingress
 metadata:
   name: {{ include "resource.dex.name" . }}
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.selector" . | nindent 4 }}
   annotations:
     {{- if .Values.ingress.tls.letsencrypt }}

diff --git a/helm/dex-app/templates/dex/np.yaml b/helm/dex-app/templates/dex/np.yaml
@@ -3,13 +3,11 @@ apiVersion: networking.k8s.io/v1
 metadata:
   name: {{ include "resource.dex.networkPolicy.name" . }}
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
 spec:
   podSelector:
     matchLabels:
-      {{- include "dex.labels.selector" . | nindent 6 }}
-      {{- include "dex.labels.selector" . | nindent 6 }}
+      {{- include "dex-app.labels.selector" . | nindent 6 }}
   policyTypes:
   - Ingress
   - Egress

diff --git a/helm/dex-app/templates/dex/pdb.yaml b/helm/dex-app/templates/dex/pdb.yaml
@@ -7,6 +7,5 @@ spec:
   minAvailable: 50%
   selector:
     matchLabels:
-      {{- include "dex.labels.common" . | nindent 6 }}
       {{- include "dex-app.labels.selector" . | nindent 4 }}
 {{- end }}
diff --git a/helm/dex-app/templates/dex/psp.yaml b/helm/dex-app/templates/dex/psp.yaml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   name: {{ include "resource.dex.psp.name" . }}
 spec:

diff --git a/helm/dex-app/templates/dex/secret.yaml b/helm/dex-app/templates/dex/secret.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.selector" . | nindent 4 }}
   name: {{ include "resource.dex.name" . }}
 stringData:

diff --git a/helm/dex-app/templates/dex/service-monitor.yaml b/helm/dex-app/templates/dex/service-monitor.yaml
@@ -4,7 +4,6 @@ kind: ServiceMonitor
 metadata:
   name: {{ include "resource.dex.name"  . }}
   labels:
-  {{- include "dex.labels.common" . | nindent 4 }}
   {{- include "dex-app.labels.common" . | nindent 4 }}
 spec:
   endpoints:
@@ -23,6 +22,5 @@ spec:
         {{- end }}
   selector:
     matchLabels:
-  {{- include "dex.labels.selector" . | nindent 6 }}
-  {{- include "dex-app.labels.selector" . | nindent 4 }}
+  {{- include "dex-app.labels.selector" . | nindent 6 }}
 {{- end }}
diff --git a/helm/dex-app/templates/dex/service.yaml b/helm/dex-app/templates/dex/service.yaml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   name: {{ include "resource.dex.name" . }}
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
     giantswarm.io/monitoring: "true"
   annotations:
@@ -20,5 +19,4 @@ spec:
     port: 5558
     targetPort: metrics
   selector:
-    {{- include "dex.labels.selector" . | nindent 4 }}
     {{- include "dex-app.labels.selector" . | nindent 4 }}
diff --git a/helm/dex-app/templates/dex/serviceaccount.yaml b/helm/dex-app/templates/dex/serviceaccount.yaml
@@ -2,6 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    {{- include "dex.labels.common" . | nindent 4 }}
     {{- include "dex-app.labels.common" . | nindent 4 }}
   name: {{ include "resource.dex.name" . }}