diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a0ad3ce..75c6a23 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -61,7 +61,7 @@ jobs: needs: - build_and_push - branch_name - uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@main + uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@BC-5405-labels-k8s with: branch: ${{ needs.branch_name.outputs.branch }} secrets: diff --git a/ansible/roles/antivirus_check_service/templates/scanfile-deployment.yml.j2 b/ansible/roles/antivirus_check_service/templates/scanfile-deployment.yml.j2 index ebc84c3..6398e60 100644 --- a/ansible/roles/antivirus_check_service/templates/scanfile-deployment.yml.j2 +++ b/ansible/roles/antivirus_check_service/templates/scanfile-deployment.yml.j2 @@ -6,6 +6,10 @@ metadata: labels: app: antivirus antivirus: scanfile + app.kubernetes.io/part-of: schulcloud-verbund + app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }} + git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }} + git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }} spec: replicas: {{ ANTIVIRUS_SCANFILE_REPLICAS|default("1", true) }} strategy: @@ -24,9 +28,13 @@ spec: labels: app: antivirus antivirus: scanfile + app.kubernetes.io/part-of: schulcloud-verbund + app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }} + git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }} + git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }} annotations: spec: - securityContext: + securityContext: runAsUser: 1000 runAsGroup: 1000 fsGroup: 1000 @@ -53,4 +61,3 @@ spec: volumes: - name: shared emptyDir: {} - diff --git a/ansible/roles/antivirus_check_service/templates/web-deployment.yml.j2 b/ansible/roles/antivirus_check_service/templates/web-deployment.yml.j2 index 951a9a6..fc83bbd 100644 --- a/ansible/roles/antivirus_check_service/templates/web-deployment.yml.j2 +++ b/ansible/roles/antivirus_check_service/templates/web-deployment.yml.j2 @@ -6,6 +6,10 @@ metadata: labels: app: antivirus antivirus: webserver + app.kubernetes.io/part-of: schulcloud-verbund + app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }} + git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }} + git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }} spec: replicas: {{ ANTIVIRUS_WEBSERVER_REPLICAS|default("1", true) }} strategy: @@ -24,9 +28,13 @@ spec: labels: app: antivirus antivirus: webserver + app.kubernetes.io/part-of: schulcloud-verbund + app.kubernetes.io/version: {{ ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG }} + git.branch: {{ ANTIVIRUS_CHECK_SERVICE_BRANCH_NAME }} + git.repo: {{ ANTIVIRUS_CHECK_SERVICE_REPO_NAME }} annotations: spec: - securityContext: + securityContext: runAsUser: 1000 runAsGroup: 1000 fsGroup: 1000