From 2264815876e61445d31ac596b0b2cc0916cd2aa1 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Tue, 10 Sep 2024 12:21:01 -0400 Subject: [PATCH 1/5] dev tdw server values Signed-off-by: pstlouis --- .../trustdidweb-server-py/values-dev.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 helm-values/trustdidweb-server-py/values-dev.yaml diff --git a/helm-values/trustdidweb-server-py/values-dev.yaml b/helm-values/trustdidweb-server-py/values-dev.yaml new file mode 100644 index 0000000..303dde8 --- /dev/null +++ b/helm-values/trustdidweb-server-py/values-dev.yaml @@ -0,0 +1,58 @@ +--- +ingressSuffix: .apps.silver.devops.gov.bc.ca +openshift: + route: + path: "/" + tls: + enabled: true + insecureEdgeTerminationPolicy: None + termination: edge + wildcardPolicy: None + timeout: 2m +ingress: + labels: + certbot-managed: "true" + annotations: + route.openshift.io/termination: edge +networkPolicy: + ingress: + namespaceSelector: + network.openshift.io/policy-group: ingress +server: + image: + pullPolicy: Always + host: "dev.digitaltrust.vonx.io" + environment: + DOMAIN: "dev.digitaltrust.vonx.io" + ENDORSER_MULTIKEY: "z6MkhBoJbVzavFnKza3eP413fCuaCojottETdyqGQz9Moimq" + autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 + stabilizationWindowSeconds: 300 + resources: + limits: + cpu: 400m + memory: 1600Mi + requests: + cpu: 200m + memory: 820Mi + networkPolicy: + enabled: true + ingress: + enabled: true + namespaceSelector: + network.openshift.io/policy-group: ingress +postgresql: + primary: + persistence: + size: 5Gi + resources: + limits: + cpu: 2 + memory: 4000Mi + requests: + cpu: 200m + memory: 820Mi From e10d4537feaadfb0dc8f48d869c0952e0d16e943 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Wed, 9 Oct 2024 15:51:52 -0400 Subject: [PATCH 2/5] edit values Signed-off-by: pstlouis --- helm-values/trustdidweb-server-py/values-dev.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/helm-values/trustdidweb-server-py/values-dev.yaml b/helm-values/trustdidweb-server-py/values-dev.yaml index 303dde8..4d4dce8 100644 --- a/helm-values/trustdidweb-server-py/values-dev.yaml +++ b/helm-values/trustdidweb-server-py/values-dev.yaml @@ -1,14 +1,6 @@ --- ingressSuffix: .apps.silver.devops.gov.bc.ca -openshift: - route: - path: "/" - tls: - enabled: true - insecureEdgeTerminationPolicy: None - termination: edge - wildcardPolicy: None - timeout: 2m + ingress: labels: certbot-managed: "true" @@ -18,13 +10,14 @@ networkPolicy: ingress: namespaceSelector: network.openshift.io/policy-group: ingress + server: image: pullPolicy: Always host: "dev.digitaltrust.vonx.io" environment: DOMAIN: "dev.digitaltrust.vonx.io" - ENDORSER_MULTIKEY: "z6MkhBoJbVzavFnKza3eP413fCuaCojottETdyqGQz9Moimq" + ENDORSER_MULTIKEY: "z6MkqTopWc3mB8dkqQfyNfEJkGR2HWuLnC3RZo6LbEfCPPDU" autoscaling: enabled: true minReplicas: 1 From 4239cc398d8750447f36e25107e96adec80acaf5 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Thu, 10 Oct 2024 10:36:46 -0400 Subject: [PATCH 3/5] move files and charts Signed-off-by: pstlouis --- .../trustdidweb-server-py/charts/dev/Chart.yaml | 10 ++++++++++ .../trustdidweb-server-py/charts/dev/values.yaml | 16 +++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 services/trustdidweb-server-py/charts/dev/Chart.yaml rename helm-values/trustdidweb-server-py/values-dev.yaml => services/trustdidweb-server-py/charts/dev/values.yaml (72%) diff --git a/services/trustdidweb-server-py/charts/dev/Chart.yaml b/services/trustdidweb-server-py/charts/dev/Chart.yaml new file mode 100644 index 0000000..9fe9933 --- /dev/null +++ b/services/trustdidweb-server-py/charts/dev/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: tdw-server +description: tdw-server - dev +type: application +version: 0.0.9 +appVersion: "0.1.0" +dependencies: + - name: tdw-server + version: 0.0.9 + repository: https://identity.foundation/trustdidweb-server-py diff --git a/helm-values/trustdidweb-server-py/values-dev.yaml b/services/trustdidweb-server-py/charts/dev/values.yaml similarity index 72% rename from helm-values/trustdidweb-server-py/values-dev.yaml rename to services/trustdidweb-server-py/charts/dev/values.yaml index 4d4dce8..497f9df 100644 --- a/helm-values/trustdidweb-server-py/values-dev.yaml +++ b/services/trustdidweb-server-py/charts/dev/values.yaml @@ -1,23 +1,21 @@ --- -ingressSuffix: .apps.silver.devops.gov.bc.ca - ingress: - labels: - certbot-managed: "true" annotations: route.openshift.io/termination: edge networkPolicy: ingress: namespaceSelector: network.openshift.io/policy-group: ingress - + server: image: + repository: image-registry.openshift-image-registry.svc:5000/4a9599-tools/tdw-server + tag: latest pullPolicy: Always - host: "dev.digitaltrust.vonx.io" + host: "registry-dev.apps.silver.devops.gov.bc.ca" environment: - DOMAIN: "dev.digitaltrust.vonx.io" - ENDORSER_MULTIKEY: "z6MkqTopWc3mB8dkqQfyNfEJkGR2HWuLnC3RZo6LbEfCPPDU" + DOMAIN: "registry-dev.apps.silver.devops.gov.bc.ca" + ENDORSER_MULTIKEY: "z6MkgSZwM4LUgh2WEtX6TC1FRYevRbgZHkH4ty7e13TiSQy3" autoscaling: enabled: true minReplicas: 1 @@ -48,4 +46,4 @@ postgresql: memory: 4000Mi requests: cpu: 200m - memory: 820Mi + memory: 820Mi \ No newline at end of file From 08049dee9b5fa93acbd108fc12d4f6fbb857c2a6 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Thu, 10 Oct 2024 15:02:54 -0400 Subject: [PATCH 4/5] add test configurations Signed-off-by: pstlouis --- .../charts/test/Chart.yaml | 10 ++++ .../charts/test/values.yaml | 49 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 services/trustdidweb-server-py/charts/test/Chart.yaml create mode 100644 services/trustdidweb-server-py/charts/test/values.yaml diff --git a/services/trustdidweb-server-py/charts/test/Chart.yaml b/services/trustdidweb-server-py/charts/test/Chart.yaml new file mode 100644 index 0000000..9fe9933 --- /dev/null +++ b/services/trustdidweb-server-py/charts/test/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: tdw-server +description: tdw-server - dev +type: application +version: 0.0.9 +appVersion: "0.1.0" +dependencies: + - name: tdw-server + version: 0.0.9 + repository: https://identity.foundation/trustdidweb-server-py diff --git a/services/trustdidweb-server-py/charts/test/values.yaml b/services/trustdidweb-server-py/charts/test/values.yaml new file mode 100644 index 0000000..45a39ed --- /dev/null +++ b/services/trustdidweb-server-py/charts/test/values.yaml @@ -0,0 +1,49 @@ +--- +ingress: + annotations: + route.openshift.io/termination: edge +networkPolicy: + ingress: + namespaceSelector: + network.openshift.io/policy-group: ingress + +server: + image: + repository: image-registry.openshift-image-registry.svc:5000/4a9599-tools/tdw-server + tag: latest + pullPolicy: Always + host: "registry-test.apps.silver.devops.gov.bc.ca" + environment: + DOMAIN: "registry-test.apps.silver.devops.gov.bc.ca" + ENDORSER_MULTIKEY: "z6Mkqnasc6f4mY1vbpGxCkgZNW5VGumPNQGMyqCpf8zWgUX8" + autoscaling: + enabled: true + minReplicas: 1 + maxReplicas: 10 + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 + stabilizationWindowSeconds: 300 + resources: + limits: + cpu: 400m + memory: 1600Mi + requests: + cpu: 200m + memory: 820Mi + networkPolicy: + enabled: true + ingress: + enabled: true + namespaceSelector: + network.openshift.io/policy-group: ingress +postgresql: + primary: + persistence: + size: 5Gi + resources: + limits: + cpu: 2 + memory: 4000Mi + requests: + cpu: 200m + memory: 820Mi \ No newline at end of file From 5a0152277cb51f82740a168c685f9e00c20aae33 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Tue, 15 Oct 2024 13:15:58 -0400 Subject: [PATCH 5/5] change image link Signed-off-by: pstlouis --- services/trustdidweb-server-py/charts/dev/values.yaml | 4 ++-- services/trustdidweb-server-py/charts/test/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/trustdidweb-server-py/charts/dev/values.yaml b/services/trustdidweb-server-py/charts/dev/values.yaml index 497f9df..430b620 100644 --- a/services/trustdidweb-server-py/charts/dev/values.yaml +++ b/services/trustdidweb-server-py/charts/dev/values.yaml @@ -9,8 +9,8 @@ networkPolicy: server: image: - repository: image-registry.openshift-image-registry.svc:5000/4a9599-tools/tdw-server - tag: latest + repository: ghcr.io/decentralized-identity/trustdidweb-server-py + tag: 0.1.0 pullPolicy: Always host: "registry-dev.apps.silver.devops.gov.bc.ca" environment: diff --git a/services/trustdidweb-server-py/charts/test/values.yaml b/services/trustdidweb-server-py/charts/test/values.yaml index 45a39ed..6278d5b 100644 --- a/services/trustdidweb-server-py/charts/test/values.yaml +++ b/services/trustdidweb-server-py/charts/test/values.yaml @@ -9,8 +9,8 @@ networkPolicy: server: image: - repository: image-registry.openshift-image-registry.svc:5000/4a9599-tools/tdw-server - tag: latest + repository: ghcr.io/decentralized-identity/trustdidweb-server-py + tag: 0.1.0 pullPolicy: Always host: "registry-test.apps.silver.devops.gov.bc.ca" environment: