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

BC-5405 - Metadata on k8s ressources #43

Merged
merged 5 commits into from
Nov 16, 2023
Merged

BC-5405 - Metadata on k8s ressources #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ff15c6
add labels to antivirus check deployment and pods
MartinSchuhmacher Nov 9, 2023
6629341
remove unused annotations prop
MartinSchuhmacher Nov 9, 2023
19aaefa
add more common labels
MartinSchuhmacher Nov 13, 2023
edef43e
set back to default
MartinSchuhmacher Nov 16, 2023
a3931b1
adjust naming
MartinSchuhmacher Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions ansible/roles/antivirus_check_service/templates/scanfile-deployment.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
labels:
app: antivirus
antivirus: scanfile
app.kubernetes.io/part-of: schulcloud-verbund
app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }}
app.kubernetes.io/name: scanfile
app.kubernetes.io/component: antivirus
app.kubernetes.io/managed-by: ansible
git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }}
git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }}
spec:
replicas: {{ ANTIVIRUS_SCANFILE_REPLICAS|default("1", true) }}
strategy:
Expand All @@ -24,9 +31,15 @@ spec:
labels:
app: antivirus
antivirus: scanfile
annotations:
app.kubernetes.io/part-of: schulcloud-verbund
app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }}
app.kubernetes.io/name: scanfile
app.kubernetes.io/component: antivirus
app.kubernetes.io/managed-by: ansible
git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }}
git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }}
spec:
securityContext:
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
Expand All @@ -53,4 +66,3 @@ spec:
volumes:
- name: shared
emptyDir: {}

17 changes: 15 additions & 2 deletions ansible/roles/antivirus_check_service/templates/web-deployment.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
labels:
app: antivirus
antivirus: webserver
app.kubernetes.io/part-of: schulcloud-verbund
app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }}
app.kubernetes.io/name: webserver
app.kubernetes.io/component: antivirus
app.kubernetes.io/managed-by: ansible
git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }}
git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }}
spec:
replicas: {{ ANTIVIRUS_WEBSERVER_REPLICAS|default("1", true) }}
strategy:
Expand All @@ -24,9 +31,15 @@ spec:
labels:
app: antivirus
antivirus: webserver
annotations:
app.kubernetes.io/part-of: schulcloud-verbund
app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }}
app.kubernetes.io/name: webserver
app.kubernetes.io/component: antivirus
app.kubernetes.io/managed-by: ansible
git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }}
git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }}
spec:
securityContext:
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
Expand Down
Loading