Merge remote-tracking branch 'origin/main' into THR-18-dev-feature-h5…

…p-editor

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/" # Location of package manifests
+    open-pull-requests-limit: 5
+    versioning-strategy: "increase"
+    schedule:
+      interval: "weekly"
+

.github/workflows/clean.yml

@@ -13,3 +13,4 @@ jobs:
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
       DEV_KUBE_CONFIG: ${{ secrets.DEV_KUBE_CONFIG }}
+      BINGO_REPO_TOKEN: ${{ secrets.BINGO_REPO_TOKEN }}

.github/workflows/push.yml

@@ -99,6 +99,7 @@ jobs:
       token: ${{ secrets.GITHUB_TOKEN }}
       DEV_VAULT: ${{ secrets.DEV_VAULT }}
       DEV_KUBE_CONFIG: ${{ secrets.DEV_KUBE_CONFIG }}
+      BINGO_REPO_TOKEN: ${{ secrets.BINGO_REPO_TOKEN }}
 
   deploy-successful:
     needs:
@@ -139,6 +140,15 @@ jobs:
     with:
       ref: ${{ needs.branch_meta.outputs.branch }}
 
+  cy-e2e-tests:
+    needs:
+      - branch_meta
+      - deploy
+    uses: hpi-schul-cloud/e2e-system-tests/.github/workflows/remote-trigger.yml@main
+    with:
+      ref: ${{ needs.branch_meta.outputs.branch }}
+    secrets: inherit
+
   test-successful:
     runs-on: ubuntu-latest
     needs:

.github/workflows/test.yml

@@ -88,14 +88,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-        with:
-          args: >
-            -Dsonar.sources=.
-            -Dsonar.organization=schulcloud-verbund
-            -Dsonar.projectKey=hpi-schul-cloud_schulcloud-server
-            -Dsonar.exclusions=**/*.js
-            -Dsonar.cpd.exclusions=**/controller/dto/*.ts,**/*.spec.ts
-            -Dsonar.javascript.lcov.reportPaths=merged-lcov.info
   nest_lint:
     runs-on: ubuntu-latest
     timeout-minutes: 5

ansible/group_vars/all/schulcloud-server.yml

@@ -1,2 +1,2 @@
 ---
-SCHULCLOUD_SERVER_IMAGE: schulcloud/schulcloud-server
+SCHULCLOUD_SERVER_IMAGE: quay.io/schulcloudverbund/schulcloud-server

ansible/roles/schulcloud-server-core/tasks/main.yml

@@ -4,6 +4,12 @@
       namespace: "{{ NAMESPACE }}"
       template: svc.yml.j2
 
+  - name: ServiceMonitor
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: svc-monitor.yml.j2
+
   - name: FileStorageService
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
@@ -17,13 +23,6 @@
       template: api-fwu-svc.yml.j2
     when: FEATURE_FWU_CONTENT_ENABLED is defined and FEATURE_FWU_CONTENT_ENABLED|bool
 
-  - name: H5pEditorService
-    kubernetes.core.k8s:
-      kubeconfig: ~/.kube/config
-      namespace: "{{ NAMESPACE }}"
-      template: api-h5p-svc.yml.j2
-    when: FEATURE_H5P_EDITOR_ENABLED is defined and FEATURE_H5P_EDITOR_ENABLED|bool
-
   - name: Configmap
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config

ansible/roles/schulcloud-server-core/templates/api-files-svc.yml.j2

@@ -5,9 +5,6 @@ metadata:
   namespace: {{ NAMESPACE }}
   labels:
     app: api-files
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/port: '4444'
 spec:
   type: ClusterIP
   ports:

ansible/roles/schulcloud-server-core/templates/api-fwu-svc.yml.j2

@@ -5,9 +5,6 @@ metadata:
   namespace: {{ NAMESPACE }}
   labels:
     app: api-fwu
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/port: '4446'
 spec:
   type: ClusterIP
   ports:

ansible/roles/schulcloud-server-core/templates/api-h5p-svc.yml.j2

@@ -5,9 +5,6 @@ metadata:
   namespace: {{ NAMESPACE }}
   labels:
     app: api-h5p
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/port: '4448'
 spec:
   type: ClusterIP
   ports:

ansible/roles/schulcloud-server-core/templates/deployment.yml.j2

@@ -35,6 +35,9 @@ spec:
         - containerPort: 3030
           name: api
           protocol: TCP
+        - containerPort: 9090
+          name: api-metrics
+          protocol: TCP
         envFrom:
         - configMapRef:
             name: api-configmap

ansible/roles/schulcloud-server-core/templates/svc-monitor.yml.j2

@@ -0,0 +1,17 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: api-svc-monitor
+  namespace: {{ NAMESPACE }}
+  labels:
+    app: api
+spec:
+  selector:
+    matchExpressions:
+      - key: app.kubernetes.io/name
+        operator: in
+        values:
+          - api-svc
+  endpoints:
+  - path: /metrics
+    port: api-metrics

ansible/roles/schulcloud-server-core/templates/svc.yml.j2

@@ -5,15 +5,16 @@ metadata:
   namespace: {{ NAMESPACE }}
   labels:
     app: api
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/port: '3030'
 spec:
   type: ClusterIP
   ports:
     - port: {{ PORT_SERVER }}
       targetPort: 3030
       protocol: TCP
       name: api
+    - port: {{ PORT_METRICS_SERVER }}
+      targetPort: 9090
+      protocol: TCP
+      name: api-metrics
   selector:
     app: api

ansible/roles/schulcloud-server-init/tasks/main.yml

@@ -50,12 +50,22 @@
       name: mgmt-svc
     when: not WITH_SCHULCLOUD_INIT
 
+  - name: Check Init Job
+    kubernetes.core.k8s_info:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      kind: Job
+      api_version: batch/v1
+      name: api-init-job
+    register: init_job_exists
+    ignore_errors: yes
+
   - name: Init Job
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config
       namespace: "{{ NAMESPACE }}"
       template: job_init.yml.j2
-    when: WITH_SCHULCLOUD_INIT
+    when: WITH_SCHULCLOUD_INIT and init_job_exists.resources|length == 0
 
   - name: Remove Init Job
     kubernetes.core.k8s:

ansible/roles/schulcloud-server-init/templates/job_init.yml.j2

@@ -26,6 +26,13 @@ spec:
           subPath: update.sh
         command: ['/bin/sh','-c']
         args: ['cp /update.sh /update.run.sh && chmod +x /update.run.sh &&./update.run.sh']
+        resources:
+          limits:
+            cpu: "3000m"
+            memory: "1Gi"
+          requests:
+            cpu: "100m"
+            memory: "150Mi"
       volumes:
       - name: script
         configMap:

ansible/roles/schulcloud-server-init/templates/management-svc.yml.j2

@@ -5,9 +5,6 @@ metadata:
   namespace: {{ NAMESPACE }}
   labels:
     app: management-deployment
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/port: '3333'
 spec:
   type: ClusterIP
   ports: