From a18bfa99079fc3f1774aaa4dc0f4c66bc2e2bdeb Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Fri, 9 May 2025 16:10:26 +0200 Subject: [PATCH] feat(admin): Add synapse admin deployment through internal network --- manifests/admin-deployment.yaml | 23 +++++++++++++++++++++++ manifests/database-local-service.yaml | 4 +--- manifests/internal-ingress.yaml | 18 ++++++++++++++++++ manifests/internal-service.yaml | 13 +++++++++++++ manifests/kustomization.yaml | 3 +++ manifests/service.yaml | 2 -- 6 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 manifests/admin-deployment.yaml create mode 100644 manifests/internal-ingress.yaml create mode 100644 manifests/internal-service.yaml diff --git a/manifests/admin-deployment.yaml b/manifests/admin-deployment.yaml new file mode 100644 index 0000000..999491b --- /dev/null +++ b/manifests/admin-deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: synapse-admin + namespace: synapse +spec: + replicas: 1 + selector: + matchLabels: + app: synapse-admin + template: + metadata: + labels: + app: synapse-admin + spec: + containers: + - name: synapse-admin + image: git.halis.io/athens-school/synapse-admin:0.10.3-etke39 + ports: + - containerPort: 80 + env: + - name: BUILDKIT_CONTEXT_KEEP_GIT_DIR + value: "1" diff --git a/manifests/database-local-service.yaml b/manifests/database-local-service.yaml index d91eb41..56bbc5f 100644 --- a/manifests/database-local-service.yaml +++ b/manifests/database-local-service.yaml @@ -1,9 +1,7 @@ apiVersion: v1 kind: Service metadata: - label: - cnpg.io/cluster: synapse-db - name: synapse-db + name: synapse-db-local namespace: synapse spec: internalTrafficPolicy: Local diff --git a/manifests/internal-ingress.yaml b/manifests/internal-ingress.yaml new file mode 100644 index 0000000..af85fb9 --- /dev/null +++ b/manifests/internal-ingress.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: synapse-admin-ingress + namespace: synapse +spec: + ingressClassName: nginx-internal + rules: + - host: synapse-admin.entos + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: synapse-admin-svc + port: + number: 80 diff --git a/manifests/internal-service.yaml b/manifests/internal-service.yaml new file mode 100644 index 0000000..5b5db07 --- /dev/null +++ b/manifests/internal-service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: synapse-admin-svc + namespace: synapse +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: 80 + selector: + app: synapse-admin diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml index b9555c6..9c8e47f 100644 --- a/manifests/kustomization.yaml +++ b/manifests/kustomization.yaml @@ -8,9 +8,12 @@ resources: - database-backup.yaml - database-local-service.yaml - service.yaml + - internal-service.yaml - servicemonitor.yaml - ingress.yaml + - internal-ingress.yaml - configmap.yaml - secrets.yaml - deployment.yaml + - admin-deployment.yaml - ./bridges diff --git a/manifests/service.yaml b/manifests/service.yaml index 537d096..a332c96 100644 --- a/manifests/service.yaml +++ b/manifests/service.yaml @@ -3,8 +3,6 @@ kind: Service metadata: name: synapse-svc namespace: synapse - labels: - app.kubernetes.io/name: synapse spec: ports: - name: http