-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into BC-4256-Integration-tldraw
# Conflicts: # apps/server/src/modules/authentication/index.ts
- Loading branch information
Showing
708 changed files
with
10,729 additions
and
10,346 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
ansible/roles/schulcloud-server-core/templates/api-files-ingress.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ NAMESPACE }}-api-files-ingress | ||
| namespace: {{ NAMESPACE }} | ||
| annotations: | ||
| nginx.ingress.kubernetes.io/ssl-redirect: "{{ TLS_ENABELD|default("false") }}" | ||
| nginx.ingress.kubernetes.io/proxy-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| nginx.org/client-max-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| # The following properties added with BC-3606. | ||
| # The header size of the request is too big. For e.g. state and the permanent growing jwt. | ||
| # Nginx throws away the Location header, resulting in the 502 Bad Gateway. | ||
| nginx.ingress.kubernetes.io/client-header-buffer-size: 100k | ||
| nginx.ingress.kubernetes.io/http2-max-header-size: 96k | ||
| nginx.ingress.kubernetes.io/large-client-header-buffers: 4 100k | ||
| nginx.ingress.kubernetes.io/proxy-buffer-size: 96k | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| cert-manager.io/cluster-issuer: {{ CLUSTER_ISSUER }} | ||
| {% endif %} | ||
|
|
||
| spec: | ||
| ingressClassName: nginx | ||
| {% if CLUSTER_ISSUER is defined or (TLS_ENABELD is defined and TLS_ENABELD|bool) %} | ||
| tls: | ||
| - hosts: | ||
| - {{ DOMAIN }} | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| secretName: {{ DOMAIN }}-tls | ||
| {% endif %} | ||
| {% endif %} | ||
| rules: | ||
| - host: {{ DOMAIN }} | ||
| http: | ||
| paths: | ||
| - path: /api/v3/file/ | ||
| backend: | ||
| service: | ||
| name: api-files-svc | ||
| port: | ||
| number: {{ PORT_FILE_SERVICE }} | ||
| pathType: Prefix |
41 changes: 41 additions & 0 deletions
41
ansible/roles/schulcloud-server-core/templates/api-fwu-ingress.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ NAMESPACE }}-api-fwu-ingress | ||
| namespace: {{ NAMESPACE }} | ||
| annotations: | ||
| nginx.ingress.kubernetes.io/ssl-redirect: "{{ TLS_ENABELD|default("false") }}" | ||
| nginx.ingress.kubernetes.io/proxy-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| nginx.org/client-max-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| # The following properties added with BC-3606. | ||
| # The header size of the request is too big. For e.g. state and the permanent growing jwt. | ||
| # Nginx throws away the Location header, resulting in the 502 Bad Gateway. | ||
| nginx.ingress.kubernetes.io/client-header-buffer-size: 100k | ||
| nginx.ingress.kubernetes.io/http2-max-header-size: 96k | ||
| nginx.ingress.kubernetes.io/large-client-header-buffers: 4 100k | ||
| nginx.ingress.kubernetes.io/proxy-buffer-size: 96k | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| cert-manager.io/cluster-issuer: {{ CLUSTER_ISSUER }} | ||
| {% endif %} | ||
|
|
||
| spec: | ||
| ingressClassName: nginx | ||
| {% if CLUSTER_ISSUER is defined or (TLS_ENABELD is defined and TLS_ENABELD|bool) %} | ||
| tls: | ||
| - hosts: | ||
| - {{ DOMAIN }} | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| secretName: {{ DOMAIN }}-tls | ||
| {% endif %} | ||
| {% endif %} | ||
| rules: | ||
| - host: {{ DOMAIN }} | ||
| http: | ||
| paths: | ||
| - path: /api/v3/fwu/ | ||
| backend: | ||
| service: | ||
| name: api-fwu-svc | ||
| port: | ||
| number: {{ PORT_FWU_LEARNING_CONTENTS }} | ||
| pathType: Prefix |
41 changes: 41 additions & 0 deletions
41
ansible/roles/schulcloud-server-core/templates/ingress.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ NAMESPACE }}-api-ingress | ||
| namespace: {{ NAMESPACE }} | ||
| annotations: | ||
| nginx.ingress.kubernetes.io/ssl-redirect: "{{ TLS_ENABELD|default("false") }}" | ||
| nginx.ingress.kubernetes.io/proxy-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| nginx.org/client-max-body-size: "{{ INGRESS_MAX_BODY_SIZE|default("2560") }}m" | ||
| # The following properties added with BC-3606. | ||
| # The header size of the request is too big. For e.g. state and the permanent growing jwt. | ||
| # Nginx throws away the Location header, resulting in the 502 Bad Gateway. | ||
| nginx.ingress.kubernetes.io/client-header-buffer-size: 100k | ||
| nginx.ingress.kubernetes.io/http2-max-header-size: 96k | ||
| nginx.ingress.kubernetes.io/large-client-header-buffers: 4 100k | ||
| nginx.ingress.kubernetes.io/proxy-buffer-size: 96k | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| cert-manager.io/cluster-issuer: {{ CLUSTER_ISSUER }} | ||
| {% endif %} | ||
|
|
||
| spec: | ||
| ingressClassName: nginx | ||
| {% if CLUSTER_ISSUER is defined or (TLS_ENABELD is defined and TLS_ENABELD|bool) %} | ||
| tls: | ||
| - hosts: | ||
| - {{ DOMAIN }} | ||
| {% if CLUSTER_ISSUER is defined %} | ||
| secretName: {{ DOMAIN }}-tls | ||
| {% endif %} | ||
| {% endif %} | ||
| rules: | ||
| - host: {{ DOMAIN }} | ||
| http: | ||
| paths: | ||
| - path: /api/v3/ | ||
| backend: | ||
| service: | ||
| name: api-svc | ||
| port: | ||
| number: {{ PORT_SERVER }} | ||
| pathType: Prefix |
8 changes: 8 additions & 0 deletions
8
ansible/roles/schulcloud-server-core/templates/preview-generator-configmap.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: preview-generator-configmap | ||
| namespace: {{ NAMESPACE }} | ||
| labels: | ||
| app: preview-generator | ||
| data: |
46 changes: 46 additions & 0 deletions
46
ansible/roles/schulcloud-server-core/templates/preview-generator-deployment.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: preview-generator-deployment | ||
| namespace: {{ NAMESPACE }} | ||
| labels: | ||
| app: preview-generator | ||
| spec: | ||
| replicas: {{ AMQP_FILE_PREVIEW_REPLICAS|default("1", true) }} | ||
| strategy: | ||
| type: RollingUpdate | ||
| rollingUpdate: | ||
| maxSurge: 1 | ||
| #maxUnavailable: 1 | ||
| revisionHistoryLimit: 4 | ||
| paused: false | ||
| selector: | ||
| matchLabels: | ||
| app: preview-generator | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: preview-generator | ||
| spec: | ||
| securityContext: | ||
| runAsUser: 1000 | ||
| runAsGroup: 1000 | ||
| fsGroup: 1000 | ||
| runAsNonRoot: true | ||
| containers: | ||
| - name: preview-generator | ||
| image: {{ SCHULCLOUD_SERVER_IMAGE }}:file-preview-{{ SCHULCLOUD_SERVER_IMAGE_TAG }} | ||
| imagePullPolicy: IfNotPresent | ||
| envFrom: | ||
| - configMapRef: | ||
| name: preview-generator-configmap | ||
| - secretRef: | ||
| name: preview-generator-secret | ||
| command: ['npm', 'run', 'nest:start:preview-generator-amqp:prod'] | ||
| resources: | ||
| limits: | ||
| cpu: {{ AMQP_FILE_PREVIEW_CPU_LIMITS|default("4000m", true) }} | ||
| memory: {{ AMQP_FILE_PREVIEW_MEMORY_LIMITS|default("4000Mi", true) }} | ||
| requests: | ||
| cpu: {{ AMQP_FILE_PREVIEW_CPU_REQUESTS|default("100m", true) }} | ||
| memory: {{ AMQP_FILE_PREVIEW_MEMORY_REQUESTS|default("250Mi", true) }} |
9 changes: 9 additions & 0 deletions
9
ansible/roles/schulcloud-server-core/templates/preview-generator-onepassword.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| apiVersion: onepassword.com/v1 | ||
| kind: OnePasswordItem | ||
| metadata: | ||
| name: preview-generator-secret | ||
| namespace: {{ NAMESPACE }} | ||
| labels: | ||
| app: preview-generator | ||
| spec: | ||
| itemPath: "vaults/{{ ONEPASSWORD_OPERATOR_VAULT }}/items/preview-generator" |
Oops, something went wrong.