altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

ci: clean up labels and service values (#7314)

Browse source 
* ci: Remove unused service values

* ci: Reorg labels
This commit is contained in:
Jennifer Richards 2024-04-11 11:56:44 -03:00 committed by Nicolas Giard
parent c4a2ea9822
commit 206a4bb749
17 changed files with 43 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helm/templates/_helpers.tpl
View file

@ -118,20 +118,20 @@ Create chart name and version as used by the chart label.
{{/*
Common labels
*/}}
{{- define "datatracker.labels" -}}
{{- define "datatracker.commonLabels" -}}
helm.sh/chart: {{ include "datatracker.chart" . }}
{{ include "datatracker.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/part-of: {{ include "datatracker.name" . | default "datatracker" }}
{{- end }}
{{/*
Selector labels
*/}}
{{- define "datatracker.selectorLabels" -}}
app.kubernetes.io/name: {{ include "datatracker.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

5
helm/templates/deployments/beat.yaml
View file

@ -3,7 +3,8 @@ kind: Deployment
metadata:
name: {{ include "datatracker.beat.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.beat.name }}
spec:
{{- $podValues := .Values.beat }}
replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector:
matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template:
metadata:
labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec:
{{- with $podValues.imagePullSecrets }}
imagePullSecrets:

5
helm/templates/deployments/celery.yaml
View file

@ -3,7 +3,8 @@ kind: Deployment
metadata:
name: {{ include "datatracker.celery.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.celery.name }}
spec:
{{- $podValues := .Values.celery }}
replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector:
matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template:
metadata:
labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec:
{{- with $podValues.imagePullSecrets }}
imagePullSecrets:

5
helm/templates/deployments/datatracker.yaml
View file

@ -3,7 +3,8 @@ kind: Deployment
metadata:
name: {{ include "datatracker.datatracker.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.datatracker.name }}
spec:
{{- $podValues := .Values.datatracker }}
replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector:
matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template:
metadata:
labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec:
{{- with $podValues.imagePullSecrets }}
imagePullSecrets:

5
helm/templates/deployments/memcached.yaml
View file

@ -3,7 +3,8 @@ kind: Deployment
metadata:
name: {{ include "datatracker.memcached.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.memcached.name }}
spec:
{{- $podValues := .Values.memcached }}
replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector:
matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template:
metadata:
labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec:
{{- with $podValues.imagePullSecrets }}
imagePullSecrets:

2
helm/templates/hpa.yaml
View file

@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
metadata:
name: {{ include "datatracker.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1

2
helm/templates/ingress.yaml
View file

@ -17,7 +17,7 @@ kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.datatracker.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

2
helm/templates/rbac/beat-serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "datatracker.serviceAccountName.beat" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.serviceAccounts.beat.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

2
helm/templates/rbac/celery-serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "datatracker.serviceAccountName.celery" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.serviceAccounts.celery.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

2
helm/templates/rbac/datatracker-serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "datatracker.serviceAccountName.datatracker" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.serviceAccounts.datatracker.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

2
helm/templates/rbac/memcached-serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "datatracker.serviceAccountName.memcached" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.serviceAccounts.memcached.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

2
helm/templates/rbac/rabbitmq-serviceaccount.yaml
View file

@ -4,7 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "datatracker.serviceAccountName.rabbitmq" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.serviceAccounts.rabbitmq.annotations }}
annotations:
{{- toYaml . | nindent 4 }}

6
helm/templates/services/datatracker.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{include "datatracker.fullname" .}}
labels: {{- include "datatracker.labels" . | nindent 4 }}
labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.datatracker.service.annotations }}
annotations:
{{- range $key, $value := . }}
@ -16,4 +16,6 @@ spec:
targetPort: http
protocol: TCP
name: http
selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
selector:
{{- include "datatracker.selectorLabels" . | nindent 4}}
app.kubernetes.io/name: {{ .Values.datatracker.name }}

6
helm/templates/services/memcached.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: memcached
labels: {{- include "datatracker.labels" . | nindent 4 }}
labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.memcached.service.annotations }}
annotations:
{{- range $key, $value := . }}
@ -16,4 +16,6 @@ spec:
targetPort: memcached
protocol: TCP
name: memcached
selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
selector:
{{- include "datatracker.selectorLabels" . | nindent 4}}
app.kubernetes.io/name: {{ .Values.memcached.name }}

6
helm/templates/services/rabbitmq.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: rabbitmq
labels: {{- include "datatracker.labels" . | nindent 4 }}
labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.rabbitmq.service.annotations }}
annotations:
{{- range $key, $value := . }}
@ -17,4 +17,6 @@ spec:
targetPort: amqp
protocol: TCP
name: amqp
selector: {{- include "datatracker.selectorLabels" . | nindent 4}}
selector:
{{- include "datatracker.selectorLabels" . | nindent 4}}
app.kubernetes.io/name: {{ .Values.rabbitmq.name }}

5
helm/templates/statefulsets/rabbitmq.yaml
View file

@ -3,7 +3,8 @@ kind: StatefulSet
metadata:
name: {{ include "datatracker.rabbitmq.fullname" . }}
labels:
{{- include "datatracker.labels" . | nindent 4 }}
{{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.rabbitmq.name }}
spec:
{{- $podValues := .Values.rabbitmq }}
replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector:
matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template:
metadata:
labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec:
{{- with $podValues.imagePullSecrets }}
imagePullSecrets:

8
helm/values.yaml
View file

@ -218,10 +218,6 @@ celery:
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
serviceAccount:
# Specifies whether a service account should be created
create: true
@ -336,10 +332,6 @@ beat:
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
port: 80
serviceAccount:
# Specifies whether a service account should be created
create: true