diff --git a/deployment/ansible/roles/common/templates/jail.local.j2 b/deployment/ansible/roles/common/templates/jail.local.j2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/deployment/k3s/Chart.yaml b/deployment/k3s/Chart.yaml deleted file mode 100644 index ba08684b7..000000000 --- a/deployment/k3s/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: NavigaTUM -description: Navigating around TUM with excellence – An API and website to search for rooms, buildings and other places -version: 1.0.0 -apiVersion: v1 -deprecated: false -icon: https://nav.tum.de/favicon.ico diff --git a/deployment/k3s/templates/deployments/data-deployment.yaml b/deployment/k3s/templates/deployments/data-deployment.yaml deleted file mode 100644 index 70ab174e0..000000000 --- a/deployment/k3s/templates/deployments/data-deployment.yaml +++ /dev/null @@ -1,62 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: data - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: cdn - namespace: {{ $.Values.namespace }} -spec: - replicas: 1 - revisionHistoryLimit: 0 - selector: - matchLabels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: cdn - strategy: - rollingUpdate: - maxSurge: 100% - maxUnavailable: 0% - type: RollingUpdate - template: - metadata: - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: cdn - spec: - priorityClassName: {{ $.Values.url }} - containers: - - name: data - image: "ghcr.io/tum-dev/navigatum-data:{{ $.Values.tag }}" - imagePullPolicy: Always - ports: - - containerPort: 3002 - name: http - resources: - requests: - cpu: 5m - memory: 20Mi - limits: - memory: 20Mi - livenessProbe: - httpGet: - path: /cdn/health - port: http - failureThreshold: 5 - periodSeconds: 1 - startupProbe: - httpGet: - path: /cdn/health - port: http - failureThreshold: 60 - periodSeconds: 1 - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID diff --git a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml b/deployment/k3s/templates/deployments/maps/maps-deployment.yaml deleted file mode 100644 index 4986a219d..000000000 --- a/deployment/k3s/templates/deployments/maps/maps-deployment.yaml +++ /dev/null @@ -1,115 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: maps - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - namespace: {{ $.Values.namespace }} -spec: - replicas: {{ if eq "nav.tum.de" $.Values.url }}2{{ else }}1{{ end }} - revisionHistoryLimit: 0 - selector: - matchLabels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - strategy: - rollingUpdate: - maxSurge: {{ if eq "nav.tum.de" $.Values.url }}50%{{ else }}100%{{ end }} - maxUnavailable: {{ if eq "nav.tum.de" $.Values.url }}50%{{ else }}0%{{ end }} - type: RollingUpdate - template: - metadata: - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - spec: - priorityClassName: {{ $.Values.url }} - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: tileserver - operator: In - values: - - ready - volumes: - - name: tmp-tileserver - emptyDir: {} - - name: sprites-tileserver - emptyDir: {} - - name: tileserver-vol - persistentVolumeClaim: - readOnly: false - claimName: tileserver-pvc - - name: tileserver-config - configMap: - name: tileserver-config - initContainers: - - name: tileserver-init-sprites - image: "busybox:latest" - command: - - sh - - -c - {{- $spritesURL := "https://raw.githubusercontent.com/maputnik/osm-liberty/gh-pages/sprites" }} - - "rm -f /sprites/* && wget -P /sprites {{ $spritesURL }}/osm-liberty.json {{ $spritesURL }}/osm-liberty@2x.json {{ $spritesURL }}/osm-liberty.png {{ $spritesURL }}/osm-liberty@2x.png" - volumeMounts: - - mountPath: /sprites - name: sprites-tileserver - containers: - - name: tileserver - image: maptiler/tileserver-gl:latest - imagePullPolicy: Always - ports: - - containerPort: 8080 - name: tileserver - args: - - --public_url=https://{{ $.Values.url }}/maps/ # we want this to live under /maps/ - volumeMounts: - - name: tmp-tileserver - mountPath: /tmp - - name: tileserver-vol - mountPath: /data - - name: tileserver-config - mountPath: /data/config.json - subPath: config.json - - name: sprites-tileserver - mountPath: /data/sprites - - name: tileserver-config - mountPath: /data/styles/osm-liberty.json - subPath: osm-liberty.json - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - capabilities: - drop: - - ALL - resources: - requests: - cpu: {{ if eq "nav.tum.de" $.Values.url }}100m{{ else }}10m{{ end }} - memory: {{ if eq "nav.tum.de" $.Values.url }}800Mi{{ else }}300Mi{{ end }} - limits: - memory: {{ if eq "nav.tum.de" $.Values.url }}1000Mi{{ else }}500Mi{{ end }} - livenessProbe: - httpGet: - path: /health - port: tileserver - failureThreshold: 2 - periodSeconds: 10 - startupProbe: - httpGet: - path: /health - port: tileserver - failureThreshold: 6 - periodSeconds: 10 - - name: tileserver-src # serve tileserver-vol at /maps/vol/... - image: nginx:1.25 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 80 - name: http - volumeMounts: - - name: tileserver-vol - mountPath: /usr/share/nginx/html/maps/vol - readOnly: true diff --git a/deployment/k3s/templates/deployments/maps/tileserver-config.yaml b/deployment/k3s/templates/deployments/maps/tileserver-config.yaml deleted file mode 100644 index 40710f189..000000000 --- a/deployment/k3s/templates/deployments/maps/tileserver-config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: tileserver-config - namespace: {{ $.Values.namespace }} -data: - osm-liberty.json: |- -{{ .Files.Get "files/osm-liberty.json" | indent 4 }} - config.json: |- -{{ .Files.Get "files/config.json" | indent 4 }} diff --git a/deployment/k3s/templates/deployments/maps/tileserver-volume.yaml b/deployment/k3s/templates/deployments/maps/tileserver-volume.yaml deleted file mode 100644 index dbd26a93f..000000000 --- a/deployment/k3s/templates/deployments/maps/tileserver-volume.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: tileserver-{{ $.Values.namespace }} - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - type: local -spec: - storageClassName: local - capacity: - storage: 80Gi - persistentVolumeReclaimPolicy: Retain - accessModes: - - ReadWriteMany - hostPath: - path: "/mnt/data/navigatum/tileserver" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: tileserver-pvc - namespace: {{ $.Values.namespace }} - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - type: local -spec: - storageClassName: local - accessModes: - - ReadWriteMany - resources: - requests: - storage: 80Gi diff --git a/deployment/k3s/templates/deployments/postgres/posgres-deployment.yaml b/deployment/k3s/templates/deployments/postgres/posgres-deployment.yaml deleted file mode 100644 index 23a10f0e4..000000000 --- a/deployment/k3s/templates/deployments/postgres/posgres-deployment.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{{- if eq "nav.tum.de" $.Values.url }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: postgres - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres - namespace: {{ $.Values.namespace }} -spec: - replicas: 1 - revisionHistoryLimit: 0 - strategy: - rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 - type: RollingUpdate - selector: - matchLabels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres - template: - metadata: - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres - spec: - priorityClassName: {{ $.Values.url }} - volumes: - - name: db-vol - persistentVolumeClaim: - readOnly: false - claimName: postgres-pvc - containers: - - name: postgres - image: postgres:16 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 5432 - name: postgres - env: - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: postgres-db-secret - key: password - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: postgres-db-secret - key: user - - name: PGDATA - value: /var/lib/postgresql/data/pgdata - volumeMounts: - - mountPath: /var/lib/postgresql/data - name: db-vol - securityContext: - allowPrivilegeEscalation: false - {{ end }} diff --git a/deployment/k3s/templates/deployments/postgres/postgres-volume.yaml b/deployment/k3s/templates/deployments/postgres/postgres-volume.yaml deleted file mode 100644 index cfd320b0b..000000000 --- a/deployment/k3s/templates/deployments/postgres/postgres-volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if eq "nav.tum.de" $.Values.url }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: postgres-pvc - namespace: navigatum - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres -spec: - storageClassName: local-path - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 3Gi -{{ end }} diff --git a/deployment/k3s/templates/deployments/server-deployment.yaml b/deployment/k3s/templates/deployments/server-deployment.yaml deleted file mode 100644 index 638e86191..000000000 --- a/deployment/k3s/templates/deployments/server-deployment.yaml +++ /dev/null @@ -1,149 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: server - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api - namespace: {{ $.Values.namespace }} -spec: - replicas: 1 - revisionHistoryLimit: 0 - selector: - matchLabels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api - strategy: - rollingUpdate: - maxSurge: 100% - maxUnavailable: 0% - type: RollingUpdate - template: - metadata: - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api - {{- if eq "nav.tum.de" $.Values.url }} - annotations: - prometheus.io/path: /metrics - prometheus.io/port: '8080' - prometheus.io/scrape: 'true' - {{- end }} - spec: - priorityClassName: {{ $.Values.url }} - containers: - - name: server - image: "ghcr.io/tum-dev/navigatum-server:{{ $.Values.tag }}" - imagePullPolicy: Always - command: ["sh", "-c", "pwd && ls -lah && /bin/navigatum-main-api"] - {{ if $.Values.server.MEILI_MASTER_KEY }} - envFrom: - - secretRef: - name: server-api-keys # MEILI_MASTER_KEY - {{ end }} - env: - - name: POSTGRES_URL - value: postgres-rw.navigatum.svc.cluster.local - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: postgres-db-secret - key: user - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: postgres-db-secret - key: password - ports: - - containerPort: 3003 - name: api - securityContext: - allowPrivilegeEscalation: false - resources: - requests: - cpu: {{ if eq "nav.tum.de" $.Values.url }}500m{{ else }}5m{{ end }} - memory: 1000Mi - limits: - memory: 2000Mi - livenessProbe: - httpGet: - path: /api/status - port: api - failureThreshold: 5 - periodSeconds: 1 - startupProbe: - httpGet: - path: /api/status - port: api - failureThreshold: 240 - initialDelaySeconds: 30 - periodSeconds: 1 - - name: mieli-search - image: {{ $.Values.mielisearch.image.repository }}:{{ $.Values.mielisearch.image.tag }} - imagePullPolicy: IfNotPresent - envFrom: - - secretRef: - name: server-api-keys # GITHUB_TOKEN, JWT_KEY, CONNECTUM_OAUTH_CLIENT_{SECRET,ID} - - secretRef: - name: server-search-key # MEILI_MASTER_KEY - env: - - name: MEILI_ENV - value: production - ports: - - containerPort: 7700 - name: http - resources: - requests: - cpu: {{ if eq "nav.tum.de" $.Values.url }}200m{{ else }}50m{{ end }} - memory: {{ if eq "nav.tum.de" $.Values.url }}200Mi{{ else }}50Mi{{ end }} - limits: - memory: 500Mi - livenessProbe: - httpGet: - path: /health - port: http - failureThreshold: 2 - periodSeconds: 10 - startupProbe: - httpGet: - path: /health - port: http - periodSeconds: 1 - initialDelaySeconds: 10 - failureThreshold: 60 - readinessProbe: - httpGet: - path: /health - port: http - periodSeconds: 10 - failureThreshold: 2 -{{ if $.Values.server.MEILI_MASTER_KEY }} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: server-search-key - namespace: {{ $.Values.namespace }} - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api -data: - MEILI_MASTER_KEY: {{ $.Values.server.MEILI_MASTER_KEY }} -{{ end }} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: server-api-keys - namespace: {{ $.Values.namespace }} - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api -data: - MEILI_MASTER_KEY: {{ $.Values.server.MEILI_MASTER_KEY }} - GITHUB_TOKEN: {{ $.Values.server.GITHUB_TOKEN }} - JWT_KEY: {{ $.Values.server.JWT_KEY }} - CONNECTUM_OAUTH_CLIENT_SECRET: {{ $.Values.server.CONNECTUM_OAUTH_CLIENT_SECRET }} - CONNECTUM_OAUTH_CLIENT_ID: {{ $.Values.server.CONNECTUM_OAUTH_CLIENT_ID }} diff --git a/deployment/k3s/templates/deployments/webclient-deployment.yaml b/deployment/k3s/templates/deployments/webclient-deployment.yaml deleted file mode 100644 index 0d3d26a8a..000000000 --- a/deployment/k3s/templates/deployments/webclient-deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: webclient - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: web - namespace: {{ $.Values.namespace }} -spec: - replicas: 1 - revisionHistoryLimit: 0 - selector: - matchLabels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: web - strategy: - rollingUpdate: - maxSurge: 100% - maxUnavailable: 0% - type: RollingUpdate - template: - metadata: - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: web - spec: - priorityClassName: {{ $.Values.url }} - containers: - - name: webclient - image: "ghcr.io/tum-dev/navigatum-webclient:{{ $.Values.tag }}" - imagePullPolicy: Always - ports: - - containerPort: 3000 - name: webclient - env: - - name: TILESERVER_URL - value: http://maps-svc.navigatum.svc.cluster.local:8080 - - name: CDN_URL - value: http://cdn-svc.navigatum.svc.cluster.local:3002 - - name: MAIN_API_URL - value: http://api-svc.navigatum.svc.cluster.local:3003 - resources: - requests: - cpu: 50m - memory: 500Mi - limits: - memory: 500Mi - livenessProbe: - httpGet: - path: /health - port: webclient - failureThreshold: 3 - periodSeconds: 5 - startupProbe: - httpGet: - path: /health - port: webclient - failureThreshold: 60 - periodSeconds: 1 - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - add: - - CHOWN - - DAC_OVERRIDE - - SETGID - - SETUID diff --git a/deployment/k3s/templates/namespace.yaml b/deployment/k3s/templates/namespace.yaml deleted file mode 100644 index b34852830..000000000 --- a/deployment/k3s/templates/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - kubernetes.io/metadata.name: {{ $.Values.namespace }} - name: {{ $.Values.namespace }} diff --git a/deployment/k3s/templates/networking/https-cert.yaml b/deployment/k3s/templates/networking/https-cert.yaml deleted file mode 100644 index d5abe3a01..000000000 --- a/deployment/k3s/templates/networking/https-cert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $.Values.url }} - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - commonName: {{ $.Values.url }} - dnsNames: - - {{ $.Values.url }} - {{ if eq "nav.tum.de" $.Values.url }} - - www.nav.tum.de - - nav.tum.sexy - {{ end }} - secretName: {{ $.Values.url }} - issuerRef: - name: letsencrypt-production - kind: ClusterIssuer diff --git a/deployment/k3s/templates/networking/ingress.yaml b/deployment/k3s/templates/networking/ingress.yaml deleted file mode 100644 index 230f108c4..000000000 --- a/deployment/k3s/templates/networking/ingress.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: ingress - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - entryPoints: - - websecure - routes: - - kind: Rule - match: Host(`{{ $.Values.url }}`) && PathPrefix(`/api/`) - services: - - name: api-svc - port: 3003 - - kind: Rule - match: Host(`{{ $.Values.url }}`) && PathPrefix(`/maps/vol/`) - services: - - name: maps-svc - port: 7771 - - kind: Rule - match: Host(`{{ $.Values.url }}`) && PathPrefix(`/maps/`) - services: - - name: maps-svc - port: 8080 - middlewares: - - name: stripprefix - - name: compress - - name: cache-2-months - - kind: Rule - match: Host(`{{ $.Values.url }}`) && PathPrefix(`/cdn/`) - services: - - name: cdn-svc - port: 3002 - middlewares: - - name: stripprefix - - kind: Rule - match: Host(`{{ $.Values.url }}`) - services: - - name: webclient-svc - port: 3000 - - kind: Rule - match: Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`) - services: - - name: noop@internal - kind: TraefikService - middlewares: - - name: nav-tum-de-redirect - tls: - secretName: {{ $.Values.url }} ---- -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: ingress-http - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - entryPoints: - - web - routes: - - kind: Rule - match: Host(`{{ $.Values.url }}`) - services: - - name: noop@internal - kind: TraefikService - middlewares: - - name: https - - kind: Rule - match: Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`) - services: - - name: noop@internal - kind: TraefikService - middlewares: - - name: nav-tum-de-redirect diff --git a/deployment/k3s/templates/networking/middleware/cache-2-months-middleware.yaml b/deployment/k3s/templates/networking/middleware/cache-2-months-middleware.yaml deleted file mode 100644 index 6279aae71..000000000 --- a/deployment/k3s/templates/networking/middleware/cache-2-months-middleware.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: cache-2-months - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - headers: - customResponseHeaders: - Cache-Control: "public, max-age=5184000" diff --git a/deployment/k3s/templates/networking/middleware/compress-middleware.yaml b/deployment/k3s/templates/networking/middleware/compress-middleware.yaml deleted file mode 100644 index f3cb92af9..000000000 --- a/deployment/k3s/templates/networking/middleware/compress-middleware.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: compress -spec: - compress: {} diff --git a/deployment/k3s/templates/networking/middleware/https-middleware.yaml b/deployment/k3s/templates/networking/middleware/https-middleware.yaml deleted file mode 100644 index 1d95da512..000000000 --- a/deployment/k3s/templates/networking/middleware/https-middleware.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: https - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - redirectScheme: - scheme: https - permanent: true diff --git a/deployment/k3s/templates/networking/middleware/nav-tum-de-redirect.yaml b/deployment/k3s/templates/networking/middleware/nav-tum-de-redirect.yaml deleted file mode 100644 index 617f0db78..000000000 --- a/deployment/k3s/templates/networking/middleware/nav-tum-de-redirect.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: nav-tum-de-redirect - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - redirectRegex: - regex: "^(https?://.*)nav.tum.(app|sexy)/(.*)$" - replacement: "${1}nav.tum.de/${3}" - permanent: true diff --git a/deployment/k3s/templates/networking/middleware/stripprefix-middleware.yaml b/deployment/k3s/templates/networking/middleware/stripprefix-middleware.yaml deleted file mode 100644 index ca624206f..000000000 --- a/deployment/k3s/templates/networking/middleware/stripprefix-middleware.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: stripprefix - labels: - app.kubernetes.io/part-of: navigatum - namespace: {{ $.Values.namespace }} -spec: - stripPrefix: - prefixes: - - /maps diff --git a/deployment/k3s/templates/networking/service.yaml b/deployment/k3s/templates/networking/service.yaml deleted file mode 100644 index 0e646d377..000000000 --- a/deployment/k3s/templates/networking/service.yaml +++ /dev/null @@ -1,94 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: api-svc - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api - namespace: {{ $.Values.namespace }} -spec: - type: ClusterIP - selector: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: api - ports: - - name: http - port: 3003 - targetPort: 3003 ---- -apiVersion: v1 -kind: Service -metadata: - name: maps-svc - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - namespace: {{ $.Values.namespace }} -spec: - type: ClusterIP - selector: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: maps - ports: - - name: http - port: 8080 - targetPort: 8080 - - name: src - port: 7771 - targetPort: 80 ---- -apiVersion: v1 -kind: Service -metadata: - name: cdn-svc - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: cdn - namespace: {{ $.Values.namespace }} -spec: - type: ClusterIP - selector: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: cdn - ports: - - name: http - port: 3002 - targetPort: 3002 ---- -apiVersion: v1 -kind: Service -metadata: - name: webclient-svc - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: web - namespace: {{ $.Values.namespace }} -spec: - type: ClusterIP - selector: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: web - ports: - - name: http - port: 3000 - targetPort: 3000 - {{- if eq "nav.tum.de" $.Values.url }} ---- -apiVersion: v1 -kind: Service -metadata: - name: postgres-rw - labels: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres - namespace: {{ $.Values.namespace }} -spec: - type: ClusterIP - selector: - app.kubernetes.io/part-of: navigatum - app.kubernetes.io/name: postgres - ports: - - name: postgres - port: 5432 - targetPort: 5432 - {{ end }} diff --git a/deployment/k3s/templates/priority_class.yaml b/deployment/k3s/templates/priority_class.yaml deleted file mode 100644 index 5a0ab8383..000000000 --- a/deployment/k3s/templates/priority_class.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: scheduling.k8s.io/v1 -kind: PriorityClass -metadata: - name: {{ $.Values.url }} -value: {{ if eq "nav.tum.de" $.Values.url }}1000{{ else }}-1000{{ end }} -globalDefault: false -description: This priority class should be used for {{ $.Values.url }}. diff --git a/deployment/k3s/values.yaml b/deployment/k3s/values.yaml deleted file mode 100644 index 2399a0bec..000000000 --- a/deployment/k3s/values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -namespace: navigatum -tag: main -url: nav.tum.de -server: - CONNECTUM_OAUTH_CLIENT_SECRET: "" - CONNECTUM_OAUTH_CLIENT_ID: "" - MEILI_MASTER_KEY: "" - GITHUB_TOKEN: "" - JWT_KEY: "" -mielisearch: - image: - repository: 'getmeili/meilisearch' - tag: v1.8.0 -calendar: - scrape_tasks: - - name: refresh-calendar-slow # takes ~6m to complete - schedule: "5 * * * *" # at :05 every hour - scraped_time_window_months: 120 # 120 months = 10 years