From 738fe480bab1d6297bb18c2bee9c431f0a7ec931 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Sun, 19 May 2024 11:50:07 +0200 Subject: [PATCH] feat(ente): deploy cast --- ente/kustomization.yaml | 13 +++-- ente/resources/{web => cast}/deployment.yaml | 12 ++--- ente/resources/{web => cast}/service.yaml | 4 +- ente/resources/http_routes.yaml | 51 +++++++++++++------- ente/resources/photos/deployment.yaml | 37 ++++++++++++++ ente/resources/photos/service.yaml | 11 +++++ 6 files changed, 99 insertions(+), 29 deletions(-) rename ente/resources/{web => cast}/deployment.yaml (82%) rename ente/resources/{web => cast}/service.yaml (75%) create mode 100644 ente/resources/photos/deployment.yaml create mode 100644 ente/resources/photos/service.yaml diff --git a/ente/kustomization.yaml b/ente/kustomization.yaml index 77383dd..a9c9f1f 100644 --- a/ente/kustomization.yaml +++ b/ente/kustomization.yaml @@ -8,8 +8,11 @@ images: - name: museum newName: ghcr.io/ente-io/server newTag: 26e17d8464736acc747c1b35c65af194172a245c - - name: web - newName: code.icb4dc0.de/infrastructure/images/ente/web + - name: photos + newName: code.icb4dc0.de/infrastructure/images/ente/photos + newTag: photos-v0.8.94 + - name: cast + newName: code.icb4dc0.de/infrastructure/images/ente/cast newTag: photos-v0.8.94 labels: @@ -22,8 +25,10 @@ resources: - resources/namespace.yaml - resources/museum/deployment.yaml - resources/museum/service.yaml -- resources/web/deployment.yaml -- resources/web/service.yaml +- resources/photos/deployment.yaml +- resources/photos/service.yaml +- resources/cast/deployment.yaml +- resources/cast/service.yaml - resources/http_routes.yaml configMapGenerator: diff --git a/ente/resources/web/deployment.yaml b/ente/resources/cast/deployment.yaml similarity index 82% rename from ente/resources/web/deployment.yaml rename to ente/resources/cast/deployment.yaml index ea0e40c..d59aa92 100644 --- a/ente/resources/web/deployment.yaml +++ b/ente/resources/cast/deployment.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: web + name: cast spec: replicas: 2 selector: matchLabels: - app.kubernetes.io/name: web + app.kubernetes.io/name: cast app.kubernetes.io/part-of: ente template: metadata: labels: - app.kubernetes.io/name: web + app.kubernetes.io/name: cast app.kubernetes.io/part-of: ente spec: containers: - - name: web - image: web + - name: cast + image: cast imagePullPolicy: Always env: - name: ENDPOINT @@ -31,7 +31,7 @@ spec: memory: "128Mi" cpu: "50m" ports: - - name: web + - name: http containerPort: 3000 nodeSelector: kubernetes.io/arch: arm64 \ No newline at end of file diff --git a/ente/resources/web/service.yaml b/ente/resources/cast/service.yaml similarity index 75% rename from ente/resources/web/service.yaml rename to ente/resources/cast/service.yaml index 427a2ac..824bcd2 100644 --- a/ente/resources/web/service.yaml +++ b/ente/resources/cast/service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: web + name: cast spec: selector: - app.kubernetes.io/name: web + app.kubernetes.io/name: cast app.kubernetes.io/part-of: ente ports: - port: 3000 diff --git a/ente/resources/http_routes.yaml b/ente/resources/http_routes.yaml index d37de2d..f33c1f5 100644 --- a/ente/resources/http_routes.yaml +++ b/ente/resources/http_routes.yaml @@ -12,6 +12,7 @@ spec: - ente.icb4dc0.de - api.ente.icb4dc0.de - albums.ente.icb4dc0.de + - cast.ente.icb4dc0.de rules: - filters: - type: RequestRedirect @@ -21,22 +22,6 @@ spec: --- apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute -metadata: - name: https-web -spec: - parentRefs: - - name: contour - sectionName: https - namespace: projectcontour - hostnames: - - ente.icb4dc0.de - rules: - - backendRefs: - - name: ente-web - port: 3000 ---- -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute metadata: name: https-api spec: @@ -53,6 +38,22 @@ spec: --- apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute +metadata: + name: https-photos +spec: + parentRefs: + - name: contour + sectionName: https + namespace: projectcontour + hostnames: + - ente.icb4dc0.de + rules: + - backendRefs: + - name: ente-photos + port: 3000 +--- +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute metadata: name: https-albums spec: @@ -64,5 +65,21 @@ spec: - albums.ente.icb4dc0.de rules: - backendRefs: - - name: ente-web + - name: ente-photos + port: 3000 +--- +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: https-cast +spec: + parentRefs: + - name: contour + sectionName: ente-endpoints + namespace: projectcontour + hostnames: + - cast.ente.icb4dc0.de + rules: + - backendRefs: + - name: ente-cast port: 3000 \ No newline at end of file diff --git a/ente/resources/photos/deployment.yaml b/ente/resources/photos/deployment.yaml new file mode 100644 index 0000000..d674e8f --- /dev/null +++ b/ente/resources/photos/deployment.yaml @@ -0,0 +1,37 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: photos +spec: + replicas: 2 + selector: + matchLabels: + app.kubernetes.io/name: photos + app.kubernetes.io/part-of: ente + template: + metadata: + labels: + app.kubernetes.io/name: photos + app.kubernetes.io/part-of: ente + spec: + containers: + - name: photos + image: photos + imagePullPolicy: Always + env: + - name: ENDPOINT + value: https://api.ente.icb4dc0.de + - name: ALBUMS_ENDPOINT + value: https://albums.ente.icb4dc0.de + resources: + requests: + memory: "64Mi" + cpu: "25m" + limits: + memory: "128Mi" + cpu: "50m" + ports: + - name: http + containerPort: 3000 + nodeSelector: + kubernetes.io/arch: arm64 \ No newline at end of file diff --git a/ente/resources/photos/service.yaml b/ente/resources/photos/service.yaml new file mode 100644 index 0000000..dc6a915 --- /dev/null +++ b/ente/resources/photos/service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: photos +spec: + selector: + app.kubernetes.io/name: photos + app.kubernetes.io/part-of: ente + ports: + - port: 3000 + targetPort: 3000