Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix service selectors #7

Merged
merged 6 commits into from Jul 6, 2021
Merged

Fix service selectors #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02f2128
Fix service selectors
Rizato Jun 30, 2021
f06ee27
Separate labels per deployment
Rizato Jul 2, 2021
5949781
Fix typo
Rizato Jul 2, 2021
e825393
Fix nginx selector labels
Rizato Jul 2, 2021
cdb660e
Add PYTHONUNBUFFERED in worker
Rizato Jul 2, 2021
a302cc6
Add wms access to clamav nginx pod
Rizato Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 61 additions & 0 deletions chart/templates/_helpers.tpl
View file
Open in desktop
Expand Up @@ -50,6 +50,67 @@ app.kubernetes.io/name: {{ include "microengine-clamav.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
nginx labels
*/}}
{{- define "microengine-clamav.nginx.labels" -}}
helm.sh/chart: {{ include "microengine-clamav.chart" . }}
{{ include "microengine-clamav.nginx.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
nginx selector labels
*/}}
{{- define "microengine-clamav.nginx.selectorLabels" -}}
app.kubernetes.io/name: {{ include "microengine-clamav.name" . }}-nginx
app.kubernetes.io/instance: {{ .Release.Name }}
app.polyswarm.io/access: webhook-worker
{{- end }}

{{/*
worker labels
*/}}
{{- define "microengine-clamav.worker.labels" -}}
helm.sh/chart: {{ include "microengine-clamav.chart" . }}
{{ include "microengine-clamav.worker.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
worker selector labels
*/}}
{{- define "microengine-clamav.worker.selectorLabels" -}}
app.kubernetes.io/name: {{ include "microengine-clamav.name" . }}-worker
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
clamd labels
*/}}
{{- define "microengine-clamav.clamd.labels" -}}
helm.sh/chart: {{ include "microengine-clamav.chart" . }}
{{ include "microengine-clamav.clamd.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
Selector labels
*/}}
{{- define "microengine-clamav.clamd.selectorLabels" -}}
app.kubernetes.io/name: {{ include "microengine-clamav.name" . }}-clamd
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Create the name of the service account to use
*/}}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/clamd.deployment.yaml
View file
Open in desktop
Expand Up @@ -3,22 +3,22 @@ kind: Deployment
metadata:
name: {{ include "microengine-clamav.fullname" . }}-clamd
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.clamd.labels" . | nindent 4 }}
spec:
{{- if not .Values.clamd.autoscaling.enabled }}
replicas: {{ .Values.clamd.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "microengine-clamav.selectorLabels" . | nindent 6 }}
{{- include "microengine-clamav.clamd.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.clamd.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "microengine-clamav.selectorLabels" . | nindent 8 }}
{{- include "microengine-clamav.clamd.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.clamd.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/clamd.hpa.yaml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
metadata:
name: {{ include "microengine-clamav.fullname" . }}-clamd
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.clamd.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down
4 changes: 2 additions & 2 deletions chart/templates/clamd.service.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
name: {{ include "microengine-clamav.fullname" . }}-clamd
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.clamd.labels" . | nindent 4 }}
spec:
type: {{ .Values.clamd.service.type }}
ports:
Expand All @@ -12,4 +12,4 @@ spec:
protocol: TCP
name: clamd
selector:
{{- include "microengine-clamav.selectorLabels" . | nindent 4 }}
{{- include "microengine-clamav.clamd.selectorLabels" . | nindent 4 }}
6 changes: 3 additions & 3 deletions chart/templates/nginx.deployment.yaml
View file
Open in desktop
Expand Up @@ -3,22 +3,22 @@ kind: Deployment
metadata:
name: {{ include "microengine-clamav.fullname" . }}-nginx
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.nginx.labels" . | nindent 4 }}
spec:
{{- if not .Values.nginx.autoscaling.enabled }}
replicas: {{ .Values.nginx.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "microengine-clamav.selectorLabels" . | nindent 6 }}
{{- include "microengine-clamav.nginx.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.nginx.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "microengine-clamav.selectorLabels" . | nindent 8 }}
{{- include "microengine-clamav.nginx.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.nginx.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/nginx.hpa.yaml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
metadata:
name: {{ include "microengine-clamav.fullname" . }}-nginx
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.nginx.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/nginx.ingress.yaml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ kind: Ingress
metadata:
name: {{ $fullName }}-nginx
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.nginx.labels" . | nindent 4 }}
{{- with .Values.nginx.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
4 changes: 2 additions & 2 deletions chart/templates/nginx.service.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
name: {{ include "microengine-clamav.fullname" . }}-nginx
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.nginx.labels" . | nindent 4 }}
spec:
type: {{ .Values.nginx.service.type }}
ports:
Expand All @@ -12,4 +12,4 @@ spec:
protocol: TCP
name: http
selector:
{{- include "microengine-clamav.selectorLabels" . | nindent 4 }}
{{- include "microengine-clamav.nginx.selectorLabels" . | nindent 4 }}
8 changes: 5 additions & 3 deletions chart/templates/worker.deployment.yaml
View file
Open in desktop
Expand Up @@ -3,22 +3,22 @@ kind: Deployment
metadata:
name: {{ include "microengine-clamav.fullname" . }}-worker
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.worker.labels" . | nindent 4 }}
spec:
{{- if not .Values.worker.autoscaling.enabled }}
replicas: {{ .Values.worker.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "microengine-clamav.selectorLabels" . | nindent 6 }}
{{- include "microengine-clamav.worker.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.worker.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "microengine-clamav.selectorLabels" . | nindent 8 }}
{{- include "microengine-clamav.worker.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.worker.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -34,6 +34,8 @@ spec:
image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
env:
- name: PYTHONUNBUFFERED
value: "1"
- name: CELERY_BROKER_URL
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/worker.hpa.yaml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ kind: HorizontalPodAutoscaler
metadata:
name: {{ include "microengine-clamav.fullname" . }}-worker
labels:
{{- include "microengine-clamav.labels" . | nindent 4 }}
{{- include "microengine-clamav.worker.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down