Add Helm Chart Network Service and annotations

charts/tdw-server/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: postgresql
+  repository: https://charts.bitnami.com/bitnami/
+  version: 11.9.13
+- name: common
+  repository: https://charts.bitnami.com/bitnami/
+  version: 2.24.0
+digest: sha256:ebb431d33620262dddc5402877d6403aaaa1e20754a3d14c7c47d7e87660132d
+generated: "2024-10-08T13:49:49.494172968Z"

charts/tdw-server/Chart.yaml

@@ -3,16 +3,21 @@ name: trustdidweb-server-py
 icon: https://identity.foundation/trustdidweb/tdw.jpg
 description: An api server to register and serve trusted web dids.
 type: application
-version: 0.0.5
+version: 0.0.6
 appVersion: "0.0.5"
 
+maintainers:
+  - name: PatStLouis
+    email: [email protected]
+    url: https://github.com/PatStLouis
+
 dependencies:
   - name: postgresql
     version: 11.9.13
     repository: https://charts.bitnami.com/bitnami/
     condition: postgresql.enabled
   - name: common
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: https://charts.bitnami.com/bitnami/
     tags:
       - bitnami-common
-    version: 2.x.x
+    version: 2.x.x

charts/tdw-server/templates/postgresql/networkpolicy.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "global.postgresql.fullname" . }}
+  labels:
+    {{- include "postgresql.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include "postgresql.selectorLabels" . | nindent 6 }}
+  ingress:
+    - ports:
+        - protocol: TCP
+          port: {{ .Values.postgresql.primary.service.ports.postgresql }}
+      from:
+        - podSelector:
+            matchLabels:
+              {{- include "server.selectorLabels" . | nindent 14 }}
+  policyTypes:
+    - Ingress

charts/tdw-server/templates/ingress.yaml → charts/tdw-server/templates/server/ingress.yaml

@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   name: {{ include "server.fullname" . }}
   labels:
+    {{- toYaml .Values.server.labels | nindent 4 }}
     {{- include "server.labels" . | nindent 4 }}
 spec:
   tls:

charts/tdw-server/templates/server/networkpolicy.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "server.fullname" . }}-ingress
+  labels:
+    {{- include "server.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include "server.selectorLabels" . | nindent 6 }}
+  ingress:
+    - from:
+        - namespaceSelector:
+            matchLabels:
+              {{- toYaml .Values.networkPolicy.ingress.namespaceSelector | nindent 14 }}
+        - podSelector:
+            matchLabels:
+              {{- toYaml .Values.server.networkPolicy.ingress.podSelector | nindent 14 }}
+  policyTypes:
+    - Ingress

charts/tdw-server/values.yaml

@@ -5,12 +5,23 @@ ingressSuffix: ""
 
 selectorLabels: {}
 
+ingress:
+  labels: []
+  annotations: []
+
+networkPolicy:
+  ingress:
+    namespaceSelector: []
+
 server:
   image:
     repository: ghcr.io/decentralized-identity/trustdidweb-server-py
     pullPolicy: IfNotPresent
     pullSecrets: []
 
+  environment:
+    ENDORSER_MULTIKEY: ""
+
   replicaCount: 1
 
   podAnnotations: {}

server/app/routers/identifiers.py

@@ -30,21 +30,17 @@ async def request_did(
     raise HTTPException(status_code=400, detail="Missing request information.")
 
 
-@router.post("/{namespace}/{identifier}")
+@router.post("/")
 async def register_did(
     namespace: str,
     identifier: str,
     request_body: RegisterDID,
 ):
     did_document = request_body.model_dump()["didDocument"]
-    did = f"{settings.DID_WEB_BASE}:{namespace}:{identifier}"
+    did = did_document["id"]
 
     await identifier_available(did)
 
-    # Ensure correct endpoint is called
-    if did_document["id"] != did:
-        raise HTTPException(status_code=400, detail="Location mismatch.")
-
     # Assert proof set
     proof_set = did_document.pop("proof", None)
     if len(proof_set) != 2: