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 Common labels
*/}} */}}
{{- define "datatracker.labels" -}} {{- define "datatracker.commonLabels" -}}
helm.sh/chart: {{ include "datatracker.chart" . }} helm.sh/chart: {{ include "datatracker.chart" . }}
{{ include "datatracker.selectorLabels" . }}
{{- if .Chart.AppVersion }} {{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }} {{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/part-of: {{ include "datatracker.name" . | default "datatracker" }}
{{- end }} {{- end }}
{{/* {{/*
Selector labels Selector labels
*/}} */}}
{{- define "datatracker.selectorLabels" -}} {{- define "datatracker.selectorLabels" -}}
app.kubernetes.io/name: {{ include "datatracker.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }} {{- end }}

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

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

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

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

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

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

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

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

4
helm/templates/hpa.yaml
View file

@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
metadata: metadata:
name: {{ include "datatracker.fullname" . }} name: {{ include "datatracker.fullname" . }}
labels: labels:
{{- include "datatracker.labels" . | nindent 4 }} {{- include "datatracker.commonLabels" . | nindent 4 }}
spec: spec:
scaleTargetRef: scaleTargetRef:
apiVersion: apps/v1 apiVersion: apps/v1
@ -29,4 +29,4 @@ spec:
type: Utilization type: Utilization
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
helm/templates/ingress.yaml
View file

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

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

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

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{include "datatracker.fullname" .}} name: {{include "datatracker.fullname" .}}
labels: {{- include "datatracker.labels" . | nindent 4 }} labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.datatracker.service.annotations }} {{- with .Values.datatracker.service.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
@ -16,4 +16,6 @@ spec:
targetPort: http targetPort: http
protocol: TCP protocol: TCP
name: http 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 kind: Service
metadata: metadata:
name: memcached name: memcached
labels: {{- include "datatracker.labels" . | nindent 4 }} labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.memcached.service.annotations }} {{- with .Values.memcached.service.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
@ -16,4 +16,6 @@ spec:
targetPort: memcached targetPort: memcached
protocol: TCP protocol: TCP
name: memcached 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 kind: Service
metadata: metadata:
name: rabbitmq name: rabbitmq
labels: {{- include "datatracker.labels" . | nindent 4 }} labels: {{- include "datatracker.commonLabels" . | nindent 4 }}
{{- with .Values.rabbitmq.service.annotations }} {{- with .Values.rabbitmq.service.annotations }}
annotations: annotations:
{{- range $key, $value := . }} {{- range $key, $value := . }}
@ -17,4 +17,6 @@ spec:
targetPort: amqp targetPort: amqp
protocol: TCP protocol: TCP
name: amqp 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: metadata:
name: {{ include "datatracker.rabbitmq.fullname" . }} name: {{ include "datatracker.rabbitmq.fullname" . }}
labels: labels:
{{- include "datatracker.labels" . | nindent 4 }} {{- include "datatracker.commonLabels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.rabbitmq.name }}
spec: spec:
{{- $podValues := .Values.rabbitmq }} {{- $podValues := .Values.rabbitmq }}
replicas: {{ $podValues.replicaCount }} replicas: {{ $podValues.replicaCount }}
@ -11,10 +12,12 @@ spec:
selector: selector:
matchLabels: matchLabels:
{{- include "datatracker.selectorLabels" . | nindent 6 }} {{- include "datatracker.selectorLabels" . | nindent 6 }}
app.kubernetes.io/name: {{ $podValues.name }}
template: template:
metadata: metadata:
labels: labels:
{{- include "datatracker.selectorLabels" . | nindent 8 }} {{- include "datatracker.selectorLabels" . | nindent 8 }}
app.kubernetes.io/name: {{ $podValues.name }}
spec: spec:
{{- with $podValues.imagePullSecrets }} {{- with $podValues.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:

8
helm/values.yaml
View file

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