From 8aa9a2208bf37781950253b0feeab9b7eb35c686 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 22 Jun 2023 19:03:20 +0300 Subject: [PATCH 001/178] Upgraded eoc version to 0.4.0 --- charts/eoc/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index eec0e64..a604cb6 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -26,6 +26,8 @@ ui: # override infrastructure name used for environment name prefix infrastructureName: "" kibanaApiPath: /kibana/index-patterns + amplitude: + key: "" image: repository: radiantone/eoc-ui pullPolicy: Always @@ -95,8 +97,6 @@ backend: # should have enough permission to be able to create a service account username: admin password: xxxx - amplitude: - key: "" agents: api: endpoint: "" From 9e76fc2b93ccf2548e9bcd909b007a8948d449de Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 22 Jun 2023 19:49:06 +0300 Subject: [PATCH 002/178] Upgraded eoc version to 0.4.0 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index a604cb6..ded2b1f 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -31,7 +31,7 @@ ui: image: repository: radiantone/eoc-ui pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. + # Overrides the image tag whose default is the chart appVersion. # # tag: "dev" nodeSelector: {} tolerations: [] From 9c736c8d50709852254a69ebfb0380f66995ec2d Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Fri, 23 Jun 2023 16:54:03 +0300 Subject: [PATCH 003/178] Upgraded eoc version to 0.4.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index ab3fc80..aceb56f 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.4.0" +appVersion: "0.4.1" maintainers: - name: pgodey From b07abea423df07cd7b61384326e75fb1c6de2cf8 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:03:31 +0300 Subject: [PATCH 004/178] Upgrade eoc to 0.5.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index aceb56f..e7202c4 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.1 +version: 0.5.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.4.1" +appVersion: "0.5.0" maintainers: - name: pgodey From b5a332a2bccf55f09faca5db6f541a83d91e8f4d Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 13 Jul 2023 19:06:41 +0300 Subject: [PATCH 005/178] Upgraded eoc version to 0.5.1 --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 3 +++ charts/eoc/values.yaml | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index e7202c4..df2b845 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.5.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.5.0" +appVersion: "0.5.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index f51a8e2..cd905f4 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -17,6 +17,9 @@ data: DATABASE_USERNAME: {{ .Values.backend.database.auth.user | quote }} DATABASE_PASSWORD: {{ .Values.backend.database.auth.pass | quote }} + ENABLE_MFA: {{ .Values.backend.mfa.enabled | quote }} + APP_MFA_NAME: {{ .Values.backend.mfa.appName | quote }} + JWT_SECRET: {{ .Values.backend.jwt.secret | quote }} JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index ded2b1f..d168aea 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -53,6 +53,9 @@ backend: user: eocadmin pass: eocadmin s3BucketName: "" + mfa: + enabled: false + appName: "Radiant Logic EOC" jwt: secret: mySecret expiresIn: 60m From 355f079ff52f490c9d98b38c615149adf1d5ac89 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 13 Jul 2023 19:28:27 +0300 Subject: [PATCH 006/178] Upgraded eoc version to 0.5.1 --- .github/workflows/lint-test-eoc.yml | 1 + charts/eoc/templates/backend_configmap.yaml | 4 ++-- charts/eoc/values.yaml | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 4da2f32..32e5b78 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -62,4 +62,5 @@ jobs: --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc \ + --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index cd905f4..d64aa01 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -17,8 +17,8 @@ data: DATABASE_USERNAME: {{ .Values.backend.database.auth.user | quote }} DATABASE_PASSWORD: {{ .Values.backend.database.auth.pass | quote }} - ENABLE_MFA: {{ .Values.backend.mfa.enabled | quote }} - APP_MFA_NAME: {{ .Values.backend.mfa.appName | quote }} + ENABLE_MFA: {{ .Values.features.mfa.enabled | quote }} + APP_MFA_NAME: {{ .Values.features.mfa.appName | quote }} JWT_SECRET: {{ .Values.backend.jwt.secret | quote }} JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index d168aea..ad642fc 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -8,6 +8,11 @@ global: zones: 2 amiImageId: "ami-0fe74570d87750175" minFidVersion: "7.5.0" + +features: + mfa: + enabled: false + appName: "Radiant Logic EOC" ui: basePath: /eoc @@ -53,9 +58,6 @@ backend: user: eocadmin pass: eocadmin s3BucketName: "" - mfa: - enabled: false - appName: "Radiant Logic EOC" jwt: secret: mySecret expiresIn: 60m From 62e27696a46a4ee665d28a6ddcb493243c45a777 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 13 Jul 2023 19:35:21 +0300 Subject: [PATCH 007/178] Upgraded eoc version to 0.5.1 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index ad642fc..d0ecbd3 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -8,7 +8,7 @@ global: zones: 2 amiImageId: "ami-0fe74570d87750175" minFidVersion: "7.5.0" - + features: mfa: enabled: false From 6979dad702d574c96cb81a5d5dc37fc831c99f20 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Fri, 28 Jul 2023 14:53:44 +0300 Subject: [PATCH 008/178] [eoc] Upgraded eoc version to 0.5.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index df2b845..fbc0dd6 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.1 +version: 0.5.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.5.1" +appVersion: "0.5.2" maintainers: - name: pgodey From 5d162a5b587ae2047dd716617a30b64d35fd6444 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:21:43 -0500 Subject: [PATCH 009/178] sdc-version-update 1. Updated SDC chart version to the latest --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index b1badb4..e12419d 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.2 +version: 0.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.3" +appVersion: "0.2.4" maintainers: - name: pgodey From 9f78c7da92fce597c29d5d9733fa4499699483f0 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Wed, 6 Sep 2023 19:16:42 +0300 Subject: [PATCH 010/178] Upgrade eoc to 1.0.0-alpha.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index fbc0dd6..721decb 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.2 +version: 1.0.0-alpha.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.5.2" +appVersion: "1.0.0-alpha.1" maintainers: - name: pgodey From fdf48029e16cad57fefca1039899579650f2f789 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:00:45 -0500 Subject: [PATCH 011/178] Backend Updates 1. Added configuration required for binary download to backend_configmap and values.yaml files. --- charts/eoc/templates/backend_configmap.yaml | 5 +++++ charts/eoc/values.yaml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index d64aa01..60e0496 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -58,6 +58,11 @@ data: AGENTS_INLETS_TOKEN: {{ .Values.backend.agents.inlets.token | quote }} AGENTS_SERVER_NAME: {{ .Values.backend.agents.inlets.serverName | quote }} AGENTS_SERVER_ENDPOINT: {{ .Values.backend.agents.inlets.serverEndpoint | quote }} + SDC_AWS_ACCESS_KEY_ID: {{ .Values.backend.agents.client.accessKeyId | quote}} + SDC_AWS_ACCESS_KEY_SECRET: {{ .Values.backend.agents.client.accessKeySecret | quote }} + SDC_AWS_REGION: {{ .Values.backend.agents.client.s3Region | quote }} + SDC_AWS_S3_BUCKET_NAME: {{ .Values.backend.agents.client.s3BucketName | quote }} + SDC_CLIENT_VERSION: {{ .Values.backend.agents.client.version | quote }} MIN_ENVIRONMENT_VERSION: {{ .Values.global.minFidVersion | quote }} ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index d0ecbd3..cac6f17 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -115,6 +115,12 @@ backend: # external websocket # client-router.dc.federated-identity.com/duploservices-rliqa-svc/acmeco serverEndpoint: "" + client: + accessKeyId: "" + accessKeySecret: "" + s3Region: "" + s3BucketName: "" + version: "" image: repository: radiantone/eoc-backend pullPolicy: Always From 509508eadb074340b85e7421822c2de72c91a989 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 6 Sep 2023 13:23:21 -0500 Subject: [PATCH 012/178] Backend Update Modified default values of s3region, s3Bucketname and Version in values.yaml file --- charts/eoc/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index cac6f17..05aafce 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -118,9 +118,9 @@ backend: client: accessKeyId: "" accessKeySecret: "" - s3Region: "" - s3BucketName: "" - version: "" + s3Region: "us-east-2" + s3BucketName: "radiant-one-v8-sdc-distribution" + version: "0.2.4" image: repository: radiantone/eoc-backend pullPolicy: Always From c503bbf4627cb5f93c8adde733d14456ee60bce9 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 6 Sep 2023 19:36:54 -0500 Subject: [PATCH 013/178] SDC Chart Update 1. Bump up the versions for SDC and Inlets SDC - 0.2.5 Inlets version - 0.9.21 and operator 0.3.0 2. Update the port forward range from 5009 - 5100 3. Deleted the 8080 and 8081 from port-forward ranges 4. Updated portRange to 5001-5100 --- charts/sdc/Chart.yaml | 6 +++--- charts/sdc/values-sample.yaml | 3 ++- charts/sdc/values.yaml | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index e12419d..8682fd3 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.3 +version: 0.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.4" +appVersion: "0.2.5" maintainers: - name: pgodey @@ -44,5 +44,5 @@ dependencies: - name: inlets-uplink-provider alias: inlets repository: oci://ghcr.io/openfaasltd - version: 0.2.9 + version: 0.3.0 condition: inlets.enabled diff --git a/charts/sdc/values-sample.yaml b/charts/sdc/values-sample.yaml index d31a8bd..e8b3133 100644 --- a/charts/sdc/values-sample.yaml +++ b/charts/sdc/values-sample.yaml @@ -32,6 +32,7 @@ inlets: # Customer tunnels will connect with a URI of: # wss://uplink.example.com/namespace/tunnel domain: uplink.example.com/namespace/tunnel + inletsVersion: 0.9.21 tunnel: tunnelname: r1tunnel @@ -45,7 +46,7 @@ tunnel: - 8080 - 8081 portRange: - - "5001-5010" + - "5001-5100" # Postgresql should be deployed prior to deployment or should be enabled from below postgresql: diff --git a/charts/sdc/values.yaml b/charts/sdc/values.yaml index 722c8c8..f091c50 100644 --- a/charts/sdc/values.yaml +++ b/charts/sdc/values.yaml @@ -105,7 +105,7 @@ agents: clientSecret: "xxxxx" # PortForward__Range should match the start and end ports provided under tunnel # PortForward__Range can be a single port if only one port is opened - portForward__range: "5001-5009, 8080, 8081" + portForward__range: "5001-5100" endpoint: https://sdc-envname.radiantlogic.io # domain for sdc @@ -124,7 +124,7 @@ tunnel: - 8080 - 8081 portRange: - - "5001-5010" + - "5001-5100" inlets: nodeSelector: {} @@ -169,7 +169,7 @@ inlets: # inlets Pro release version for tunnel server Pods # Check https://ghcr.io/inlets/inlets-pro for tags - inletsVersion: 0.9.18 + inletsVersion: 0.9.21 # monitoring tunnels prometheus: image: prom/prometheus:v2.40.1 From df4df659c1b3ff9177e7f24c997c3616fa481e0b Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:19:10 +0300 Subject: [PATCH 014/178] [eoc] Upgrade eoc to 1.0.0-alpha.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 721decb..4c946bb 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-alpha.1 +version: 1.0.0-alpha.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-alpha.1" +appVersion: "1.0.0-alpha.2" maintainers: - name: pgodey From dab14e72dc620f0e681e7f57d3d3676b91887fcd Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Thu, 14 Sep 2023 17:37:46 +0300 Subject: [PATCH 015/178] [eoc] Upgrade eoc to 1.0.0-alpha.3 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 4c946bb..50f2347 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-alpha.2 +version: 1.0.0-alpha.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-alpha.2" +appVersion: "1.0.0-alpha.3" maintainers: - name: pgodey From 193256739d4acb2bed1b1d9309846e603ec3325c Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 20 Sep 2023 19:18:03 +0300 Subject: [PATCH 016/178] [eoc] Upgrade eoc to 1.0.0-beta.1 --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 1 + charts/eoc/templates/orchestrator_service.yaml | 12 ++++++++++++ charts/eoc/values.yaml | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 charts/eoc/templates/orchestrator_service.yaml diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 50f2347..0b7d810 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-alpha.3 +version: 1.0.0-beta.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-alpha.3" +appVersion: "1.0.0-beta.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 60e0496..a8e760c 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -51,6 +51,7 @@ data: GRAFANA_BASE_URL: {{ .Values.backend.grafana.host | quote }} GRAFANA_USERNAME: {{ .Values.backend.grafana.username | quote }} GRAFANA_PASSWORD: {{ .Values.backend.grafana.password | quote }} + GRAFANA_METRICS_PREFIXES: {{ .Values.backend.grafana.metricsPrefixes | quote }} AGENTS_BASE_PATH: {{ .Values.backend.agents.api.endpoint | quote }} AGENTS_CLIENT_ID: {{ .Values.backend.agents.api.clientId | quote }} diff --git a/charts/eoc/templates/orchestrator_service.yaml b/charts/eoc/templates/orchestrator_service.yaml new file mode 100644 index 0000000..d6ae6d1 --- /dev/null +++ b/charts/eoc/templates/orchestrator_service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "eoc-orchestrator.fullname" . }}-service +spec: + ports: + - name: {{ include "eoc-orchestrator.fullname" . }}-service-port + protocol: TCP + port: 80 + targetPort: 3001 + selector: + {{- include "eoc-orchestrator.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 05aafce..61338dd 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -102,6 +102,7 @@ backend: # should have enough permission to be able to create a service account username: admin password: xxxx + metricsPrefixes: ldap_,process_,push_,fid_ agents: api: endpoint: "" From b401bb16d8f15deb7042b54186a9bc5c557ff6c0 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 20 Sep 2023 19:30:09 +0300 Subject: [PATCH 017/178] [eoc] Upgrade eoc to 1.0.0-beta.1 --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 32e5b78..5b9ae2f 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -61,6 +61,6 @@ jobs: --set=backend.database.auth.pass=eocadmin --set=backend.oauth.google.clientId=xxxxxx \ --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ - --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc \ + --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap_,process_,push_,fid_ \ --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade From 1c66121550778a49eee8766fdfab0a40caed9af0 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 20 Sep 2023 19:36:20 +0300 Subject: [PATCH 018/178] [eoc] Upgrade eoc to 1.0.0-beta.1 --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 5b9ae2f..43e9c48 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -61,6 +61,6 @@ jobs: --set=backend.database.auth.pass=eocadmin --set=backend.oauth.google.clientId=xxxxxx \ --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ - --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap_,process_,push_,fid_ \ + --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade From 754738d1abfa712f614dd8ba5e0c502ab05c59d7 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 20 Sep 2023 10:44:34 -0700 Subject: [PATCH 019/178] App version 0.5.2 --- charts/eoc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 50f2347..aeff614 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -13,7 +13,7 @@ version: 1.0.0-alpha.3 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-alpha.3" +appVersion: "0.5.2" maintainers: - name: pgodey From 3e0a1febcfca724a4409daf4be8ff62127d75506 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 20 Sep 2023 20:45:59 +0300 Subject: [PATCH 020/178] [eoc] Upgrade eoc to 1.0.0-beta.1 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 61338dd..696f0bb 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -125,7 +125,7 @@ backend: image: repository: radiantone/eoc-backend pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. + # Overrides the image tag whose default is the chart appVersion. # tag: "dev" nodeSelector: {} tolerations: [] From 2838cb6bdb35607b0cea0f15311d1661827f0e34 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 20 Sep 2023 20:56:01 +0300 Subject: [PATCH 021/178] [eoc] Upgrade eoc to 1.0.0-beta.1 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 696f0bb..61338dd 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -125,7 +125,7 @@ backend: image: repository: radiantone/eoc-backend pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. + # Overrides the image tag whose default is the chart appVersion. # tag: "dev" nodeSelector: {} tolerations: [] From 35b75b13244c2074f0e7209cb3f8ceb1404a7ef4 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:54:00 +0300 Subject: [PATCH 022/178] [eoc] Upgrade eoc to 1.0.0-beta.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 0b7d810..59b920b 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-beta.1 +version: 1.0.0-beta.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-beta.1" +appVersion: "1.0.0-beta.2" maintainers: - name: pgodey From 1cc7de2416001d70a2ba96acbf42dd3a59d8abd7 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:48:21 +0300 Subject: [PATCH 023/178] [eoc] Upgrade eoc to 1.0.0-beta.3 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 59b920b..1454746 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-beta.2 +version: 1.0.0-beta.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-beta.2" +appVersion: "1.0.0-beta.3" maintainers: - name: pgodey From 16299bd9db687b30ee06d2e001f3caf77769d375 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Thu, 28 Sep 2023 19:19:12 +0300 Subject: [PATCH 024/178] [eoc] Upgrade eoc to 1.0.0-beta.4 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 1454746..b1c95d4 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-beta.3 +version: 1.0.0-beta.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-beta.3" +appVersion: "1.0.0-beta.4" maintainers: - name: pgodey From f79dd5a3c5ace38b8e1439953c8ebcd6e20ba3ee Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Sat, 30 Sep 2023 16:14:00 -0700 Subject: [PATCH 025/178] Added configmap checksum --- charts/eoc/Chart.yaml | 2 +- charts/eoc/templates/backend_deployment.yaml | 4 ++++ ...strator_deployment.yaml => orchestrator_deployment.yaml} | 6 +++++- charts/eoc/templates/ui_deployment.yaml | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) rename charts/eoc/templates/{ochestrator_deployment.yaml => orchestrator_deployment.yaml} (87%) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index b1c95d4..9f72172 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-beta.4 +version: 1.0.0-beta.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index dcde4c2..157a005 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -14,6 +14,10 @@ spec: name: {{ include "eoc-backend.fullname" . | nindent 8 }} labels: {{- include "eoc-backend.selectorLabels" . | nindent 8 }} + annotations: + {{- if (.Values.checksumConfigMap).enabled | default true }} + checksum/environment: {{ include (print $.Template.BasePath "/backend_configmap.yaml") . | sha256sum }} + {{- end }} spec: containers: - name: {{ .Chart.Name }} diff --git a/charts/eoc/templates/ochestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml similarity index 87% rename from charts/eoc/templates/ochestrator_deployment.yaml rename to charts/eoc/templates/orchestrator_deployment.yaml index afe12df..94bcab4 100644 --- a/charts/eoc/templates/ochestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -14,6 +14,10 @@ spec: name: {{ include "eoc-orchestrator.fullname" . | nindent 8 }} labels: {{- include "eoc-orchestrator.selectorLabels" . | nindent 8 }} + annotations: + {{- if (.Values.checksumConfigMap).enabled | default true }} + checksum/environment: {{ include (print $.Template.BasePath "/orchestrator_configmap.yaml") . | sha256sum }} + {{- end }} spec: containers: - name: {{ .Chart.Name }} @@ -49,4 +53,4 @@ spec: {{- with .Values.orchestrator.tolerations }} tolerations: {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index be4bcb9..3ba685d 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -14,6 +14,10 @@ spec: name: {{ include "eoc-ui.fullname" . | nindent 8 }} labels: {{- include "eoc-ui.selectorLabels" . | nindent 8 }} + annotations: + {{- if (.Values.checksumConfigMap).enabled | default true }} + checksum/environment: {{ include (print $.Template.BasePath "/ui_configmap.yaml") . | sha256sum }} + {{- end }} spec: containers: - name: {{ .Chart.Name }} From 4a465a7e7b6483a3922ed0d996b05df9b7d22e3f Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Tue, 3 Oct 2023 19:14:20 +0300 Subject: [PATCH 026/178] [eoc] Upgrade eoc to 1.0.0-rc.1 --- .github/workflows/lint-test-eoc.yml | 1 + charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 4 +++- charts/eoc/values.yaml | 8 +++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 43e9c48..b3da925 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -63,4 +63,5 @@ jobs: --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ + --set=applications.fid.nodeLimit=0 --set=applications.brainwave.nodeLimit=0 \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 9f72172..b4f1174 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-beta.4.1 +version: 1.0.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-beta.4" +appVersion: "1.0.0-rc.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index a8e760c..e14b64f 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -69,7 +69,9 @@ data: ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} - NODE_LIMIT: {{ .Values.global.nodeLimit | quote }} + NODE_LIMIT: {{ .Values.global.nodeLimit | quote }} # DEPRECATED + NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | quote }} + NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | quote }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 61338dd..add6595 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -3,12 +3,18 @@ global: domainName: "" certificateArn: "" infrastructureName: "" - nodeLimit: 10 + nodeLimit: 10 # DEPRECATED fidLicense: "" zones: 2 amiImageId: "ami-0fe74570d87750175" minFidVersion: "7.5.0" +applications: + fid: + nodeLimit: 0 + brainwave: + nodeLimit: 0 + features: mfa: enabled: false From 6bb623747a5dd73d7e042152c5f367fc4d64ba72 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Tue, 3 Oct 2023 19:17:08 +0300 Subject: [PATCH 027/178] [eoc] Upgrade eoc to 1.0.0-rc.1 --- charts/eoc/templates/backend_configmap.yaml | 2 +- charts/eoc/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index e14b64f..b3fe03f 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -69,7 +69,7 @@ data: ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} - NODE_LIMIT: {{ .Values.global.nodeLimit | quote }} # DEPRECATED + NODE_LIMIT: {{ .Values.global.nodeLimit | quote }} NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | quote }} NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | quote }} kind: ConfigMap diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index add6595..c749eb1 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -3,7 +3,7 @@ global: domainName: "" certificateArn: "" infrastructureName: "" - nodeLimit: 10 # DEPRECATED + nodeLimit: 10 fidLicense: "" zones: 2 amiImageId: "ami-0fe74570d87750175" From d086d4304b92ad66db015d78e007b2c90c9dbe47 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Tue, 3 Oct 2023 19:18:38 +0300 Subject: [PATCH 028/178] [eoc] Upgrade eoc to 1.0.0-rc.1 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index c749eb1..b4dd918 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -9,7 +9,7 @@ global: amiImageId: "ami-0fe74570d87750175" minFidVersion: "7.5.0" -applications: +applications: fid: nodeLimit: 0 brainwave: From bd36d6ea7ff5e8125ec6931c4bdcd60636022e0b Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:33:30 -0500 Subject: [PATCH 029/178] update-sdc-server-version --- charts/sdc/Chart.yaml | 4 ++-- charts/sdc/README.md | 3 --- charts/sdc/values-sample.yaml | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 8682fd3..277ada7 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.4 +version: 0.0.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.5" +appVersion: "0.2.6" maintainers: - name: pgodey diff --git a/charts/sdc/README.md b/charts/sdc/README.md index 6f937b9..a25d5e2 100644 --- a/charts/sdc/README.md +++ b/charts/sdc/README.md @@ -111,9 +111,6 @@ tunnel: # To open single ports of choice provide values under "ports:" # To open range of ports provide values under "portRange" like "5001-5010" # Provide higher + 1 for the higher limit (port) intended (for portRange) - ports: - - 8080 - - 8081 portRange: - "5001-5010" diff --git a/charts/sdc/values-sample.yaml b/charts/sdc/values-sample.yaml index e8b3133..d5ee7a9 100644 --- a/charts/sdc/values-sample.yaml +++ b/charts/sdc/values-sample.yaml @@ -42,9 +42,6 @@ tunnel: # To open single ports of choice provide values under "ports:" # To open range of ports provide values under "portRange" like "5001-5010" # Provide higher + 1 for the higher limit (port) intended (for portRange) - ports: - - 8080 - - 8081 portRange: - "5001-5100" From 2501e3fba379e5e473ec16eb1b57d18556901452 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Tue, 3 Oct 2023 20:18:11 +0300 Subject: [PATCH 030/178] [eoc] Upgrade eoc to 1.0.0-rc.1 --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index b3da925..dccf9cd 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -63,5 +63,5 @@ jobs: --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ - --set=applications.fid.nodeLimit=0 --set=applications.brainwave.nodeLimit=0 \ + --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade From 7d74bc3a0028cdce2f9541780d008070a793414a Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:05:56 -0700 Subject: [PATCH 031/178] minFidVersion: "8.0.0" --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index b4dd918..7ad3f4d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -7,7 +7,7 @@ global: fidLicense: "" zones: 2 amiImageId: "ami-0fe74570d87750175" - minFidVersion: "7.5.0" + minFidVersion: "8.0.0" applications: fid: From ce223755a60dbb6b181bf25f40ef7a44e40be471 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:25:15 -0700 Subject: [PATCH 032/178] Escape spaces --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index dccf9cd..aff13a4 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -62,6 +62,6 @@ jobs: --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ - --set=features.mfa.enabled=false --set=features.mfa.appName="Radiant Logic EOC" \ + --set=features.mfa.enabled=false --set=features.mfa.appName=\"Radiant Logic EOC\" \ --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade From e53cea47b808ce551028ddd4fe485a1374bdac12 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:29:46 -0700 Subject: [PATCH 033/178] remove spaces --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index aff13a4..9ba0fb7 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -62,6 +62,6 @@ jobs: --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ - --set=features.mfa.enabled=false --set=features.mfa.appName=\"Radiant Logic EOC\" \ + --set=features.mfa.enabled=false --set=features.mfa.appName=Radiant-Logic-EOC \ --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade From 00b7a56484ee75233b4463cab36686c9c9fd8398 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Wed, 11 Oct 2023 20:07:02 +0300 Subject: [PATCH 034/178] [eoc] Upgrade eoc to 1.0.0-rc.2 --- .github/workflows/lint-test-eoc.yml | 8 +++++--- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 7 ++++++- charts/eoc/templates/orchestrator_configmap.yaml | 3 +++ charts/eoc/templates/ui_configmap.yaml | 3 +++ charts/eoc/values.yaml | 8 ++++++++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 9ba0fb7..cb27f97 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -59,9 +59,11 @@ jobs: run: | ct install --charts=charts/eoc --debug --helm-extra-args="--timeout=15m0s" --helm-extra-set-args="--set=postgresql.enabled=true \ --set=backend.database.auth.pass=eocadmin --set=backend.oauth.google.clientId=xxxxxx \ - --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ - --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ - --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ + --set=backend.oauth.microsoft.enabled=true --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ + --set=backend.oauth.google.enabled=true --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ + --set=backend.oauth.github.enabled=true --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ --set=features.mfa.enabled=false --set=features.mfa.appName=Radiant-Logic-EOC \ --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ + --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ + --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index b4f1174..f687178 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.1 +version: 1.0.0-rc.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.1" +appVersion: "1.0.0-rc.2" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index b3fe03f..3f5eba1 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -23,12 +23,15 @@ data: JWT_SECRET: {{ .Values.backend.jwt.secret | quote }} JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }} + OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | quote }} OAUTH_GOOGLE_CLIENT_ID: {{ .Values.backend.oauth.google.clientId | quote }} OAUTH_GOOGLE_CLIENT_SECRET: {{ .Values.backend.oauth.google.clientSecret | quote }} + OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | quote }} OAUTH_GITHUB_CLIENT_ID: {{ .Values.backend.oauth.github.clientId | quote }} OAUTH_GITHUB_CLIENT_SECRET: {{ .Values.backend.oauth.github.clientSecret | quote }} + OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | quote }} OAUTH_MICROSOFT_CLIENT_ID: {{ .Values.backend.oauth.microsoft.clientId | quote }} OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }} @@ -69,9 +72,11 @@ data: ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} - NODE_LIMIT: {{ .Values.global.nodeLimit | quote }} NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | quote }} NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | quote }} + + DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} + ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index 39ebd8b..f8a73e8 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -26,6 +26,9 @@ data: REDIS_PORT: {{ .Values.orchestrator.redis.port | quote }} ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} + + DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} + ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 8c5b542..f60b39f 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -10,6 +10,9 @@ data: VITE_MONITORING_URL: {{ .Values.ui.monitoringDashboardUrl | quote }} VITE_KIBANA_API_PATH: {{ .Values.ui.kibanaApiPath | quote }} VITE_AMPLITUDE_KEY: {{ .Values.ui.amplitude.key | quote }} + VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | quote }} + VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} + VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 7ad3f4d..cfca22d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -8,11 +8,16 @@ global: zones: 2 amiImageId: "ami-0fe74570d87750175" minFidVersion: "8.0.0" + # duploservices-{common-services-tenant} + commonServicesNamespace: "" + environmentNamespacePrefix: "duploservices-" applications: fid: + minVersion: "8.0.0" nodeLimit: 0 brainwave: + minVersion: "2.0.0" nodeLimit: 0 features: @@ -70,14 +75,17 @@ backend: oauth: # Get them from https://console.cloud.google.com/apis/credentials google: + enabled: true clientId: "xxxxxx" clientSecret: "xxxxxx" # Get them from https://github.com/settings/developers github: + enabled: true clientId: "xxxxxx" clientSecret: "xxxxxx" # Get them from https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/ApplicationsListBlade microsoft: + enabled: true clientId: "xxxxxx" clientSecret: "xxxxxx" # mailer module From 8204094b42134cd1358cbf52f1caa4078861f5d2 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 12 Oct 2023 15:02:29 +0300 Subject: [PATCH 035/178] [eoc] Upgrade eoc to 1.0.0-rc.2 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index cfca22d..e6ed8f3 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -36,7 +36,7 @@ ui: loginReturnUrl: "" # link to kibana https://{fqdm}/kibana/app/discover loggingUrl: "" - # full external links to public grafana dashboard + # use full external links to public grafana dashboard reportingDashboardUrl: "" monitoringDashboardUrl: "" # override infrastructure name used for environment name prefix From 165e910070c3d0745bfca7823dd98b1bb29da4d0 Mon Sep 17 00:00:00 2001 From: Adrian Barbos Date: Thu, 12 Oct 2023 15:54:35 +0300 Subject: [PATCH 036/178] [eoc] Upgrade eoc to 1.0.0-rc.2 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index e6ed8f3..cfca22d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -36,7 +36,7 @@ ui: loginReturnUrl: "" # link to kibana https://{fqdm}/kibana/app/discover loggingUrl: "" - # use full external links to public grafana dashboard + # full external links to public grafana dashboard reportingDashboardUrl: "" monitoringDashboardUrl: "" # override infrastructure name used for environment name prefix From 420ea704794f8944a4be70f1a8033d577a20c743 Mon Sep 17 00:00:00 2001 From: Adrian B <53167534+adrianb-ens@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:49:38 +0300 Subject: [PATCH 037/178] Update values.yaml --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index cfca22d..7691439 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -30,7 +30,7 @@ ui: # example https://{fqdm}/eoc-backend apiBaseUrl: "" auth: - # local storage key to store jwt token + # the local storage key to store jwt token tokenStoreKey: token # example https://{fqdm} loginReturnUrl: "" From bd3c9f5f0ade790c4525a7968d0932250bf77cb7 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Thu, 12 Oct 2023 09:10:40 -0700 Subject: [PATCH 038/178] Added default values for new properties for compatibility --- charts/eoc/templates/backend_configmap.yaml | 8 ++++---- charts/eoc/templates/ui_configmap.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 3f5eba1..0692fbf 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -23,15 +23,15 @@ data: JWT_SECRET: {{ .Values.backend.jwt.secret | quote }} JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }} - OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | quote }} + OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | default true | quote }} OAUTH_GOOGLE_CLIENT_ID: {{ .Values.backend.oauth.google.clientId | quote }} OAUTH_GOOGLE_CLIENT_SECRET: {{ .Values.backend.oauth.google.clientSecret | quote }} - OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | quote }} + OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | default true | quote }} OAUTH_GITHUB_CLIENT_ID: {{ .Values.backend.oauth.github.clientId | quote }} OAUTH_GITHUB_CLIENT_SECRET: {{ .Values.backend.oauth.github.clientSecret | quote }} - OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | quote }} + OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} OAUTH_MICROSOFT_CLIENT_ID: {{ .Values.backend.oauth.microsoft.clientId | quote }} OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }} @@ -76,7 +76,7 @@ data: NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} - ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} + ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index f60b39f..cb5417b 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -10,9 +10,9 @@ data: VITE_MONITORING_URL: {{ .Values.ui.monitoringDashboardUrl | quote }} VITE_KIBANA_API_PATH: {{ .Values.ui.kibanaApiPath | quote }} VITE_AMPLITUDE_KEY: {{ .Values.ui.amplitude.key | quote }} - VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | quote }} - VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} - VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} + VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | default true | quote }} + VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | default true | quote }} + VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} kind: ConfigMap metadata: labels: @@ -22,4 +22,4 @@ metadata: app: {{ template "eoc-ui.fullname" . }} chart: "{{ template "eoc-ui.chart" . }}" release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" \ No newline at end of file + heritage: "{{ .Release.Service }}" From 7335259a2107d105df9273ee527816b52e1d7095 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Thu, 12 Oct 2023 11:12:08 -0700 Subject: [PATCH 039/178] Added min versions of fid/brainwave to backend_configmap --- charts/eoc/templates/backend_configmap.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0692fbf..6986b12 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -72,8 +72,10 @@ data: ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} - NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | quote }} - NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | quote }} + NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | default 1 | quote }} + NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | default 1 | quote }} + FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default .Values.global.minFidVersion | default "8.0.0" | quote }} + BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "2.0.0" | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} From bdb37eaa0a6e156293cdf264d99806ed79b8446f Mon Sep 17 00:00:00 2001 From: alexlucaEnsemble <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 17 Oct 2023 18:23:50 +0300 Subject: [PATCH 040/178] [eoc] Upgrade eoc to 1.0.0-rc.3 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index f687178..8fd32c0 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.2 +version: 1.0.0-rc.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.2" +appVersion: "1.0.0-rc.3" maintainers: - name: pgodey From c79fab8a54069f40b8be91407f6d65eae5015778 Mon Sep 17 00:00:00 2001 From: alexlucaEnsemble <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:11:34 +0300 Subject: [PATCH 041/178] [eoc] Upgrade eoc to 1.0.0-rc.4 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 8fd32c0..9ab558f 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.3 +version: 1.0.0-rc.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.3" +appVersion: "1.0.0-rc.4" maintainers: - name: pgodey From 09296c7d5653e7c51db77810f097803a408ffe99 Mon Sep 17 00:00:00 2001 From: alexlucaEnsemble <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:17:19 +0100 Subject: [PATCH 042/178] [eoc] upgrade-eoc-1.0.0-rc.5 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 9ab558f..150b0a1 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.4 +version: 1.0.0-rc.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.4" +appVersion: "1.0.0-rc.5" maintainers: - name: pgodey From 6f5cbd4628af270e6a60d2759f3e5615553b04ae Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:00:20 -0700 Subject: [PATCH 043/178] Added option to pass env variables to the pods through configmap --- charts/eoc/templates/backend_configmap.yaml | 6 +++++ .../eoc/templates/orchestrator_configmap.yaml | 6 +++++ charts/eoc/templates/ui_configmap.yaml | 6 +++++ charts/eoc/values.yaml | 23 +++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 6986b12..e04de17 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -79,6 +79,12 @@ data: DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} +{{- range $key, $value := (.Values.backend).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} +{{- range $key, $value := (.Values.global).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index f8a73e8..c0730bd 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -29,6 +29,12 @@ data: DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} +{{- range $key, $value := (.Values.orchestrator).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} +{{- range $key, $value := (.Values.global).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index cb5417b..c353474 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -13,6 +13,12 @@ data: VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | default true | quote }} VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | default true | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} +{{- range $key, $value := (.Values.ui).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} +{{- range $key, $value := (.Values.global).env }} + {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} +{{- end }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 7691439..b315c38 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -11,6 +11,11 @@ global: # duploservices-{common-services-tenant} commonServicesNamespace: "" environmentNamespacePrefix: "duploservices-" + ## Extra environment variables that will be pass onto all deployment pods + ## + ## env: + ## AWS_REGION: us-east-1 + env: {} applications: fid: @@ -52,6 +57,12 @@ ui: nodeSelector: {} tolerations: [] affinity: {} + ## Extra environment variables that will be pass onto deployment pods + ## + ## env: + ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here + ## AWS_REGION: us-east-1 + env: {} backend: basePath: eoc-backend @@ -144,6 +155,12 @@ backend: nodeSelector: {} tolerations: [] affinity: {} + ## Extra environment variables that will be pass onto deployment pods + ## + ## env: + ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here + ## AWS_REGION: us-east-1 + env: {} orchestrator: duplo: @@ -171,6 +188,12 @@ orchestrator: nodeSelector: {} tolerations: [] affinity: {} + ## Extra environment variables that will be pass onto deployment pods + ## + ## env: + ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here + ## AWS_REGION: us-east-1 + env: {} redis: enabled: true From aa9eac8bb66da9b993dcc5668746ff14017409e9 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:03:36 -0700 Subject: [PATCH 044/178] fix linting errors --- charts/eoc/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index b315c38..5104e70 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -15,7 +15,7 @@ global: ## ## env: ## AWS_REGION: us-east-1 - env: {} + env: {} applications: fid: @@ -62,7 +62,7 @@ ui: ## env: ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here ## AWS_REGION: us-east-1 - env: {} + env: {} backend: basePath: eoc-backend @@ -160,7 +160,7 @@ backend: ## env: ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here ## AWS_REGION: us-east-1 - env: {} + env: {} orchestrator: duplo: @@ -193,7 +193,7 @@ orchestrator: ## env: ## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here ## AWS_REGION: us-east-1 - env: {} + env: {} redis: enabled: true From 47d19d1186d73da6b013a44bfbe1d7bbf3b9709f Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 7 Nov 2023 19:14:53 +0200 Subject: [PATCH 045/178] eoc-Upgrade-eoc-to-1.0.0-rc.6 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 150b0a1..812d77a 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.5 +version: 1.0.0-rc.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.5" +appVersion: "1.0.0-rc.6" maintainers: - name: pgodey From b205f3f23898b3ffe00e16b18cb0018309eee042 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:51:27 +0200 Subject: [PATCH 046/178] eoc-Upgrade-eoc-to-1.0.0 --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 2 ++ charts/eoc/templates/ui_configmap.yaml | 1 + charts/eoc/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 812d77a..a6162b6 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.6 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.6" +appVersion: "1.0.0" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index e04de17..ca4f42d 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -35,6 +35,8 @@ data: OAUTH_MICROSOFT_CLIENT_ID: {{ .Values.backend.oauth.microsoft.clientId | quote }} OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }} + AUTH_LOCAL_ENABLE: {{ .Values.backend.oauth.local.enabled | default true | quote }} + EMAIL_FROM: {{ .Values.backend.smtp.from | quote }} EMAIL_ID: {{ .Values.backend.smtp.user | quote }} EMAIL_PASS: {{ .Values.backend.smtp.pass | quote }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index c353474..7187102 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -12,6 +12,7 @@ data: VITE_AMPLITUDE_KEY: {{ .Values.ui.amplitude.key | quote }} VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | default true | quote }} VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | default true | quote }} + VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | default true | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 5104e70..d7cf8e8 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -99,6 +99,8 @@ backend: enabled: true clientId: "xxxxxx" clientSecret: "xxxxxx" + local: + enabled: true # mailer module smtp: from: "" From d9cb1569cb8046907791f877da61c4fb36a02e2c Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:39:00 +0200 Subject: [PATCH 047/178] eoc-Upgrade-eoc-to-1.0.0-rc.6 --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index cb27f97..aae2b3b 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -62,7 +62,7 @@ jobs: --set=backend.oauth.microsoft.enabled=true --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \ --set=backend.oauth.google.enabled=true --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \ --set=backend.oauth.github.enabled=true --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \ - --set=features.mfa.enabled=false --set=features.mfa.appName=Radiant-Logic-EOC \ + --set=backend.oauth.local.enabled=true --set=features.mfa.enabled=false --set=features.mfa.appName=Radiant-Logic-EOC \ --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ From 03ed5657ff2d85fd2bd59573db47e322963f5b48 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 17 Nov 2023 00:19:00 +0200 Subject: [PATCH 048/178] Update to 1.0.0-rc.7 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index a6162b6..fb2e1b4 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.0-rc.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.0.0-rc.7" maintainers: - name: pgodey From 75afcdea1ddcdea10d7fd815e56d1ef5d673e1fc Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:47:21 +0200 Subject: [PATCH 049/178] eoc-Upgrade-eoc-to-1.0.0-rc.8 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index fb2e1b4..c34bc15 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.7 +version: 1.0.0-rc.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.7" +appVersion: "1.0.0-rc.8" maintainers: - name: pgodey From 1c9fd11287349f279dffa28cb34fa751c9eb0101 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Mon, 27 Nov 2023 18:18:55 +0200 Subject: [PATCH 050/178] eoc-Upgrade-eoc-to-1.0.0-rc.9 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index c34bc15..680e318 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.8 +version: 1.0.0-rc.9 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.8" +appVersion: "1.0.0-rc.9" maintainers: - name: pgodey From e2f2a4758cc3693d087e6924da4b91c364c0810e Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 12 Dec 2023 18:46:55 +0200 Subject: [PATCH 051/178] eoc-Upgrade-eoc-to-1.0.0-rc.10 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 680e318..5f41a6d 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.9 +version: 1.0.0-rc.10 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.9" +appVersion: "1.0.0-rc.10" maintainers: - name: pgodey From c206df3ac6bee2ee4abd0a510ad12e3e6af97e9a Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:30:54 -0600 Subject: [PATCH 052/178] Updates 1. Updated chart and app versions --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 277ada7..ae4849d 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.5 +version: 0.0.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.6" +appVersion: "0.2.8" maintainers: - name: pgodey From fecc79265919d7a50ee35aec47faf120c1c0e620 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 22 Dec 2023 19:42:54 +0200 Subject: [PATCH 053/178] eoc-Upgrade-eoc-to-1.0.0-rc.11 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 5f41a6d..11157b9 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.10 +version: 1.0.0-rc.11 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.10" +appVersion: "1.0.0-rc.11" maintainers: - name: pgodey From 26b1ad376d01b20dc6831aed0c0560566afeed82 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Fri, 22 Dec 2023 19:33:56 -0600 Subject: [PATCH 054/178] added service account to run kubeseal commands --- .../eoc/templates/orchestrator_deployment.yaml | 1 + charts/eoc/templates/orchestrator_sa.yaml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 charts/eoc/templates/orchestrator_sa.yaml diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index 94bcab4..52ade16 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -42,6 +42,7 @@ spec: periodSeconds: 30 failureThreshold: 5 successThreshold: 1 + serviceAccount: eoc-orchestrator {{- with .Values.orchestrator.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/eoc/templates/orchestrator_sa.yaml b/charts/eoc/templates/orchestrator_sa.yaml new file mode 100644 index 0000000..d36b074 --- /dev/null +++ b/charts/eoc/templates/orchestrator_sa.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: eoc-orchestrator +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: eoc-orchestrator +subjects: +- kind: ServiceAccount + name: eoc-orchestrator + namespace: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io + From 2018557b41e776aff198d43dee0532732b035cea Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:16:24 +0200 Subject: [PATCH 055/178] Update Chart.yaml --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 11157b9..06834e2 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.11 +version: 1.0.0-rc.12 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.11" +appVersion: "1.0.0-rc.12" maintainers: - name: pgodey From 7aacd1ccf7c33637d866f4be656c2f267f9ec328 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Tue, 9 Jan 2024 16:24:53 -0800 Subject: [PATCH 056/178] Added imagePullSecrets --- charts/eoc/templates/backend_deployment.yaml | 4 ++++ charts/eoc/templates/orchestrator_configmap.yaml | 10 +--------- charts/eoc/templates/orchestrator_deployment.yaml | 4 ++++ charts/eoc/templates/ui_deployment.yaml | 4 ++++ charts/eoc/values.yaml | 1 + 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index 157a005..8a10603 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -19,6 +19,10 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/backend_configmap.yaml") . | sha256sum }} {{- end }} spec: + {{- with .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 6 }} + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag | default .Chart.AppVersion }}" diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index c0730bd..87562dc 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -3,30 +3,22 @@ data: REGION: {{ .Values.global.region | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} CERTIFICATE_ARN: {{ .Values.global.certificateArn | quote }} - REDIS_HOST: {{ .Values.orchestrator.redis.host | quote }} REDIS_PORT: {{ .Values.orchestrator.redis.port | quote }} - DUPLO_PLAN_ID: {{ .Values.global.infrastructureName | quote }} DUPLO_TOKEN: {{ .Values.orchestrator.duplo.token | quote }} DUPLO_BASE_URL: {{ .Values.orchestrator.duplo.baseUrl | quote }} DUPLO_SERVICES_TENANT_NAME: {{ .Values.orchestrator.duplo.servicesTenantName | quote }} DUPLO_ZONES: {{ .Values.global.zones | quote }} DUPLO_AMI_IMAGE_ID: {{ .Values.global.amiImageId | quote }} - ARGO_CD_BASE_URL: {{ .Values.orchestrator.argocd.baseUrl | quote }} ARGO_CD_TOKEN: {{ .Values.orchestrator.argocd.token | quote }} - FID_LICENSE_KEY: {{ .Values.global.fidLicense | quote }} - GIT_REPO: {{ .Values.orchestrator.git.repo | quote }} GIT_PRIVATE_KEY: {{ .Values.orchestrator.git.privateKey | quote }} - REDIS_HOST: {{ .Values.orchestrator.redis.host | quote }} REDIS_PORT: {{ .Values.orchestrator.redis.port | quote }} - ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} - DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} {{- range $key, $value := (.Values.orchestrator).env }} @@ -44,4 +36,4 @@ metadata: app: {{ template "eoc-orchestrator.fullname" . }} chart: "{{ template "eoc-orchestrator.chart" . }}" release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" \ No newline at end of file + heritage: "{{ .Release.Service }}" diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index 52ade16..cb1a08f 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -19,6 +19,10 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/orchestrator_configmap.yaml") . | sha256sum }} {{- end }} spec: + {{- with .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 6 }} + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.orchestrator.image.repository }}:{{ .Values.orchestrator.image.tag | default .Chart.AppVersion }}" diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index 3ba685d..6b8ae1d 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -19,6 +19,10 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/ui_configmap.yaml") . | sha256sum }} {{- end }} spec: + {{- with .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 6 }} + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}" diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index d7cf8e8..a62eafd 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -16,6 +16,7 @@ global: ## env: ## AWS_REGION: us-east-1 env: {} + imagePullSecrets: [] applications: fid: From f336c69bf6ef91e2600e16d1549df4f174ae7294 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 26 Jan 2024 21:06:36 +0200 Subject: [PATCH 057/178] eoc-Upgrade-eoc-to-1.0.0-rc.13 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 06834e2..274f6c9 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.12 +version: 1.0.0-rc.13 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.12" +appVersion: "1.0.0-rc.13" maintainers: - name: pgodey From 397dff064c6f3eaabc0b66c6cbd347ff50a4af20 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Fri, 26 Jan 2024 12:12:20 -0800 Subject: [PATCH 058/178] Option to use imagePullSecrets to pull EOC images - ui, backend and orchestrator --- charts/eoc/templates/backend_deployment.yaml | 2 +- charts/eoc/templates/orchestrator_deployment.yaml | 2 +- charts/eoc/templates/ui_deployment.yaml | 2 +- charts/eoc/values.yaml | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index 8a10603..67d4cce 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -19,7 +19,7 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/backend_configmap.yaml") . | sha256sum }} {{- end }} spec: - {{- with .Values.global.imagePullSecrets }} + {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 6 }} {{- end }} diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index cb1a08f..16b6665 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -19,7 +19,7 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/orchestrator_configmap.yaml") . | sha256sum }} {{- end }} spec: - {{- with .Values.global.imagePullSecrets }} + {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 6 }} {{- end }} diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index 6b8ae1d..23e3508 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -19,7 +19,7 @@ spec: checksum/environment: {{ include (print $.Template.BasePath "/ui_configmap.yaml") . | sha256sum }} {{- end }} spec: - {{- with .Values.global.imagePullSecrets }} + {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 6 }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index a62eafd..ab43d67 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -16,7 +16,12 @@ global: ## env: ## AWS_REGION: us-east-1 env: {} - imagePullSecrets: [] + +## Image pull secrets to used to pull the images +## Do not add under global as it is used by redis +## imagePullSecrets: +## - regcred +imagePullSecrets: [] applications: fid: From 8f803bd9096fcfdafef35ae9ee2e709b942d9df9 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:29:30 -0800 Subject: [PATCH 059/178] added ia_ metrics prefix and sdc client version to 0.2.7 --- charts/eoc/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index ab43d67..99019ec 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -135,7 +135,7 @@ backend: # should have enough permission to be able to create a service account username: admin password: xxxx - metricsPrefixes: ldap_,process_,push_,fid_ + metricsPrefixes: ldap_,process_,push_,fid_,ia_ agents: api: endpoint: "" @@ -154,7 +154,7 @@ backend: accessKeySecret: "" s3Region: "us-east-2" s3BucketName: "radiant-one-v8-sdc-distribution" - version: "0.2.4" + version: "0.2.7" image: repository: radiantone/eoc-backend pullPolicy: Always From c8e072f2aa642e4451bed793bfdd07a10ddb4f0b Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:51:59 -0600 Subject: [PATCH 060/178] Update SDC to 0.2.9 --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index ae4849d..2bf18db 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.6 +version: 0.0.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.8" +appVersion: "0.2.9" maintainers: - name: pgodey From 7d13998738e4e28d4c904fd192f1ae64dfa49264 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:06:44 +0200 Subject: [PATCH 061/178] Update Chart.yaml for 1.0.0 eoc release --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 274f6c9..a6162b6 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0-rc.13 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0-rc.13" +appVersion: "1.0.0" maintainers: - name: pgodey From 5bd8aa3f3152903340baf37c89ef003bc36b99af Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Mon, 12 Feb 2024 16:08:07 -0800 Subject: [PATCH 062/178] oauth hotfix --- charts/eoc/templates/backend_configmap.yaml | 8 ++++---- charts/eoc/templates/ui_configmap.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index ca4f42d..d102a2c 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -23,19 +23,19 @@ data: JWT_SECRET: {{ .Values.backend.jwt.secret | quote }} JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }} - OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | default true | quote }} + OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | quote }} OAUTH_GOOGLE_CLIENT_ID: {{ .Values.backend.oauth.google.clientId | quote }} OAUTH_GOOGLE_CLIENT_SECRET: {{ .Values.backend.oauth.google.clientSecret | quote }} - OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | default true | quote }} + OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | quote }} OAUTH_GITHUB_CLIENT_ID: {{ .Values.backend.oauth.github.clientId | quote }} OAUTH_GITHUB_CLIENT_SECRET: {{ .Values.backend.oauth.github.clientSecret | quote }} - OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} + OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | quote }} OAUTH_MICROSOFT_CLIENT_ID: {{ .Values.backend.oauth.microsoft.clientId | quote }} OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }} - AUTH_LOCAL_ENABLE: {{ .Values.backend.oauth.local.enabled | default true | quote }} + AUTH_LOCAL_ENABLE: {{ .Values.backend.oauth.local.enabled | quote }} EMAIL_FROM: {{ .Values.backend.smtp.from | quote }} EMAIL_ID: {{ .Values.backend.smtp.user | quote }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 7187102..63b5a2f 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -10,10 +10,10 @@ data: VITE_MONITORING_URL: {{ .Values.ui.monitoringDashboardUrl | quote }} VITE_KIBANA_API_PATH: {{ .Values.ui.kibanaApiPath | quote }} VITE_AMPLITUDE_KEY: {{ .Values.ui.amplitude.key | quote }} - VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | default true | quote }} - VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | default true | quote }} - VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | default true | quote }} - VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | default true | quote }} + VITE_GOOGLE_AUTH_ENABLED: {{ .Values.backend.oauth.google.enabled | quote }} + VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} + VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | quote }} + VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From f5a7340fad35b6fd1885b33c8f3ebdd8a326a266 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 23 Feb 2024 14:44:19 +0200 Subject: [PATCH 063/178] eoc-Upgrade-eoc-to-1.0.1 --- charts/eoc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index a6162b6..ee6898a 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -13,7 +13,7 @@ version: 1.0.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.0.1" maintainers: - name: pgodey From 3c547802bd8210cc687ef105f556ae203f01c2bf Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 23 Feb 2024 14:46:44 +0200 Subject: [PATCH 064/178] eoc-Upgrade-eoc-to-1.0.1 --- charts/eoc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index ee6898a..07ff6ec 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 32cb67fdb38dc837c3dd592511b6ce26349b2707 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:47:19 +0200 Subject: [PATCH 065/178] eoc-Upgrade-eoc-to-1.0.1 --- charts/eoc/templates/ui_configmap.yaml | 1 + charts/eoc/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 63b5a2f..86f36ba 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -14,6 +14,7 @@ data: VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} + VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 99019ec..3798106 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -50,6 +50,8 @@ ui: # full external links to public grafana dashboard reportingDashboardUrl: "" monitoringDashboardUrl: "" + # add a jwt Token to the grafana iFrame url + insertMonitoringJwtToken: false # override infrastructure name used for environment name prefix infrastructureName: "" kibanaApiPath: /kibana/index-patterns From 9311bc38af8605606e09397680db80eb1a3d8b66 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:28:36 +0200 Subject: [PATCH 066/178] eoc-Upgrade-eoc-to-1.0.1 --- charts/eoc/templates/ui_configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 86f36ba..cc1c0e7 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -14,7 +14,7 @@ data: VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} - VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | quote }} + VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From 030e274572f3ea67b83b115a29314f4ef64f3c8d Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:31:03 +0200 Subject: [PATCH 067/178] eoc-Upgrade-eoc-to-1.0.1 --- charts/eoc/templates/ui_configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index cc1c0e7..382ad4b 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -14,7 +14,7 @@ data: VITE_GITHUB_AUTH_ENABLED: {{ .Values.backend.oauth.github.enabled | quote }} VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} - VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | false | quote }} + VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From db8885f3bc310828c2898345aff44a9e0d735583 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:38:33 +0200 Subject: [PATCH 068/178] eoc-Upgrade-eoc-to-1.0.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 07ff6ec..06e7bb4 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.1 +version: 1.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.1" +appVersion: "1.0.2" maintainers: - name: pgodey From 88012bf2b98425717aef47e45c5a968590076efe Mon Sep 17 00:00:00 2001 From: Freddy May Date: Tue, 12 Mar 2024 20:06:41 +0100 Subject: [PATCH 069/178] CUI-1451 EOC allow to use custom values for initialDelaySeconds and periodSeconds --- charts/eoc/templates/backend_deployment.yaml | 8 ++++---- charts/eoc/templates/orchestrator_deployment.yaml | 8 ++++---- charts/eoc/templates/ui_deployment.yaml | 8 ++++---- charts/eoc/values.yaml | 6 ++++++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index 67d4cce..f57e0b5 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -36,16 +36,16 @@ spec: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.backend.initialDelaySeconds }} + periodSeconds: {{ .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 readinessProbe: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.backend.initialDelaySeconds }} + periodSeconds: {{ .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 {{- with .Values.backend.nodeSelector }} diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index 16b6665..fb44e53 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -35,15 +35,15 @@ spec: readinessProbe: tcpSocket: port: 3001 - initialDelaySeconds: 60 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.orchestrator.initialDelaySeconds }} + periodSeconds: {{ .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 livenessProbe: tcpSocket: port: 3001 - initialDelaySeconds: 60 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.orchestrator.initialDelaySeconds }} + periodSeconds: {{ .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 serviceAccount: eoc-orchestrator diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index 23e3508..9402218 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -36,16 +36,16 @@ spec: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.ui.initialDelaySeconds }} + periodSeconds: {{ .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 readinessProbe: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: 120 - periodSeconds: 30 + initialDelaySeconds: {{ .Values.ui.initialDelaySeconds }} + periodSeconds: {{ .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 {{- with .Values.ui.nodeSelector }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 3798106..e62568e 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -65,6 +65,8 @@ ui: nodeSelector: {} tolerations: [] affinity: {} + initialDelaySeconds: 120 + periodSeconds: 30 ## Extra environment variables that will be pass onto deployment pods ## ## env: @@ -165,6 +167,8 @@ backend: nodeSelector: {} tolerations: [] affinity: {} + initialDelaySeconds: 120 + periodSeconds: 30 ## Extra environment variables that will be pass onto deployment pods ## ## env: @@ -198,6 +202,8 @@ orchestrator: nodeSelector: {} tolerations: [] affinity: {} + initialDelaySeconds: 60 + periodSeconds: 30 ## Extra environment variables that will be pass onto deployment pods ## ## env: From 4f7dba2c4a65f969ee3d45411591fe142c9dba86 Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Tue, 12 Mar 2024 16:16:32 -0700 Subject: [PATCH 070/178] Add default values in deployment --- charts/eoc/templates/backend_deployment.yaml | 8 ++++---- charts/eoc/templates/orchestrator_deployment.yaml | 8 ++++---- charts/eoc/templates/ui_deployment.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index f57e0b5..ad21a30 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -36,16 +36,16 @@ spec: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: {{ .Values.backend.initialDelaySeconds }} - periodSeconds: {{ .Values.backend.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.backend.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 readinessProbe: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: {{ .Values.backend.initialDelaySeconds }} - periodSeconds: {{ .Values.backend.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.backend.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 {{- with .Values.backend.nodeSelector }} diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index fb44e53..411e9c1 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -35,15 +35,15 @@ spec: readinessProbe: tcpSocket: port: 3001 - initialDelaySeconds: {{ .Values.orchestrator.initialDelaySeconds }} - periodSeconds: {{ .Values.orchestrator.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.orchestrator.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 livenessProbe: tcpSocket: port: 3001 - initialDelaySeconds: {{ .Values.orchestrator.initialDelaySeconds }} - periodSeconds: {{ .Values.orchestrator.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.orchestrator.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 serviceAccount: eoc-orchestrator diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index 9402218..3fa35fc 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -36,16 +36,16 @@ spec: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: {{ .Values.ui.initialDelaySeconds }} - periodSeconds: {{ .Values.ui.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.ui.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 readinessProbe: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: {{ .Values.ui.initialDelaySeconds }} - periodSeconds: {{ .Values.ui.periodSeconds }} + initialDelaySeconds: {{ default 120 .Values.ui.initialDelaySeconds }} + periodSeconds: {{ default 30 .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 {{- with .Values.ui.nodeSelector }} From 48f964c52b9573c52e2e8d7c9d2fe43f33826d7b Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 13 Mar 2024 12:36:49 -0700 Subject: [PATCH 071/178] keep the original defaults for orchestrator --- charts/eoc/templates/orchestrator_deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/templates/orchestrator_deployment.yaml b/charts/eoc/templates/orchestrator_deployment.yaml index 411e9c1..92dd667 100644 --- a/charts/eoc/templates/orchestrator_deployment.yaml +++ b/charts/eoc/templates/orchestrator_deployment.yaml @@ -35,14 +35,14 @@ spec: readinessProbe: tcpSocket: port: 3001 - initialDelaySeconds: {{ default 120 .Values.orchestrator.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.orchestrator.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 livenessProbe: tcpSocket: port: 3001 - initialDelaySeconds: {{ default 120 .Values.orchestrator.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.orchestrator.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.orchestrator.periodSeconds }} failureThreshold: 5 successThreshold: 1 From aa63105b215d2395a64e76c0eb34412f74c44f40 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Thu, 21 Mar 2024 22:30:34 +0200 Subject: [PATCH 072/178] [eoc] Upgrade-eoc-to-1.10-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 14 +++++++++++-- charts/eoc/templates/ui_configmap.yaml | 6 ++++-- charts/eoc/values.yaml | 23 +++++++++++++++++++++ 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 06e7bb4..1ae410a 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.2 +version: 1.1.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.2" +appVersion: "1.1.0-rc.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index d102a2c..0dc5c2d 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -46,6 +46,7 @@ data: ADMIN_EMAIL: {{ .Values.backend.admin.email | quote }} ADMIN_FIRST_NAME: {{ .Values.backend.admin.firstName | quote }} ADMIN_LAST_NAME: {{ .Values.backend.admin.lastName | quote }} + ADMIN_PASSWORD: {{ .Values.backend.admin.password | default "" | quote }} APP_ROOT_DIRECTORY: {{ .Values.backend.appRootDirectory | quote }} @@ -64,23 +65,32 @@ data: AGENTS_INLETS_TOKEN: {{ .Values.backend.agents.inlets.token | quote }} AGENTS_SERVER_NAME: {{ .Values.backend.agents.inlets.serverName | quote }} AGENTS_SERVER_ENDPOINT: {{ .Values.backend.agents.inlets.serverEndpoint | quote }} + SDC_AWS_ACCESS_KEY_ID: {{ .Values.backend.agents.client.accessKeyId | quote}} SDC_AWS_ACCESS_KEY_SECRET: {{ .Values.backend.agents.client.accessKeySecret | quote }} SDC_AWS_REGION: {{ .Values.backend.agents.client.s3Region | quote }} SDC_AWS_S3_BUCKET_NAME: {{ .Values.backend.agents.client.s3BucketName | quote }} SDC_CLIENT_VERSION: {{ .Values.backend.agents.client.version | quote }} - MIN_ENVIRONMENT_VERSION: {{ .Values.global.minFidVersion | quote }} ENV_PREFIX: {{ .Values.global.infrastructureName | quote }} DOMAIN_NAME: {{ .Values.global.domainName | quote }} NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | default 1 | quote }} NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | default 1 | quote }} - FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default .Values.global.minFidVersion | default "8.0.0" | quote }} + FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default "8.0.0" | quote }} BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "2.0.0" | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} + + DEFAULT_TIER: {{ .Values.backend.defaultTierName | default "Tier1" | quote }} + + DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default True | quote }} + + OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | toJson | quote }} + + RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | toJson | quote }} + {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 382ad4b..53697fe 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -15,12 +15,14 @@ data: VITE_LOCAL_AUTH_ENABLED: {{ .Values.backend.oauth.local.enabled | quote }} VITE_MICROSOFT_AUTH_ENABLED: {{ .Values.backend.oauth.microsoft.enabled | quote }} VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | default false | quote }} + VITE_TIERS_ENABLED: {{ .Values.ui.tiersVisibility | default false | quote }} + VITE_MULTI_TENANT_ENABLED: {{ .Values.ui.multiTenantEnabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} -{{- end }} +{{- end }} {{- range $key, $value := (.Values.global).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} -{{- end }} +{{- end }} kind: ConfigMap metadata: labels: diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index e62568e..a37ee8a 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -67,6 +67,8 @@ ui: affinity: {} initialDelaySeconds: 120 periodSeconds: 30 + tiersVisibility: false + multiTenantEnabled: false ## Extra environment variables that will be pass onto deployment pods ## ## env: @@ -123,6 +125,7 @@ backend: email: user@example.com firstName: User lastName: Example + password: "" # Default on *nix if not explicitly specified # APP_ROOT_DIRECTORY=${HOME}/.cloudmanager # Custom value (if running as a systemd service for example) @@ -169,6 +172,26 @@ backend: affinity: {} initialDelaySeconds: 120 periodSeconds: 30 + defaultTierName: "Tier1" + disableSequentialAppVersionUpdate: true + oidcTemplates: + - name: "OIDC" + discoveryUrl: "https://accounts.google.com/.well-known/openid-configuration" + - name: "Microsoft" + discoveryUrl: "https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration" + - name: "SalesForce" + discoveryUrl: "https://{replace-with-your-instance}.my.salesforce.com/.well-known/openid-configuration" + - name: "Okta" + discoveryUrl: "https://{replace-with-your-Okta-Domain}/.well-known/openid-configuration" + - name: "Github" + releaseChannels: + - name: "Official" + url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" + isDefault: true + - name: "Beta" + url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" + - name: "Nightly" + url: "https://radiantlogic-devops.github.io/release-nightly/index.yaml" ## Extra environment variables that will be pass onto deployment pods ## ## env: From 048e1df41f16b7befa36d074899130b87f9718de Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Thu, 21 Mar 2024 22:37:00 +0200 Subject: [PATCH 073/178] [eoc] Upgrade-eoc-to-1.10-rc.1 --- charts/eoc/templates/backend_configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0dc5c2d..fb055e1 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -85,7 +85,7 @@ data: DEFAULT_TIER: {{ .Values.backend.defaultTierName | default "Tier1" | quote }} - DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default True | quote }} + DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default true | quote }} OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | toJson | quote }} From 9f87bde15269ad173c78180a3b8a34ca94c057c3 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 00:11:36 +0200 Subject: [PATCH 074/178] add rc to the lint test --- .github/workflows/lint-test-eoc.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index aae2b3b..4eebdff 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -8,14 +8,14 @@ on: jobs: lint-test: runs-on: ubuntu-latest - + steps: - + - name: Clear any existing tool cache run: | mv "${{ runner.tool_cache }}" "${{ runner.tool_cache }}.old" mkdir -p "${{ runner.tool_cache }}" - + - name: Checkout uses: actions/checkout@v2 with: @@ -42,14 +42,14 @@ jobs: fi helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add radiantone https://radiantlogic-devops.github.io/helm-charts - + - name: Run chart-testing (lint) run: ct lint --target-branch ${{ github.event.repository.default_branch }} - name: Create kind cluster uses: helm/kind-action@v1.2.0 if: steps.list-changed.outputs.changed == 'true' - + - name: Kind cluster-info run: | kubectl cluster-info --context kind-chart-testing @@ -66,4 +66,4 @@ jobs: --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ - --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade + --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 --set=backend.releaseChannels='[{"name":"official", "appImagesUrl":"https://pgodey.github.io/release-stable/index.yaml"}]'" --upgrade From 2867996111cdae615be292de4b9cda387e6a3cbd Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 00:36:22 +0200 Subject: [PATCH 075/178] try --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 4eebdff..b9a5232 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -66,4 +66,4 @@ jobs: --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ - --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 --set=backend.releaseChannels='[{"name":"official", "appImagesUrl":"https://pgodey.github.io/release-stable/index.yaml"}]'" --upgrade + --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 --set=backend.releaseChannels=xxx" --upgrade From 8a8cf843aa51e92788176e7849828d30c19969a7 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 08:25:12 +0200 Subject: [PATCH 076/178] fix lint --- .github/workflows/lint-test-eoc.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index b9a5232..2f78e67 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -66,4 +66,6 @@ jobs: --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ - --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 --set=backend.releaseChannels=xxx" --upgrade + --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ + --set=backend.releaseChannels[0].name=Official --set=backend.releaseChannels[0].url=https://radiantlogic-devops.github.io/release-stable/index.yaml --set=backend.releaseChannels[0].isDefault=true \ + --upgrade \ No newline at end of file From cbe7c01d5e6b84e5ef0b79df1498c67085ac54ff Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 08:29:01 +0200 Subject: [PATCH 077/178] fix lint --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 2f78e67..032578b 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -67,5 +67,5 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels[0].name=Official --set=backend.releaseChannels[0].url=https://radiantlogic-devops.github.io/release-stable/index.yaml --set=backend.releaseChannels[0].isDefault=true \ + --set=backend.releaseChannels[0].name=Official --set=backend.releaseChannels[0].url=https://radiantlogic-devops.github.io/release-stable/index.yaml --set=backend.releaseChannels[0].isDefault=true" \ --upgrade \ No newline at end of file From 4beb4a4ddaeda8da983635c56663d9a8012ab9f2 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 08:53:06 +0200 Subject: [PATCH 078/178] fix lint --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 032578b..2c3825b 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -67,5 +67,5 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels[0].name=Official --set=backend.releaseChannels[0].url=https://radiantlogic-devops.github.io/release-stable/index.yaml --set=backend.releaseChannels[0].isDefault=true" \ + --set=backend.releaseChannels=[]" \ --upgrade \ No newline at end of file From 919f01d7a8de4fe2859eaadec624187d61300d25 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 09:07:39 +0200 Subject: [PATCH 079/178] linting --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 2c3825b..e370b90 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -67,5 +67,5 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels=[]" \ + --set=backend.releaseChannels=\"{\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\",\"isDefault\":true}\"" \ --upgrade \ No newline at end of file From 39a12de12f72ac4b17af15bf0f9aaa3e939aad04 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 09:13:28 +0200 Subject: [PATCH 080/178] kint --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index e370b90..8529888 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -67,5 +67,5 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels=\"{\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\",\"isDefault\":true}\"" \ + --set=backend.releaseChannels=\"[]\"" \ --upgrade \ No newline at end of file From a22cb6344cb45b9bb50fc7ecc9cd3cfd7324b2d3 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 09:37:23 +0200 Subject: [PATCH 081/178] lint --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 8529888..3e29d17 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -67,5 +67,5 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels=\"[]\"" \ + --set=backend.releaseChannels=" \ --upgrade \ No newline at end of file From 008d26549d4c174abddaf3ca3adb4b082d3e9634 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 09:43:09 +0200 Subject: [PATCH 082/178] use a yaml --- .github/workflows/lint-test-eoc.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 3e29d17..890cc66 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -55,6 +55,16 @@ jobs: kubectl cluster-info --context kind-chart-testing kubectl get nodes --context kind-chart-testing + - name: Create temporary values file + run: | + cat << EOF > temp-values.yaml + backend: + releaseChannels: + - name: "Official" + url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" + isDefault: true + EOF + - name: Run chart-testing (install) run: | ct install --charts=charts/eoc --debug --helm-extra-args="--timeout=15m0s" --helm-extra-set-args="--set=postgresql.enabled=true \ @@ -67,5 +77,4 @@ jobs: --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --set=backend.releaseChannels=" \ - --upgrade \ No newline at end of file + --values temp-values.yaml" --upgrade \ No newline at end of file From 14fe7f6bb91d0e0cef49ba83a60b186c9c66c7d1 Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 10:03:20 +0200 Subject: [PATCH 083/178] lint fix --- .github/workflows/lint-test-eoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 890cc66..031117d 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -62,7 +62,7 @@ jobs: releaseChannels: - name: "Official" url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" - isDefault: true + isDefault: "true" EOF - name: Run chart-testing (install) From 860136903f3ffafe2abbe7c0b7f3e291a3f7200c Mon Sep 17 00:00:00 2001 From: Alexandru Luca Date: Fri, 22 Mar 2024 10:05:17 +0200 Subject: [PATCH 084/178] adjust values.yaml --- charts/eoc/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index a37ee8a..0bd8107 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -173,7 +173,7 @@ backend: initialDelaySeconds: 120 periodSeconds: 30 defaultTierName: "Tier1" - disableSequentialAppVersionUpdate: true + disableSequentialAppVersionUpdate: "true" oidcTemplates: - name: "OIDC" discoveryUrl: "https://accounts.google.com/.well-known/openid-configuration" @@ -187,7 +187,7 @@ backend: releaseChannels: - name: "Official" url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" - isDefault: true + isDefault: "true" - name: "Beta" url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" - name: "Nightly" From ec83f66c51df94abfe2bf3f9807567ca25ed2cca Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:30:20 +0200 Subject: [PATCH 085/178] Update backend_configmap.yaml --- charts/eoc/templates/backend_configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index fb055e1..dc3dc51 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -85,11 +85,11 @@ data: DEFAULT_TIER: {{ .Values.backend.defaultTierName | default "Tier1" | quote }} - DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default true | quote }} + DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default "true" | quote }} - OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | toJson | quote }} + OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | default "" | toJson | quote }} - RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | toJson | quote }} + RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "" | toJson | quote }} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} From 9d88075e37444d56d74aad825d8f40a90c7c6256 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:06:15 +0300 Subject: [PATCH 086/178] [eoc] Upgrade-eoc-to-1.10-rc.2 --- charts/eoc/templates/backend_configmap.yaml | 4 +- charts/eoc/values.yaml | 69 +++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index dc3dc51..0163fa4 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -89,7 +89,9 @@ data: OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | default "" | toJson | quote }} - RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "" | toJson | quote }} + RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "{\"releaseChannels\":[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]}" | toJson | quote }} + + TIERS: {{ .Values.backend.tiers | default "[{\"asg\":{\"Capacity\":\"m5a.large\",\"DesiredCapacity\":1,\"MaxSize\":3,\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}],\"MinSize\":0},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"fid\":{\"persistence\":{\"enabled\":true,\"size\":\"100Gi\",\"storageClass\":\"gp3\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"name\":\"BaseTier\"},{\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"name\":\"Tier1\"}]" | toJson | quote }} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 0bd8107..9024aa7 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -192,6 +192,75 @@ backend: url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" - name: "Nightly" url: "https://radiantlogic-devops.github.io/release-nightly/index.yaml" + tiers: + - name: BaseTier + asg: + Capacity: m5a.large + DesiredCapacity: 1 + MinSize: 0 + MaxSize: 3 + MetaData: + - Key: OsDiskSize + Value: 50Gi + bwigrc: + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + fid: + persistence: + enabled: true + size: 100Gi + storageClass: gp3 + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + - name: Tier1 + asg: + Capacity: m5a.xlarge + bwigrc: + resources: + limits: + cpu: 2 + memory: 8Gi + fid: + persistence: + size: 100Gi + resources: + limits: + cpu: 2 + memory: 8Gi + requests: + cpu: 2 + memory: 8Gi + - name: Tier2 + asg: + Capacity: m5a.2xlarge + bwigrc: + resources: + limits: + cpu: 4 + memory: 16Gi + requests: + cpu: 4 + memory: 16Gi + fid: + persistence: + size: 200Gi + resources: + limits: + cpu: 4 + memory: 16Gi + requests: + cpu: 4 + memory: 16Gi ## Extra environment variables that will be pass onto deployment pods ## ## env: From 90b313cdd5cc1bf8b8a366defe1d3b6f4954ff12 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:07:30 +0300 Subject: [PATCH 087/178] [eoc] Upgrade-eoc-to-1.10-rc.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 1ae410a..195998f 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0-rc.1 +version: 1.1.0-rc.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0-rc.1" +appVersion: "1.1.0-rc.2" maintainers: - name: pgodey From b93f983cd947ecf85008ab388711e8881a710be2 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:38:18 +0300 Subject: [PATCH 088/178] fix chart lint --- .github/workflows/lint-test-eoc.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 031117d..3456c7b 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -55,15 +55,15 @@ jobs: kubectl cluster-info --context kind-chart-testing kubectl get nodes --context kind-chart-testing - - name: Create temporary values file - run: | - cat << EOF > temp-values.yaml - backend: - releaseChannels: - - name: "Official" - url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" - isDefault: "true" - EOF + # - name: Create temporary values file + # run: | + # cat << EOF > temp-values.yaml + # backend: + # releaseChannels: + # - name: "Official" + # url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" + # isDefault: "true" + # EOF - name: Run chart-testing (install) run: | @@ -76,5 +76,4 @@ jobs: --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ - --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ - --values temp-values.yaml" --upgrade \ No newline at end of file + --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade \ No newline at end of file From 4d1b35acc351cef0d5cd7dcc213a6e1c040c9865 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 3 Apr 2024 12:20:18 +0300 Subject: [PATCH 089/178] lints --- charts/eoc/templates/backend_configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0163fa4..4051fb6 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -89,9 +89,9 @@ data: OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | default "" | toJson | quote }} - RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "{\"releaseChannels\":[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]}" | toJson | quote }} + RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]" | toJson | quote }} - TIERS: {{ .Values.backend.tiers | default "[{\"asg\":{\"Capacity\":\"m5a.large\",\"DesiredCapacity\":1,\"MaxSize\":3,\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}],\"MinSize\":0},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"fid\":{\"persistence\":{\"enabled\":true,\"size\":\"100Gi\",\"storageClass\":\"gp3\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"name\":\"BaseTier\"},{\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"name\":\"Tier1\"}]" | toJson | quote }} + TIERS: {{ .Values.backend.tiers | default "[{\"name\":\"BaseTier\",\"asg\":{\"MinSize\":0,\"MaxSize\":3,\"DesiredCapacity\":1,\"Capacity\":\"m5a.large\",\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}]},\"fid\":{\"persistence\":{\"enabled\":true,\"storageClass\":\"gp3\",\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}}},{\"name\":\"Tier1\",\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}}},{\"name\":\"Tier2\",\"asg\":{\"Capacity\":\"m5a.2xlarge\"},\"fid\":{\"persistence\":{\"size\":\"200Gi\"},\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}}}]" | toJson | quote}} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} From 3f150c60ecb0e0797a0b96311d738efa4e9e62d9 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 3 Apr 2024 12:43:41 +0300 Subject: [PATCH 090/178] lint --- charts/eoc/templates/backend_configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 4051fb6..0e28bf4 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -91,7 +91,7 @@ data: RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]" | toJson | quote }} - TIERS: {{ .Values.backend.tiers | default "[{\"name\":\"BaseTier\",\"asg\":{\"MinSize\":0,\"MaxSize\":3,\"DesiredCapacity\":1,\"Capacity\":\"m5a.large\",\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}]},\"fid\":{\"persistence\":{\"enabled\":true,\"storageClass\":\"gp3\",\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}}},{\"name\":\"Tier1\",\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}}},{\"name\":\"Tier2\",\"asg\":{\"Capacity\":\"m5a.2xlarge\"},\"fid\":{\"persistence\":{\"size\":\"200Gi\"},\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}}}]" | toJson | quote}} + TIERS: {{ .Values.backend.tiers | default "" | toJson | quote}} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} From 6ede6c78dc3a7dcee13c341f18c418a1d2b22781 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:17:59 +0300 Subject: [PATCH 091/178] add defaults and overwrites --- .github/workflows/lint-test-eoc.yml | 69 ++++++++++++++++++--- charts/eoc/templates/backend_configmap.yaml | 2 +- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 3456c7b..19dbf62 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -55,15 +55,63 @@ jobs: kubectl cluster-info --context kind-chart-testing kubectl get nodes --context kind-chart-testing - # - name: Create temporary values file - # run: | - # cat << EOF > temp-values.yaml - # backend: - # releaseChannels: - # - name: "Official" - # url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" - # isDefault: "true" - # EOF + - name: Create temporary values file + run: | + cat << EOF > temp-values.yaml + backend: + releaseChannels: + - name: "Official" + url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" + isDefault: "true" + tiers: + - name: BaseTier + asg: + Capacity: m5a.large + DesiredCapacity: 1 + MinSize: 0 + MaxSize: 3 + MetaData: + - Key: OsDiskSize + Value: 50Gi + bwigrc: + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + fid: + persistence: + enabled: true + size: 100Gi + storageClass: gp3 + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + - name: Tier1 + asg: + Capacity: m5a.xlarge + bwigrc: + resources: + limits: + cpu: 2 + memory: 8Gi + fid: + persistence: + size: 100Gi + resources: + limits: + cpu: 2 + memory: 8Gi + requests: + cpu: 2 + memory: 8Gi + EOF - name: Run chart-testing (install) run: | @@ -76,4 +124,5 @@ jobs: --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \ --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \ --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \ - --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade \ No newline at end of file + --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \ + --values temp-values.yaml" --upgrade \ No newline at end of file diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0e28bf4..4051fb6 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -91,7 +91,7 @@ data: RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]" | toJson | quote }} - TIERS: {{ .Values.backend.tiers | default "" | toJson | quote}} + TIERS: {{ .Values.backend.tiers | default "[{\"name\":\"BaseTier\",\"asg\":{\"MinSize\":0,\"MaxSize\":3,\"DesiredCapacity\":1,\"Capacity\":\"m5a.large\",\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}]},\"fid\":{\"persistence\":{\"enabled\":true,\"storageClass\":\"gp3\",\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}}},{\"name\":\"Tier1\",\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}}},{\"name\":\"Tier2\",\"asg\":{\"Capacity\":\"m5a.2xlarge\"},\"fid\":{\"persistence\":{\"size\":\"200Gi\"},\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}}}]" | toJson | quote}} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} From d115003594510519e8be5e4becec60ba03571698 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:59:56 -0700 Subject: [PATCH 092/178] Only include official channel --- charts/eoc/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 9024aa7..bec38fe 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -188,10 +188,10 @@ backend: - name: "Official" url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" isDefault: "true" - - name: "Beta" - url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" - - name: "Nightly" - url: "https://radiantlogic-devops.github.io/release-nightly/index.yaml" +# - name: "Beta" +# url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" +# - name: "Nightly" +# url: "https://radiantlogic-devops.github.io/release-nightly/index.yaml" tiers: - name: BaseTier asg: From 733ef67a9d3955a4f45987b047e7f4df7d3b40a5 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:05:29 -0700 Subject: [PATCH 093/178] Update Chart.yaml --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 2bf18db..f3f3499 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.7 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.9" +appVersion: "1.0.0" maintainers: - name: pgodey From 3b8abc1614d366b8d1af32a728d905b8dc9ea32d Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:56:42 -0700 Subject: [PATCH 094/178] Update configmap.yaml --- charts/sdc/templates/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/sdc/templates/configmap.yaml b/charts/sdc/templates/configmap.yaml index 498cce6..547567e 100644 --- a/charts/sdc/templates/configmap.yaml +++ b/charts/sdc/templates/configmap.yaml @@ -12,4 +12,5 @@ data: PortForward__Range: {{ .Values.agents.portForward__range | quote }} {{- end }} Jwt__Issuer: {{ .Values.agents.endpoint | quote }} + ASPNETCORE_URLS: {{- printf "%s-%s" "http://+:" {{ .Values.service.port }} -}} From a7626f073d8d3ad79ae1ff5c1af3a3979867919e Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Thu, 4 Apr 2024 13:44:40 -0700 Subject: [PATCH 095/178] added ASPNETCORE_URLS --- charts/sdc/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sdc/templates/configmap.yaml b/charts/sdc/templates/configmap.yaml index 547567e..86265ba 100644 --- a/charts/sdc/templates/configmap.yaml +++ b/charts/sdc/templates/configmap.yaml @@ -12,5 +12,5 @@ data: PortForward__Range: {{ .Values.agents.portForward__range | quote }} {{- end }} Jwt__Issuer: {{ .Values.agents.endpoint | quote }} - ASPNETCORE_URLS: {{- printf "%s-%s" "http://+:" {{ .Values.service.port }} -}} + ASPNETCORE_URLS: http://+:{{- .Values.service.port -}} From 11ce2e87ab90f58753c02924338ce0fc5edfa4e0 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Wed, 17 Apr 2024 00:03:54 +0300 Subject: [PATCH 096/178] [eoc] Upgrade-eoc-to-1.1.0-rc.3 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 195998f..6dde130 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0-rc.2 +version: 1.1.0-rc.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0-rc.2" +appVersion: "1.1.0-rc.3" maintainers: - name: pgodey From 32371ba858d27f8db28b49c70742b3558033ad30 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:46:24 +0300 Subject: [PATCH 097/178] eoc-add-local-mfa-config --- charts/eoc/templates/backend_configmap.yaml | 1 + charts/eoc/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 4051fb6..414662b 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -36,6 +36,7 @@ data: OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }} AUTH_LOCAL_ENABLE: {{ .Values.backend.oauth.local.enabled | quote }} + AUTH_LOCAL_MFA_ENABLE: {{ .Values.backend.oauth.local.mfa | default "false" | quote }} EMAIL_FROM: {{ .Values.backend.smtp.from | quote }} EMAIL_ID: {{ .Values.backend.smtp.user | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index bec38fe..32c387d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -113,6 +113,7 @@ backend: clientSecret: "xxxxxx" local: enabled: true + mfa: false # mailer module smtp: from: "" From 7db78159b362810e9639756b5ad6377202a4fc75 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Wed, 1 May 2024 18:40:52 -0700 Subject: [PATCH 098/178] Update Chart.yaml --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 6dde130..9a871f7 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0-rc.3 +version: 1.1.0-rc.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0-rc.3" +appVersion: "1.1.0-rc.4" maintainers: - name: pgodey From db5fb720ff8fa79a980c734697c7945b8793bea1 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Sat, 25 May 2024 01:33:38 +0300 Subject: [PATCH 099/178] [eoc] Upgrade-eoc-to-1.1.0-rc.3 --- charts/eoc/templates/backend_configmap.yaml | 2 ++ charts/eoc/values.yaml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 414662b..3681a42 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -54,11 +54,13 @@ data: ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} KIBANA_API_LINK: {{ .Values.backend.kibana.apiUrl | quote }} + KIBANA_BASE_AUTH: {{ .Values.backend.kibana.baseAuth | default "" | quote }} GRAFANA_BASE_URL: {{ .Values.backend.grafana.host | quote }} GRAFANA_USERNAME: {{ .Values.backend.grafana.username | quote }} GRAFANA_PASSWORD: {{ .Values.backend.grafana.password | quote }} GRAFANA_METRICS_PREFIXES: {{ .Values.backend.grafana.metricsPrefixes | quote }} + GRAFANA_BASE_AUTH: {{ .Values.backend.grafana.baseAuth | default "" | quote }} AGENTS_BASE_PATH: {{ .Values.backend.agents.api.endpoint | quote }} AGENTS_CLIENT_ID: {{ .Values.backend.agents.api.clientId | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 32c387d..317685e 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -54,7 +54,7 @@ ui: insertMonitoringJwtToken: false # override infrastructure name used for environment name prefix infrastructureName: "" - kibanaApiPath: /kibana/index-patterns + kibanaApiPath: /eoc-kibana/index-patterns amplitude: key: "" image: @@ -136,7 +136,8 @@ backend: encryptionKey: 1194c5c206aa26d37091c4e6d09dc9de kibana: # https://{fqdn}/kibana/api/ - apiUrl: "https://{fqdn}/kibana/api/" + apiUrl: "hhttp://kibana:5601/eoc-backend/kibana/api/" + baseAuth: "" grafana: host: http://grafana # used to create a service account for managing alerts and integrations @@ -144,6 +145,7 @@ backend: username: admin password: xxxx metricsPrefixes: ldap_,process_,push_,fid_,ia_ + baseAuth: "" agents: api: endpoint: "" From 63a3bfca43393c411db6d49459ff043b52a01068 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Sat, 25 May 2024 01:35:06 +0300 Subject: [PATCH 100/178] [eoc] Upgrade-eoc-to-1.1.0-rc.5 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 9a871f7..2e5fe19 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0-rc.4 +version: 1.1.0-rc.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0-rc.4" +appVersion: "1.1.0-rc.5" maintainers: - name: pgodey From 71382101bd4ef991becfc4872b1dc60c8c291124 Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Sat, 25 May 2024 02:30:11 +0300 Subject: [PATCH 101/178] [eoc] Upgrade-eoc-to-1.1.0-rc.5 --- charts/eoc/templates/backend_configmap.yaml | 4 ++-- charts/eoc/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 3681a42..86d1a16 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -54,13 +54,13 @@ data: ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} KIBANA_API_LINK: {{ .Values.backend.kibana.apiUrl | quote }} - KIBANA_BASE_AUTH: {{ .Values.backend.kibana.baseAuth | default "" | quote }} + KIBANA_BASIC_AUTH: {{ .Values.backend.kibana.basicAuth | default "" | quote }} GRAFANA_BASE_URL: {{ .Values.backend.grafana.host | quote }} GRAFANA_USERNAME: {{ .Values.backend.grafana.username | quote }} GRAFANA_PASSWORD: {{ .Values.backend.grafana.password | quote }} GRAFANA_METRICS_PREFIXES: {{ .Values.backend.grafana.metricsPrefixes | quote }} - GRAFANA_BASE_AUTH: {{ .Values.backend.grafana.baseAuth | default "" | quote }} + GRAFANA_BASIC_AUTH: {{ .Values.backend.grafana.basicAuth | default "" | quote }} AGENTS_BASE_PATH: {{ .Values.backend.agents.api.endpoint | quote }} AGENTS_CLIENT_ID: {{ .Values.backend.agents.api.clientId | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 317685e..ae64238 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -137,7 +137,7 @@ backend: kibana: # https://{fqdn}/kibana/api/ apiUrl: "hhttp://kibana:5601/eoc-backend/kibana/api/" - baseAuth: "" + basicAuth: "" grafana: host: http://grafana # used to create a service account for managing alerts and integrations @@ -145,7 +145,7 @@ backend: username: admin password: xxxx metricsPrefixes: ldap_,process_,push_,fid_,ia_ - baseAuth: "" + basicAuth: "" agents: api: endpoint: "" From 5bab09c3cd6d12fe616b1cf03ae101685ee0b18e Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Sat, 25 May 2024 02:37:27 +0300 Subject: [PATCH 102/178] [eoc] Upgrade-eoc-to-1.1.0-rc.5 --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index ae64238..7d32aaf 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -136,7 +136,7 @@ backend: encryptionKey: 1194c5c206aa26d37091c4e6d09dc9de kibana: # https://{fqdn}/kibana/api/ - apiUrl: "hhttp://kibana:5601/eoc-backend/kibana/api/" + apiUrl: "http://kibana:5601/eoc-backend/kibana/api/" basicAuth: "" grafana: host: http://grafana From cf7f55db2c021fe493064509cadcaaea57ac1206 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Sat, 25 May 2024 13:59:49 -0700 Subject: [PATCH 103/178] Updated Tiers configuration --- charts/eoc/values.yaml | 97 ++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 23 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 7d32aaf..eacac81 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -191,10 +191,6 @@ backend: - name: "Official" url: "https://radiantlogic-devops.github.io/release-stable/index.yaml" isDefault: "true" -# - name: "Beta" -# url: "https://radiantlogic-devops.github.io/release-beta/index.yaml" -# - name: "Nightly" -# url: "https://radiantlogic-devops.github.io/release-nightly/index.yaml" tiers: - name: BaseTier asg: @@ -204,15 +200,33 @@ backend: MaxSize: 3 MetaData: - Key: OsDiskSize - Value: 50Gi + Value: 50 bwigrc: - resources: - limits: - cpu: 1 - memory: 4Gi - requests: - cpu: 1 - memory: 4Gi + portal: + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + batch: + resources: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 1 + memory: 4Gi + cnpg: + resources: + requests: + memory: 512Mi + cpu: 500m + limits: + memory: 1Gi + cpu: 1 + walStorage: 32Gi fid: persistence: enabled: true @@ -229,10 +243,30 @@ backend: asg: Capacity: m5a.xlarge bwigrc: - resources: - limits: - cpu: 2 - memory: 8Gi + portal: + resources: + limits: + cpu: 2 + memory: 8Gi + requests: + cpu: 2 + memory: 8Gi + batch: + resources: + limits: + cpu: 2 + memory: 8Gi + requests: + cpu: 2 + memory: 8Gi + cnpg: + resources: + requests: + memory: 1Gi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 fid: persistence: size: 100Gi @@ -247,13 +281,30 @@ backend: asg: Capacity: m5a.2xlarge bwigrc: - resources: - limits: - cpu: 4 - memory: 16Gi - requests: - cpu: 4 - memory: 16Gi + portal: + resources: + limits: + cpu: 4 + memory: 16Gi + requests: + cpu: 4 + memory: 16Gi + batch: + resources: + limits: + cpu: 4 + memory: 16Gi + requests: + cpu: 4 + memory: 16Gi + cnpg: + resources: + requests: + memory: 2Gi + cpu: 2 + limits: + memory: 4Gi + cpu: 4 fid: persistence: size: 200Gi From e8999c8c175e27bb8edbd2d6d392527be7aa815f Mon Sep 17 00:00:00 2001 From: Alex Luca <113450970+alexlucaEnsemble@users.noreply.github.com> Date: Thu, 11 Jul 2024 01:31:11 +0300 Subject: [PATCH 104/178] eoc-upgrade-eoc-to-1.1.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 2e5fe19..552fe90 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0-rc.5 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0-rc.5" +appVersion: "1.1.0" maintainers: - name: pgodey From 7f8db449f2fe1382c7783b64e19b7d7e468ab9d5 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 25 Sep 2024 12:18:36 +0200 Subject: [PATCH 105/178] CUI-1988 Upgrade EOC Helm Charts to 1.2.0-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 552fe90..d22cbe5 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0 +version: 1.2.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0" +appVersion: "1.2.0-rc.1" maintainers: - name: pgodey From 4804788bfa60234562d20f72fc6e1c7130d98bd2 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 1 Oct 2024 19:32:06 +0200 Subject: [PATCH 106/178] Move EOC to 1.2.0-rc.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index d22cbe5..d416f73 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0-rc.1 +version: 1.2.0-rc.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0-rc.1" +appVersion: "1.2.0-rc.2" maintainers: - name: pgodey From c80206bdc4160655696416025e8a903667a2b8d1 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:01:19 -0700 Subject: [PATCH 107/178] minVersionUpdate serviceStatusEnabled --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/templates/backend_configmap.yaml | 5 ++++- charts/eoc/templates/ui_configmap.yaml | 1 + charts/eoc/values.yaml | 13 ++++++++----- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index d416f73..86d53e5 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0-rc.2 +version: 1.2.0-rc.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0-rc.2" +appVersion: "1.2.0-rc.3" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 86d1a16..01cc12f 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -81,7 +81,10 @@ data: NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | default 1 | quote }} NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | default 1 | quote }} FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default "8.0.0" | quote }} - BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "2.0.0" | quote }} + BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "3.0.0" | quote }} + + FID_MIN_VERSION_UPDATE: {{ .Values.applications.fid.minVersionUpdate | default "8.0.0" | quote }} + BW_MIN_VERSION_UPDATE: {{ .Values.applications.brainwave.minVersionUpdate | default "3.0.0" | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 53697fe..a99940c 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -17,6 +17,7 @@ data: VITE_INSERT_MONITORING_JWT_TOKEN: {{ .Values.ui.insertMonitoringJwtToken | default false | quote }} VITE_TIERS_ENABLED: {{ .Values.ui.tiersVisibility | default false | quote }} VITE_MULTI_TENANT_ENABLED: {{ .Values.ui.multiTenantEnabled | default false | quote }} + VITE_SERVICE_STATUS_ENABLED: {{ .Values.ui.serviceStatusEnabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index eacac81..9b9e1d0 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -17,7 +17,7 @@ global: ## AWS_REGION: us-east-1 env: {} -## Image pull secrets to used to pull the images +## Image pull secrets to pull the images ## Do not add under global as it is used by redis ## imagePullSecrets: ## - regcred @@ -26,9 +26,11 @@ imagePullSecrets: [] applications: fid: minVersion: "8.0.0" - nodeLimit: 0 + minVersionUpdate: "8.0.0" + nodeLimitUpdate: 0 brainwave: - minVersion: "2.0.0" + minVersion: "3.0.0" + minVersionUpdate: "3.0.0" nodeLimit: 0 features: @@ -69,6 +71,7 @@ ui: periodSeconds: 30 tiersVisibility: false multiTenantEnabled: false + serviceStatusEnabled: false ## Extra environment variables that will be pass onto deployment pods ## ## env: @@ -164,7 +167,7 @@ backend: accessKeySecret: "" s3Region: "us-east-2" s3BucketName: "radiant-one-v8-sdc-distribution" - version: "0.2.7" + version: "1.0.0" image: repository: radiantone/eoc-backend pullPolicy: Always @@ -178,7 +181,7 @@ backend: defaultTierName: "Tier1" disableSequentialAppVersionUpdate: "true" oidcTemplates: - - name: "OIDC" + - name: "Google" discoveryUrl: "https://accounts.google.com/.well-known/openid-configuration" - name: "Microsoft" discoveryUrl: "https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration" From c84a6ad7a8b3126d3bce0b2bfe2839ab0c9f5215 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:54:04 -0700 Subject: [PATCH 108/178] initialDelaySeconds=60 --- charts/eoc/templates/backend_deployment.yaml | 4 ++-- charts/eoc/templates/ui_deployment.yaml | 4 ++-- charts/eoc/values.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/eoc/templates/backend_deployment.yaml b/charts/eoc/templates/backend_deployment.yaml index ad21a30..134a5d4 100644 --- a/charts/eoc/templates/backend_deployment.yaml +++ b/charts/eoc/templates/backend_deployment.yaml @@ -36,7 +36,7 @@ spec: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: {{ default 120 .Values.backend.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.backend.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 @@ -44,7 +44,7 @@ spec: httpGet: path: /eoc-backend/health port: 3000 - initialDelaySeconds: {{ default 120 .Values.backend.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.backend.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.backend.periodSeconds }} failureThreshold: 10 successThreshold: 1 diff --git a/charts/eoc/templates/ui_deployment.yaml b/charts/eoc/templates/ui_deployment.yaml index 3fa35fc..3a59f5b 100644 --- a/charts/eoc/templates/ui_deployment.yaml +++ b/charts/eoc/templates/ui_deployment.yaml @@ -36,7 +36,7 @@ spec: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: {{ default 120 .Values.ui.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.ui.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 @@ -44,7 +44,7 @@ spec: httpGet: path: /eoc/login port: 80 - initialDelaySeconds: {{ default 120 .Values.ui.initialDelaySeconds }} + initialDelaySeconds: {{ default 60 .Values.ui.initialDelaySeconds }} periodSeconds: {{ default 30 .Values.ui.periodSeconds }} failureThreshold: 10 successThreshold: 1 diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 9b9e1d0..e84173a 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -67,7 +67,7 @@ ui: nodeSelector: {} tolerations: [] affinity: {} - initialDelaySeconds: 120 + initialDelaySeconds: 60 periodSeconds: 30 tiersVisibility: false multiTenantEnabled: false @@ -176,7 +176,7 @@ backend: nodeSelector: {} tolerations: [] affinity: {} - initialDelaySeconds: 120 + initialDelaySeconds: 60 periodSeconds: 30 defaultTierName: "Tier1" disableSequentialAppVersionUpdate: "true" From bbd5600ba06f2626168046d206a6e9abba66cec1 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 15 Oct 2024 09:10:54 -0700 Subject: [PATCH 109/178] Added serviceStatusConfig yaml --- charts/eoc/templates/backend_configmap.yaml | 2 ++ charts/eoc/values.yaml | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 01cc12f..37fe45d 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -99,6 +99,8 @@ data: TIERS: {{ .Values.backend.tiers | default "[{\"name\":\"BaseTier\",\"asg\":{\"MinSize\":0,\"MaxSize\":3,\"DesiredCapacity\":1,\"Capacity\":\"m5a.large\",\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}]},\"fid\":{\"persistence\":{\"enabled\":true,\"storageClass\":\"gp3\",\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}}},{\"name\":\"Tier1\",\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}}},{\"name\":\"Tier2\",\"asg\":{\"Capacity\":\"m5a.2xlarge\"},\"fid\":{\"persistence\":{\"size\":\"200Gi\"},\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}}}]" | toJson | quote}} + SERVICE_STATUS_CONFIG: {{ .Values.backend.serviceStatusConfig | default "" | toJson | quote }} + {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index e84173a..7e898ce 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -318,6 +318,20 @@ backend: requests: cpu: 4 memory: 16Gi + serviceStatusConfig: [] + # - name: eoc + # enabled: true + # namespace: duploservices-ensemble-svc + # services: + # - name: redis-master + # kind: StatefulSet + # label: Redis + # enabled: true + # - name: sss + # kind: Deployment + # label: Storage Service + # enabled: true + ## Extra environment variables that will be pass onto deployment pods ## ## env: From 1e56fb3b8104698f2e24cda2ed008eca01fb21a8 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Fri, 18 Oct 2024 18:49:45 +0200 Subject: [PATCH 110/178] Set EOC version to 1.2.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 86d53e5..573863f 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0-rc.3 +version: 1.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0-rc.3" +appVersion: "1.2.0" maintainers: - name: pgodey From 794eb97dd87f7dd4655c64934e7dfb8a22fed6e3 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 9 Dec 2024 16:41:12 +0100 Subject: [PATCH 111/178] Add new configs for EOC 1.3.0 --- charts/eoc/templates/backend_configmap.yaml | 6 ++ charts/eoc/values.yaml | 98 ++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 37fe45d..2cde98f 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -101,6 +101,12 @@ data: SERVICE_STATUS_CONFIG: {{ .Values.backend.serviceStatusConfig | default "" | toJson | quote }} + FID_LOG_SETTINGS: {{ .Values.backend.logsConfig | default "" | toJson | quote }} + + DEFAULT_AGGREGATOR: {{ .Values.backend.defaultLogAggregators | default "" | toJson | quote }} + + SCHEDULED_MAINTENANCE_CONFIG: {{ .Values.backend.scheduledMaintenanceConfig | default "" | toJson | quote }} + {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 7e898ce..08ca265 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -331,7 +331,103 @@ backend: # kind: Deployment # label: Storage Service # enabled: true - + logsConfig: + vds_server: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_server.log" + index: vds_server.log + # custom_index: vds_server_testing.log + # splunk_index: vds_server_splunk_testing.log + # splunk_source: testingsource + # splunk_sourcetype: testingsourcetype + vds_server_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_server_access.csv" + index: vds_server_access.log + # custom_index: + # splunk_index: + # splunk_source: + # splunk_sourcetype: + parse: |- + + @type tsv + keys LOGID,LOGDATE,LOGTIME,LOGTYPE,SERVERID,SERVERPORT,SESSIONID,MSGID,CLIENTIP,BINDDN,BINDUSER,CONNNB,OPNB,OPCODE,OPNAME,BASEDN,ATTRIBUTES,SCOPE,FILTER,SIZELIMIT,TIMELIMIT,LDAPCONTROLS,CHANGES,RESULTCODE,ERRORMESSAGE,MATCHEDDN,NBENTRIES,ETIME + types LOGID:integer,LOGDATE:string,LOGTIME:string,LOGTYPE:integer,SERVERID:string,SERVERPORT:integer,SESSIONID:integer,MSGID:integer,CLIENTIP:string,BINDDN:string,BINDUSER:string,CONNNB:integer,OPNB:integer,OPCODE:integer,OPNAME:string,BASEDN:string,ATTRIBUTES:string,SCOPE:string,FILTER:string,SIZELIMIT:integer,TIMELIMIT:integer,LDAPCONTROLS:string,CHANGES:string,RESULTCODE:integer,ERRORMESSAGE:string,MATCHEDDN:string,NBENTRIES:integer,ETIME:integer + + vds_events: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_events.log" + index: vds_events.log + # custom_index: + # splunk_index: + # splunk_source: + # splunk_sourcetype: + periodiccache: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/periodiccache.log" + index: periodiccache.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + web: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/jetty//web.log" + index: web.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + web_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/jetty/web_access.log" + index: web_access.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + sync_engine: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/sync_engine.log" + index: sync_engine.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + alerts: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/alerts.log" + index: alerts.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + adap_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/adap_access.log" + index: adap_access.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + admin_rest_api_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/admin_rest_api_access.log" + index: admin_rest_api_access.log + # custom_index: + # splunk_index: + # splunk_source + # splunk_sourcetype + defaultLogAggregators: + type: "elasticsearch" + host: "elasticsearch-master" + port: "9200" + index_prefix: "es-index" + scheduledMaintenanceConfig: + # name: uptime-kuma + # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' + # username: admin + # password: 6rXUfw@VSWqZ!isAG3 ## Extra environment variables that will be pass onto deployment pods ## ## env: From 36215d396fa1bbe1f549f3876373d75af4bf46b4 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:26:30 -0800 Subject: [PATCH 112/178] Update helm chart version to 1.3.0-rc.1 --- charts/eoc/Chart.yaml | 4 +- charts/eoc/templates/backend_configmap.yaml | 4 +- charts/eoc/values.yaml | 161 +++++++++----------- 3 files changed, 75 insertions(+), 94 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 573863f..c632eff 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0 +version: 1.3.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0" +appVersion: "1.3.0-rc.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 2cde98f..0d904a6 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -101,9 +101,9 @@ data: SERVICE_STATUS_CONFIG: {{ .Values.backend.serviceStatusConfig | default "" | toJson | quote }} - FID_LOG_SETTINGS: {{ .Values.backend.logsConfig | default "" | toJson | quote }} + FID_LOG_SETTINGS: {{ .Values.applications.fid.logsConfig | default "" | toJson | quote }} - DEFAULT_AGGREGATOR: {{ .Values.backend.defaultLogAggregators | default "" | toJson | quote }} + DEFAULT_AGGREGATOR: {{ .Values.backend.defaultLogAggregator | default "" | toJson | quote }} SCHEDULED_MAINTENANCE_CONFIG: {{ .Values.backend.scheduledMaintenanceConfig | default "" | toJson | quote }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 08ca265..dd0b75d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -28,6 +28,74 @@ applications: minVersion: "8.0.0" minVersionUpdate: "8.0.0" nodeLimitUpdate: 0 + logsConfig: + vds_server: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_server.log" + index: vds_server.log + retention_days: 30 + aggregators: ["Default"] + vds_server_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_server_access.csv" + index: vds_server_access.log + parse: |- + + @type tsv + keys LOGID,LOGDATE,LOGTIME,LOGTYPE,SERVERID,SERVERPORT,SESSIONID,MSGID,CLIENTIP,BINDDN,BINDUSER,CONNNB,OPNB,OPCODE,OPNAME,BASEDN,ATTRIBUTES,SCOPE,FILTER,SIZELIMIT,TIMELIMIT,LDAPCONTROLS,CHANGES,RESULTCODE,ERRORMESSAGE,MATCHEDDN,NBENTRIES,ETIME + types LOGID:integer,LOGDATE:string,LOGTIME:string,LOGTYPE:integer,SERVERID:string,SERVERPORT:integer,SESSIONID:integer,MSGID:integer,CLIENTIP:string,BINDDN:string,BINDUSER:string,CONNNB:integer,OPNB:integer,OPCODE:integer,OPNAME:string,BASEDN:string,ATTRIBUTES:string,SCOPE:string,FILTER:string,SIZELIMIT:integer,TIMELIMIT:integer,LDAPCONTROLS:string,CHANGES:string,RESULTCODE:integer,ERRORMESSAGE:string,MATCHEDDN:string,NBENTRIES:integer,ETIME:integer + + retention_days: 30 + aggregators: ["Default"] + vds_events: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/vds_events.log" + index: vds_events.log + retention_days: 30 + aggregators: ["Default"] + periodiccache: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/periodiccache.log" + index: periodiccache.log + retention_days: 30 + aggregators: ["Default"] + web: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/jetty//web.log" + index: web.log + retention_days: 30 + aggregators: ["Default"] + web_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/jetty/web_access.log" + index: web_access.log + retention_days: 30 + aggregators: ["Default"] + sync_engine: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/sync_engine.log" + index: sync_engine.log + retention_days: 30 + aggregators: ["Default"] + alerts: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/alerts.log" + index: alerts.log + retention_days: 30 + aggregators: ["Default"] + adap_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/adap_access.log" + index: adap_access.log + retention_days: 30 + aggregators: ["Default"] + admin_rest_api_access: + enabled: true + path: "/opt/radiantone/vds/vds_server/logs/admin_rest_api_access.log" + index: admin_rest_api_access.log + retention_days: 30 + aggregators: ["Default"] + brainwave: minVersion: "3.0.0" minVersionUpdate: "3.0.0" @@ -200,7 +268,7 @@ backend: Capacity: m5a.large DesiredCapacity: 1 MinSize: 0 - MaxSize: 3 + MaxSize: 5 MetaData: - Key: OsDiskSize Value: 50 @@ -331,99 +399,12 @@ backend: # kind: Deployment # label: Storage Service # enabled: true - logsConfig: - vds_server: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/vds_server.log" - index: vds_server.log - # custom_index: vds_server_testing.log - # splunk_index: vds_server_splunk_testing.log - # splunk_source: testingsource - # splunk_sourcetype: testingsourcetype - vds_server_access: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/vds_server_access.csv" - index: vds_server_access.log - # custom_index: - # splunk_index: - # splunk_source: - # splunk_sourcetype: - parse: |- - - @type tsv - keys LOGID,LOGDATE,LOGTIME,LOGTYPE,SERVERID,SERVERPORT,SESSIONID,MSGID,CLIENTIP,BINDDN,BINDUSER,CONNNB,OPNB,OPCODE,OPNAME,BASEDN,ATTRIBUTES,SCOPE,FILTER,SIZELIMIT,TIMELIMIT,LDAPCONTROLS,CHANGES,RESULTCODE,ERRORMESSAGE,MATCHEDDN,NBENTRIES,ETIME - types LOGID:integer,LOGDATE:string,LOGTIME:string,LOGTYPE:integer,SERVERID:string,SERVERPORT:integer,SESSIONID:integer,MSGID:integer,CLIENTIP:string,BINDDN:string,BINDUSER:string,CONNNB:integer,OPNB:integer,OPCODE:integer,OPNAME:string,BASEDN:string,ATTRIBUTES:string,SCOPE:string,FILTER:string,SIZELIMIT:integer,TIMELIMIT:integer,LDAPCONTROLS:string,CHANGES:string,RESULTCODE:integer,ERRORMESSAGE:string,MATCHEDDN:string,NBENTRIES:integer,ETIME:integer - - vds_events: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/vds_events.log" - index: vds_events.log - # custom_index: - # splunk_index: - # splunk_source: - # splunk_sourcetype: - periodiccache: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/periodiccache.log" - index: periodiccache.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - web: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/jetty//web.log" - index: web.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - web_access: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/jetty/web_access.log" - index: web_access.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - sync_engine: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/sync_engine.log" - index: sync_engine.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - alerts: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/alerts.log" - index: alerts.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - adap_access: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/adap_access.log" - index: adap_access.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - admin_rest_api_access: - enabled: true - path: "/opt/radiantone/vds/vds_server/logs/admin_rest_api_access.log" - index: admin_rest_api_access.log - # custom_index: - # splunk_index: - # splunk_source - # splunk_sourcetype - defaultLogAggregators: + defaultLogAggregator: type: "elasticsearch" host: "elasticsearch-master" port: "9200" index_prefix: "es-index" - scheduledMaintenanceConfig: + scheduledMaintenanceConfig: {} # name: uptime-kuma # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' # username: admin From 44a50f9e668f4f0ccb09e2ea03bcf1f28df52802 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:29:19 -0800 Subject: [PATCH 113/178] fix linting errors --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index dd0b75d..bc0f915 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -408,7 +408,7 @@ backend: # name: uptime-kuma # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' # username: admin - # password: 6rXUfw@VSWqZ!isAG3 + # password: 6rXUfw@VSWqZ!isAG3 ## Extra environment variables that will be pass onto deployment pods ## ## env: From acc81369e33cf509cc19c0139ac7d435db5794a1 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:35:13 -0800 Subject: [PATCH 114/178] added connector log --- charts/eoc/values.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index bc0f915..0a2270f 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -29,6 +29,12 @@ applications: minVersionUpdate: "8.0.0" nodeLimitUpdate: 0 logsConfig: + connector: + enabled: true + path: "/opt/radiantone/vds/logs/sync_agents/*/connector.log" + index: connector + aggregators: ["Default"] + retention_days: 30 vds_server: enabled: true path: "/opt/radiantone/vds/vds_server/logs/vds_server.log" @@ -95,7 +101,6 @@ applications: index: admin_rest_api_access.log retention_days: 30 aggregators: ["Default"] - brainwave: minVersion: "3.0.0" minVersionUpdate: "3.0.0" From f3f7e48a602281b4f1b7024591f1df05ac8e0411 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:18:35 -0600 Subject: [PATCH 115/178] Update Chart.yaml --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index f3f3499..0e0bf0c 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.1.0" maintainers: - name: pgodey From f03b385601232be5e4c47ff55712f30cfc63962d Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 23 Jan 2025 11:24:07 +0100 Subject: [PATCH 116/178] Add NOTIFICATION_CONFIG --- charts/eoc/templates/backend_configmap.yaml | 2 ++ charts/eoc/values.yaml | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0d904a6..0a346fb 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -107,6 +107,8 @@ data: SCHEDULED_MAINTENANCE_CONFIG: {{ .Values.backend.scheduledMaintenanceConfig | default "" | toJson | quote }} + NOTIFICATION_CONFIG: {{ .Values.backend.userNotificationsConfig | default "" | toJson | quote }} + {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 0a2270f..5feaec7 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -414,6 +414,22 @@ backend: # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' # username: admin # password: 6rXUfw@VSWqZ!isAG3 + userNotificationsConfig: {} + # enabled: true + # notifyOn: + # created: true + # updated: true + # remainders: + # - 1d + # - 12h + # - 3h + # executing: false + # ended: false + # notificationMethod: + # in_app: + # enabled: true + # email: + # enabled: true ## Extra environment variables that will be pass onto deployment pods ## ## env: From 19891041499d24f9d4a3d5a4f43983dedc0796b7 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 23 Jan 2025 11:36:00 +0100 Subject: [PATCH 117/178] Add scheduledMaintenanceEnabled flag --- charts/eoc/templates/ui_configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index a99940c..5839cc7 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -18,6 +18,7 @@ data: VITE_TIERS_ENABLED: {{ .Values.ui.tiersVisibility | default false | quote }} VITE_MULTI_TENANT_ENABLED: {{ .Values.ui.multiTenantEnabled | default false | quote }} VITE_SERVICE_STATUS_ENABLED: {{ .Values.ui.serviceStatusEnabled | default false | quote }} + VITE_SCHEDULED_MAINTENANCE_ENABLED: {{ .Values.ui.scheduledMaintenanceEnabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From 5c3cdd01f8b58083a67bf3c7b90d503c701686dd Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 23 Jan 2025 11:36:32 +0100 Subject: [PATCH 118/178] Set EOC version to 1.3.0-rc.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index c632eff..2f5faad 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.0-rc.1 +version: 1.3.0-rc.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.0-rc.1" +appVersion: "1.3.0-rc.2" maintainers: - name: pgodey From 6786b9efc3222a994cfed4d3027465ce0c2b86fb Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 23 Jan 2025 23:09:16 +0100 Subject: [PATCH 119/178] Add default value to scheduledMaintenanceEnabled --- charts/eoc/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 5feaec7..d6ead8d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -145,6 +145,7 @@ ui: tiersVisibility: false multiTenantEnabled: false serviceStatusEnabled: false + scheduledMaintenanceEnabled: true ## Extra environment variables that will be pass onto deployment pods ## ## env: From e34c46182a906a9151fa4b2107165a6b90e0a792 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:30:35 -0800 Subject: [PATCH 120/178] fix build issues --- .github/workflows/lint-test-eoc.yml | 2 +- .github/workflows/lint-test-sdc.yml | 2 +- .github/workflows/lint-test-sss.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test-eoc.yml b/.github/workflows/lint-test-eoc.yml index 19dbf62..22f74d9 100644 --- a/.github/workflows/lint-test-eoc.yml +++ b/.github/workflows/lint-test-eoc.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.9 - name: Set up chart-testing uses: helm/chart-testing-action@v2.3.0 diff --git a/.github/workflows/lint-test-sdc.yml b/.github/workflows/lint-test-sdc.yml index d134922..9a854fe 100644 --- a/.github/workflows/lint-test-sdc.yml +++ b/.github/workflows/lint-test-sdc.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.9 - name: Set up chart-testing uses: helm/chart-testing-action@v2.3.0 diff --git a/.github/workflows/lint-test-sss.yml b/.github/workflows/lint-test-sss.yml index 29ff30b..e43445c 100644 --- a/.github/workflows/lint-test-sss.yml +++ b/.github/workflows/lint-test-sss.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.9 - name: Set up chart-testing uses: helm/chart-testing-action@v2.3.0 From e6f553f91ab2000eb4d8c4d3a3e6ae7343a659be Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 23 Jan 2025 23:35:13 +0100 Subject: [PATCH 121/178] Fix trailing spaces --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index d6ead8d..20d2e93 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -430,7 +430,7 @@ backend: # in_app: # enabled: true # email: - # enabled: true + # enabled: true ## Extra environment variables that will be pass onto deployment pods ## ## env: From 755bedb8dce2631575c962c2227758b6480ee42f Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 6 Feb 2025 11:48:40 +0100 Subject: [PATCH 122/178] Set a default userNotificationsConfig for scheduledMaintenances --- charts/eoc/values.yaml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 20d2e93..6b55f23 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -415,22 +415,23 @@ backend: # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' # username: admin # password: 6rXUfw@VSWqZ!isAG3 - userNotificationsConfig: {} - # enabled: true - # notifyOn: - # created: true - # updated: true - # remainders: - # - 1d - # - 12h - # - 3h - # executing: false - # ended: false - # notificationMethod: - # in_app: - # enabled: true - # email: - # enabled: true + userNotificationsConfig: + scheduledMaintenances: + enabled: true + notifyOn: + created: true + updated: true + remainders: + - 7d + - 1d + - 8h + executing: false + ended: false + notificationMethod: + in_app: + enabled: true + email: + enabled: true ## Extra environment variables that will be pass onto deployment pods ## ## env: From 432c151ba2a4dea7fbf93e7cd2af966e5ad099a6 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 6 Feb 2025 11:48:59 +0100 Subject: [PATCH 123/178] Add REGION env variable to the backend --- charts/eoc/templates/backend_configmap.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 0a346fb..e50ae59 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -108,6 +108,8 @@ data: SCHEDULED_MAINTENANCE_CONFIG: {{ .Values.backend.scheduledMaintenanceConfig | default "" | toJson | quote }} NOTIFICATION_CONFIG: {{ .Values.backend.userNotificationsConfig | default "" | toJson | quote }} + + REGION: {{ .Values.global.region | quote }} {{- range $key, $value := (.Values.backend).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} From 09fab01627c44b0f6974c5497a26450a3f1478b7 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Fri, 7 Feb 2025 16:26:45 +0100 Subject: [PATCH 124/178] Update EOC chart version to 1.3.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 2f5faad..cea3918 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.0-rc.2 +version: 1.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.0-rc.2" +appVersion: "1.3.0" maintainers: - name: pgodey From 6a520673e540a881a1d0d977681c3a7afd6f33c7 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:07:04 -0600 Subject: [PATCH 125/178] Update service.yaml --- charts/sdc/templates/service.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/sdc/templates/service.yaml b/charts/sdc/templates/service.yaml index 9f67a91..c8c0f40 100644 --- a/charts/sdc/templates/service.yaml +++ b/charts/sdc/templates/service.yaml @@ -7,6 +7,8 @@ metadata: {{- if .Values.prometheus.enabled }} annotations: prometheus.io/scrape: 'true' + prometheus.io/port: "{{ .Values.service.port }}" + prometheus.io/path: "/metrics" {{- end }} spec: type: {{ .Values.service.type }} From bcbd883f46451f7280193faa05111afd96a21b07 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:03:50 -0600 Subject: [PATCH 126/178] updates --- charts/sdc/Chart.yaml | 4 ++-- charts/sdc/values.yaml | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 0e0bf0c..cd0ad4b 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0 +version: 1.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0" +appVersion: "1.2.0" maintainers: - name: pgodey diff --git a/charts/sdc/values.yaml b/charts/sdc/values.yaml index f091c50..318d689 100644 --- a/charts/sdc/values.yaml +++ b/charts/sdc/values.yaml @@ -4,6 +4,33 @@ replicaCount: 1 +# metrics: +# enabled: false +# sdc: +# enabled: false +# serviceMonitor: +# enabled: false +# namespace: "" +# interval: "" +# scrapeTimeout: "" +# selector: {} +# labels: {} +# annotations: {} +# additionalLabels: {} +# additionalAnnotations: {} +# inlets: +# enabled: false +# serviceMonitor: +# enabled: false +# namespace: "" +# interval: "" +# scrapeTimeout: "" +# selector: {} +# labels: {} +# annotations: {} +# additionalLabels: {} +# additionalAnnotations: {} + image: repository: radiantone/sdc-server pullPolicy: Always From 829d39c9db63b07ea2c732ca69f9a19448b93484 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Thu, 20 Feb 2025 17:29:27 -0600 Subject: [PATCH 127/178] Revert changes` Updates will be done in the next release --- charts/sdc/templates/service.yaml | 4 ++-- charts/sdc/values.yaml | 27 --------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/charts/sdc/templates/service.yaml b/charts/sdc/templates/service.yaml index c8c0f40..f54f375 100644 --- a/charts/sdc/templates/service.yaml +++ b/charts/sdc/templates/service.yaml @@ -7,8 +7,8 @@ metadata: {{- if .Values.prometheus.enabled }} annotations: prometheus.io/scrape: 'true' - prometheus.io/port: "{{ .Values.service.port }}" - prometheus.io/path: "/metrics" + # prometheus.io/port: "{{ .Values.service.port }}" + # prometheus.io/path: "/metrics" {{- end }} spec: type: {{ .Values.service.type }} diff --git a/charts/sdc/values.yaml b/charts/sdc/values.yaml index 318d689..f091c50 100644 --- a/charts/sdc/values.yaml +++ b/charts/sdc/values.yaml @@ -4,33 +4,6 @@ replicaCount: 1 -# metrics: -# enabled: false -# sdc: -# enabled: false -# serviceMonitor: -# enabled: false -# namespace: "" -# interval: "" -# scrapeTimeout: "" -# selector: {} -# labels: {} -# annotations: {} -# additionalLabels: {} -# additionalAnnotations: {} -# inlets: -# enabled: false -# serviceMonitor: -# enabled: false -# namespace: "" -# interval: "" -# scrapeTimeout: "" -# selector: {} -# labels: {} -# annotations: {} -# additionalLabels: {} -# additionalAnnotations: {} - image: repository: radiantone/sdc-server pullPolicy: Always From 0b61e716c28a7ba6d76436fae0701edaece789cb Mon Sep 17 00:00:00 2001 From: Prashanth Godey Date: Sun, 23 Feb 2025 11:51:35 -0800 Subject: [PATCH 128/178] sdc client chart --- charts/sdc-client/Chart.yaml | 29 +++++++++ charts/sdc-client/templates/_helpers.tpl | 71 +++++++++++++++++++++ charts/sdc-client/templates/configmap.yaml | 14 ++++ charts/sdc-client/templates/deployment.yaml | 56 ++++++++++++++++ charts/sdc-client/values.yaml | 70 ++++++++++++++++++++ 5 files changed, 240 insertions(+) create mode 100644 charts/sdc-client/Chart.yaml create mode 100644 charts/sdc-client/templates/_helpers.tpl create mode 100644 charts/sdc-client/templates/configmap.yaml create mode 100644 charts/sdc-client/templates/deployment.yaml create mode 100644 charts/sdc-client/values.yaml diff --git a/charts/sdc-client/Chart.yaml b/charts/sdc-client/Chart.yaml new file mode 100644 index 0000000..6881d43 --- /dev/null +++ b/charts/sdc-client/Chart.yaml @@ -0,0 +1,29 @@ +apiVersion: v2 +name: sdc-client +description: SDC Client Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.2.3 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "0.2.3" + +maintainers: + - name: pgodey + email: pgodey@radiantlogic.com + url: https://www.radiantlogic.com diff --git a/charts/sdc-client/templates/_helpers.tpl b/charts/sdc-client/templates/_helpers.tpl new file mode 100644 index 0000000..9b5637f --- /dev/null +++ b/charts/sdc-client/templates/_helpers.tpl @@ -0,0 +1,71 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "agent.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "agent.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "agent.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "agent.labels" -}} +helm.sh/chart: {{ include "agent.chart" . }} +{{ include "agent.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "agent.selectorLabels" -}} +app.kubernetes.io/name: {{ include "agent.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "agent.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "agent.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{/* +Define Image Pull Secret +*/}} +{{- define "imagePullSecret" }} +{{- with .Values.imageCredentials }} +{{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }} +{{- end }} +{{- end }} diff --git a/charts/sdc-client/templates/configmap.yaml b/charts/sdc-client/templates/configmap.yaml new file mode 100644 index 0000000..fadbeba --- /dev/null +++ b/charts/sdc-client/templates/configmap.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "agent.fullname" . }}-env + labels: + app: {{ template "agent.fullname" . }} + chart: "{{ template "agent.chart" . }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +data: + {{- if .Values.agent.token }} + ServerHubConfiguration__AgentToken: {{ .Values.agent.token | quote }} + {{- end }} + diff --git a/charts/sdc-client/templates/deployment.yaml b/charts/sdc-client/templates/deployment.yaml new file mode 100644 index 0000000..d4a1e55 --- /dev/null +++ b/charts/sdc-client/templates/deployment.yaml @@ -0,0 +1,56 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "agent.fullname" . }} + labels: + {{- include "agent.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "agent.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "agent.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "agent.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ $.Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + envFrom: + - configMapRef: + name: {{ template "agent.fullname" . }}-env + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/sdc-client/values.yaml b/charts/sdc-client/values.yaml new file mode 100644 index 0000000..f25cc43 --- /dev/null +++ b/charts/sdc-client/values.yaml @@ -0,0 +1,70 @@ +# Default values for agent. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: radiantone/sdc-client + pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + # tag: "0.1.1" + +imagePullSecrets: [] + # - name: regcred + +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# Enable prometheus to activate scraping the metrics from metrics end point +# Prometheus needs to deployed and available +prometheus: + enabled: false + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 5 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} +tolerations: [] +affinity: {} + +agent: + token: "-- set your token --" From b8377f5f8ca2fb709dfb71b83d50e79a972c8ec3 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Sun, 23 Feb 2025 11:53:50 -0800 Subject: [PATCH 129/178] Create lint-test-sdc-client.yaml --- .github/workflows/lint-test-sdc-client.yaml | 58 +++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/lint-test-sdc-client.yaml diff --git a/.github/workflows/lint-test-sdc-client.yaml b/.github/workflows/lint-test-sdc-client.yaml new file mode 100644 index 0000000..362c560 --- /dev/null +++ b/.github/workflows/lint-test-sdc-client.yaml @@ -0,0 +1,58 @@ +name: Lint and Test SDC Client Charts + +on: + pull_request: + paths: + - 'charts/sdc-client/**' + +jobs: + lint-test: + runs-on: ubuntu-latest + + steps: + + - name: Clear any existing tool cache + run: | + mv "${{ runner.tool_cache }}" "${{ runner.tool_cache }}.old" + mkdir -p "${{ runner.tool_cache }}" + + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up Helm + uses: azure/setup-helm@v1 + with: + version: v3.9.2 + + - uses: actions/setup-python@v2 + with: + python-version: 3.9 + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.3.0 + + - name: Run chart-testing (list-changed) + id: list-changed + run: | + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) + if [[ -n "$changed" ]]; then + echo "::set-output name=changed::true" + fi + helm repo add bitnami https://charts.bitnami.com/bitnami + + - name: Run chart-testing (lint) + run: ct lint --target-branch ${{ github.event.repository.default_branch }} + + - name: Create kind cluster + uses: helm/kind-action@v1.2.0 + if: steps.list-changed.outputs.changed == 'true' + + - name: Kind cluster-info + run: | + kubectl cluster-info --context kind-chart-testing + kubectl get nodes --context kind-chart-testing + + - name: Run chart-testing (install) + run: ct install --charts=charts/sss --debug From b7154893e6add26140f8eff26ae5017c2349e1e8 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Sun, 23 Feb 2025 11:55:14 -0800 Subject: [PATCH 130/178] version 1.0.0 --- charts/sdc-client/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc-client/Chart.yaml b/charts/sdc-client/Chart.yaml index 6881d43..56f8594 100644 --- a/charts/sdc-client/Chart.yaml +++ b/charts/sdc-client/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.3 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.3" +appVersion: "1.0.0" maintainers: - name: pgodey From 31594aedb6b6f933d29178244397ab003dbc521b Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:22:08 -0800 Subject: [PATCH 131/178] Update Chart.yaml --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index cea3918..77b20b9 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.0 +version: 1.3.1-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.0" +appVersion: "1.3.0-rc.1" maintainers: - name: pgodey From 006509afe5908151734a1c14a98a1369d91b73d9 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:38:10 -0800 Subject: [PATCH 132/178] prep for 1.3.1-rc.1 release --- charts/eoc/templates/backend_service.yaml | 6 ++++++ charts/eoc/values.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/charts/eoc/templates/backend_service.yaml b/charts/eoc/templates/backend_service.yaml index b59874a..9b4ca9e 100644 --- a/charts/eoc/templates/backend_service.yaml +++ b/charts/eoc/templates/backend_service.yaml @@ -2,6 +2,12 @@ apiVersion: v1 kind: Service metadata: name: {{ include "eoc-backend.fullname" . }}-service +{{- if .Values.backend.metrics.enabled }} + annotations: + prometheus.io/scrape: 'true' + prometheus.io/port: '3000' + prometheus.io/path: {{ .Values.backend.basePath }}/metrics +{{- end }} spec: ports: - name: {{ include "eoc-backend.fullname" . }}-service-port diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 6b55f23..262211a 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -432,6 +432,12 @@ backend: enabled: true email: enabled: true + ## Enable prometheus metrics + ## + ## metrics: + ## enabled: true + metrics: + enabled: false ## Extra environment variables that will be pass onto deployment pods ## ## env: From e17b06a19bd9f2d114d2a4aae275409f19190df2 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 18 Mar 2025 16:50:02 +0100 Subject: [PATCH 133/178] Add node limit, min version and min version update for IDO --- charts/eoc/templates/backend_configmap.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index e50ae59..101aa83 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -80,11 +80,14 @@ data: NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | default 1 | quote }} NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | default 1 | quote }} + NODE_LIMIT_IDO: {{ .Values.applications.ido.nodeLimit | default 1 | quote }} FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default "8.0.0" | quote }} BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "3.0.0" | quote }} + IDO_MIN_VERSION: {{ .Values.applications.ido.minVersion | default "1.0.0" | quote }} FID_MIN_VERSION_UPDATE: {{ .Values.applications.fid.minVersionUpdate | default "8.0.0" | quote }} BW_MIN_VERSION_UPDATE: {{ .Values.applications.brainwave.minVersionUpdate | default "3.0.0" | quote }} + IDO_MIN_VERSION_UPDATE: {{ .Values.applications.ido.minVersionUpdate | default "8.0.0" | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} From 5b473c90ed077494e10bc921d2ffac3788c40331 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 18 Mar 2025 17:09:35 +0100 Subject: [PATCH 134/178] Add IDO env vars --- charts/eoc/templates/ui_configmap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 5839cc7..a3f2e91 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -19,6 +19,10 @@ data: VITE_MULTI_TENANT_ENABLED: {{ .Values.ui.multiTenantEnabled | default false | quote }} VITE_SERVICE_STATUS_ENABLED: {{ .Values.ui.serviceStatusEnabled | default false | quote }} VITE_SCHEDULED_MAINTENANCE_ENABLED: {{ .Values.ui.scheduledMaintenanceEnabled | default false | quote }} + VITE_IDO_ENABLED: {{ .Values.applications.ido.enabled | default false | quote }} + VITE_TASK_MANAGEMENT_LOGS_ENABLED: {{ .Values.ui.taskManagementLogsEnabled | default false | quote }} + VITE_TASK_MANAGEMENT_RE_RUN_ENABLED: {{ .Values.ui.taskManagementReRunEnabled | default false | quote }} + VITE_TASK_MANAGEMENT_CANCEL_ENABLED: {{ .Values.ui.taskManagementCancelEnabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From 6a06442a87064a5d93706f86e26b38544b7a1ee7 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 19 Mar 2025 00:00:20 +0100 Subject: [PATCH 135/178] Set default values --- charts/eoc/values.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 262211a..9bae77d 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -105,7 +105,11 @@ applications: minVersion: "3.0.0" minVersionUpdate: "3.0.0" nodeLimit: 0 - + ido: + enabled: false + nodeLimit: 10 + minVersion: "1.0.0" + minVersionUpdate: "1.0.0" features: mfa: enabled: false @@ -146,6 +150,9 @@ ui: multiTenantEnabled: false serviceStatusEnabled: false scheduledMaintenanceEnabled: true + taskManagementLogsEnabled: false + taskManagementReRunEnabled: false + taskManagementCancelEnabled: false ## Extra environment variables that will be pass onto deployment pods ## ## env: From 91628308a9f5c357d0cad69ed14aaa0316cd939d Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 19 Mar 2025 00:38:25 +0100 Subject: [PATCH 136/178] Fix versions --- charts/eoc/Chart.yaml | 2 +- charts/eoc/templates/backend_configmap.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 77b20b9..b7c1c8f 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -13,7 +13,7 @@ version: 1.3.1-rc.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.0-rc.1" +appVersion: "1.3.1-rc.1" maintainers: - name: pgodey diff --git a/charts/eoc/templates/backend_configmap.yaml b/charts/eoc/templates/backend_configmap.yaml index 101aa83..540cfeb 100644 --- a/charts/eoc/templates/backend_configmap.yaml +++ b/charts/eoc/templates/backend_configmap.yaml @@ -83,11 +83,11 @@ data: NODE_LIMIT_IDO: {{ .Values.applications.ido.nodeLimit | default 1 | quote }} FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default "8.0.0" | quote }} BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "3.0.0" | quote }} - IDO_MIN_VERSION: {{ .Values.applications.ido.minVersion | default "1.0.0" | quote }} + IDO_MIN_VERSION: {{ .Values.applications.ido.minVersion | default "0.0.0" | quote }} FID_MIN_VERSION_UPDATE: {{ .Values.applications.fid.minVersionUpdate | default "8.0.0" | quote }} BW_MIN_VERSION_UPDATE: {{ .Values.applications.brainwave.minVersionUpdate | default "3.0.0" | quote }} - IDO_MIN_VERSION_UPDATE: {{ .Values.applications.ido.minVersionUpdate | default "8.0.0" | quote }} + IDO_MIN_VERSION_UPDATE: {{ .Values.applications.ido.minVersionUpdate | default "0.0.0" | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }} From fca1d53aa4bdd52064e0e27c0dad013f7b3131e1 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 26 Mar 2025 13:10:00 -0500 Subject: [PATCH 137/178] Improvements Multiple sdc client tokens can now be provided in values.yaml A deployment and configmap is created for each token provided under agents: Each deployment has its own resources Each deployments gets its own nodeSelector --- charts/sdc-client/templates/_helpers.tpl | 45 +++++++++++++++ charts/sdc-client/templates/configmap.yaml | 22 ++++--- charts/sdc-client/templates/deployment.yaml | 63 ++++++++++++++------- charts/sdc-client/values.yaml | 27 +++++++-- 4 files changed, 123 insertions(+), 34 deletions(-) diff --git a/charts/sdc-client/templates/_helpers.tpl b/charts/sdc-client/templates/_helpers.tpl index 9b5637f..500a54a 100644 --- a/charts/sdc-client/templates/_helpers.tpl +++ b/charts/sdc-client/templates/_helpers.tpl @@ -23,6 +23,25 @@ If release name contains chart name it will be used as a full name. {{- end }} {{- end }} +{{/* +Create an agent-specific fully qualified app name. +For each agent, we append the agent name to create a unique resource name. +*/}} +{{- define "agent.fullname.agent" -}} +{{- $agentName := .agentName }} +{{- $root := .root }} +{{- if $root.Values.fullnameOverride }} +{{- printf "%s-%s" $root.Values.fullnameOverride $agentName | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default $root.Chart.Name $root.Values.nameOverride }} +{{- if contains $name $root.Release.Name }} +{{- printf "%s-%s" $root.Release.Name $agentName | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s-%s" $root.Release.Name $name $agentName | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + {{/* Create chart name and version as used by the chart label. */}} @@ -42,6 +61,21 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} +{{/* +Common labels with agent name +*/}} +{{- define "agent.labels.agent" -}} +{{- $agentName := .agentName }} +{{- $root := .root }} +helm.sh/chart: {{ include "agent.chart" $root }} +{{ include "agent.selectorLabels.agent" . }} +{{- if $root.Chart.AppVersion }} +app.kubernetes.io/version: {{ $root.Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ $root.Release.Service }} +agent-name: {{ $agentName }} +{{- end }} + {{/* Selector labels */}} @@ -50,6 +84,17 @@ app.kubernetes.io/name: {{ include "agent.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} +{{/* +Selector labels with agent name +*/}} +{{- define "agent.selectorLabels.agent" -}} +{{- $agentName := .agentName }} +{{- $root := .root }} +app.kubernetes.io/name: {{ include "agent.name" $root }} +app.kubernetes.io/instance: {{ $root.Release.Name }} +agent-name: {{ $agentName }} +{{- end }} + {{/* Create the name of the service account to use */}} diff --git a/charts/sdc-client/templates/configmap.yaml b/charts/sdc-client/templates/configmap.yaml index fadbeba..a14912d 100644 --- a/charts/sdc-client/templates/configmap.yaml +++ b/charts/sdc-client/templates/configmap.yaml @@ -1,14 +1,18 @@ +{{- if .Values.agents }} +# Create ConfigMaps for each agent +{{- range .Values.agents }} +--- apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "agent.fullname" . }}-env + name: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }}-env labels: - app: {{ template "agent.fullname" . }} - chart: "{{ template "agent.chart" . }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + app: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }} + chart: "{{ template "agent.chart" $ }}" + release: "{{ $.Release.Name }}" + heritage: "{{ $.Release.Service }}" + agent-name: {{ .name }} data: - {{- if .Values.agent.token }} - ServerHubConfiguration__AgentToken: {{ .Values.agent.token | quote }} - {{- end }} - + ServerHubConfiguration__AgentToken: {{ .token | quote }} +{{- end }} +{{- end }} diff --git a/charts/sdc-client/templates/deployment.yaml b/charts/sdc-client/templates/deployment.yaml index d4a1e55..f4494fe 100644 --- a/charts/sdc-client/templates/deployment.yaml +++ b/charts/sdc-client/templates/deployment.yaml @@ -1,56 +1,81 @@ +{{- if .Values.agents }} +# Create deployments for each agent +{{- range .Values.agents }} +--- apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "agent.fullname" . }} + name: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }} labels: - {{- include "agent.labels" . | nindent 4 }} + {{- include "agent.labels.agent" (dict "root" $ "agentName" .name) | nindent 4 }} spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} + {{- if not $.Values.autoscaling.enabled }} + replicas: {{ $.Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "agent.selectorLabels" . | nindent 6 }} + {{- include "agent.selectorLabels.agent" (dict "root" $ "agentName" .name) | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} + {{- with $.Values.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "agent.selectorLabels" . | nindent 8 }} + {{- include "agent.selectorLabels.agent" (dict "root" $ "agentName" .name) | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} + {{- with $.Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "agent.serviceAccountName" . }} + serviceAccountName: {{ include "agent.serviceAccountName" $ }} securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} + {{- toYaml $.Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }} + - name: {{ $.Chart.Name }} securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ $.Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- toYaml $.Values.securityContext | nindent 12 }} + image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} ports: - name: http containerPort: 80 protocol: TCP envFrom: - configMapRef: - name: {{ template "agent.fullname" . }}-env + name: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }}-env resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} + {{- if .resources }} + {{- toYaml .resources | nindent 12 }} + {{- else }} + {{- toYaml $.Values.resources | nindent 12 }} + {{- end }} + {{- if .nodeSelector }} + nodeSelector: + {{- toYaml .nodeSelector | nindent 8 }} + {{- else }} + {{- with $.Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.affinity }} + {{- end }} + {{- if .affinity }} + affinity: + {{- toYaml .affinity | nindent 8 }} + {{- else }} + {{- with $.Values.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.tolerations }} + {{- end }} + {{- if .tolerations }} + tolerations: + {{- toYaml .tolerations | nindent 8 }} + {{- else }} + {{- with $.Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/sdc-client/values.yaml b/charts/sdc-client/values.yaml index f25cc43..2362fc8 100644 --- a/charts/sdc-client/values.yaml +++ b/charts/sdc-client/values.yaml @@ -1,7 +1,3 @@ -# Default values for agent. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - replicaCount: 1 image: @@ -66,5 +62,24 @@ nodeSelector: {} tolerations: [] affinity: {} -agent: - token: "-- set your token --" +# Configuration for multiple SDC clients +agents: + # Each agent entry creates a separate deployment of sdc-client + - name: "agent1" + token: "-- set token for agent1 --" + # Optional per-agent overrides + resources: {} + nodeSelector: {} + affinity: {} + tolerations: [] + + # Example of another agent configuration + # - name: "agent2" + # token: "-- set token for agent2 --" + # resources: + # limits: + # cpu: 200m + # memory: 256Mi + # requests: + # cpu: 100m + # memory: 128Mi From 3f0817a3b3e9fb588b2fcbf0dd2e878c09c387c2 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:30:22 -0500 Subject: [PATCH 138/178] Create README.md --- charts/sdc-client/README.md | 179 ++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 charts/sdc-client/README.md diff --git a/charts/sdc-client/README.md b/charts/sdc-client/README.md new file mode 100644 index 0000000..1549e4a --- /dev/null +++ b/charts/sdc-client/README.md @@ -0,0 +1,179 @@ +# SDC-Client Helm Chart + +This Helm chart deploys the SDC-Client, which creates secure tunnels between systems running SDC servers and this client. The chart enables deploying multiple independent SDC-Client instances to connect to different servers. + +## Background + +The SDC-Client connects to SDC-Server instances. The architecture works as follows: + +- **SDC-Server**: Runs on any system (Kubernetes cluster, standalone server, etc.) and generates access tokens +- **SDC-Client**: Runs on any system (Kubernetes cluster, standalone server, etc.) and connects back to servers using tokens +- Each client creates a secure tunnel, enabling communication between the systems + +This chart supports deploying multiple SDC-Client instances, each connecting to a different server with its own token. + +## Prerequisites + +Before you begin, ensure you have: + +- Kubernetes 1.16+ cluster +- Helm 3.0+ installed +- Access tokens generated from your SDC-Server instances +- Network connectivity between your client cluster and server systems + +## Installing the Chart + +To install the chart with the release name `sdc-client`: + +```bash +# Install the chart +helm install sdc-client ./sdc-client \ + --values my-values.yaml +``` + +## Uninstalling the Chart + +To uninstall/delete the deployment: + +```bash +helm uninstall sdc-client +``` + +## Architecture + +The chart creates separate deployments for each agent defined in your values file. Each deployment: + +1. Runs its own instance of the SDC-Client container +2. Uses a dedicated ConfigMap containing the unique token for its server connection +3. Can have custom placement rules through nodeSelector, affinity, and tolerations + +This approach allows you to establish multiple secure tunnels from a single Kubernetes cluster to different target servers. + +## Configuration + +### Key Parameters + +| Parameter | Description | Default | +|-----------|-------------|---------| +| `image.repository` | SDC-Client image repository | `radiantone/sdc-client` | +| `image.tag` | Image tag (version) | Chart appVersion | +| `image.pullPolicy` | Image pull policy | `Always` | +| `replicaCount` | Number of replicas per agent | `1` | +| `agents` | List of agent configurations (see below) | `[]` | + +### Agent Configuration + +The `agents` section allows you to define multiple client instances, each connecting to a different server: + +```yaml +agents: + - name: "agent1" # Unique name for this agent + token: "your-server-token-here" # Token from the SDC-Server + nodeSelector: {} # Optional node selection rules + affinity: {} # Optional affinity rules + tolerations: [] # Optional tolerations +``` + +## Detailed Configuration + +### Global Configuration + +| Parameter | Description | Default | +|-----------|-------------|---------| +| `nameOverride` | Override the name of the chart | `""` | +| `fullnameOverride` | Override the full name of the chart | `""` | +| `serviceAccount.create` | Create a service account | `false` | +| `serviceAccount.name` | Name of the service account | `""` | +| `podAnnotations` | Annotations for pods | `{}` | +| `podSecurityContext` | Security context for pods | `{}` | +| `securityContext` | Security context for containers | `{}` | +| `nodeSelector` | Default node selector for all agents | `{}` | +| `tolerations` | Default tolerations for all agents | `[]` | +| `affinity` | Default affinity rules for all agents | `{}` | +| `prometheus.enabled` | Enable Prometheus metrics | `false` | + +### Agent-Specific Configuration + +Each entry in the `agents` list can have the following parameters: + +| Parameter | Description | Default | +|-----------|-------------|---------| +| `name` | Unique name for this agent (required) | - | +| `token` | Token for connecting to the SDC-Server (required) | - | +| `nodeSelector` | Node selector for this specific agent | Global `nodeSelector` | +| `affinity` | Affinity rules for this specific agent | Global `affinity` | +| `tolerations` | Tolerations for this specific agent | Global `tolerations` | + +## Example Configuration + +```yaml +agents: + # Production server connection + - name: "production" + token: "prod-token-123" + + # Staging server connection + - name: "staging" + token: "staging-token-456" + + # Development server connection with node selection + - name: "development" + token: "dev-token-789" + nodeSelector: + environment: development +``` + +## How It Works + +When you deploy this chart: + +1. For each entry in the `agents` list, the chart creates: + - A dedicated Deployment with the specified name + - A ConfigMap containing the token for that agent + +2. Each SDC-Client instance: + - Connects to its designated server using the provided token + - Establishes a secure tunnel between the client cluster and server system + - Operates independently from other agents + +3. The overall architecture enables: + - Multiple tunnels from a single Kubernetes cluster + - Independent configuration for each tunnel + - Isolated failure domains (if one tunnel fails, others continue to operate) + +## Minimal values.yaml file + +```yaml +# Minimal values.yaml for SDC-Client Helm chart + +image: + repository: radiantone/sdc-client + pullPolicy: Always + # tag: "1.0.0" # Uncomment to override the default tag (Chart.appVersion) + +# Define your SDC-Client agents here +agents: + - name: "agent1" + token: "your-sdc-server-token-here" + +# Basic configurations - all are optional and can be removed if defaults are acceptable +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + create: false + name: "" + +# Pod configurations - all are optional +podAnnotations: {} +podSecurityContext: {} +securityContext: {} +nodeSelector: {} +tolerations: [] +affinity: {} +``` + +## Maintainers + +This chart is maintained by: +- pgodey (pgodey@radiantlogic.com) From 313bfbeb39fad3772b442d3f31b5b91a39750b8d Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:32:34 -0500 Subject: [PATCH 139/178] Update README.md --- charts/sdc-client/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/sdc-client/README.md b/charts/sdc-client/README.md index 1549e4a..1bfed01 100644 --- a/charts/sdc-client/README.md +++ b/charts/sdc-client/README.md @@ -139,7 +139,6 @@ When you deploy this chart: 3. The overall architecture enables: - Multiple tunnels from a single Kubernetes cluster - Independent configuration for each tunnel - - Isolated failure domains (if one tunnel fails, others continue to operate) ## Minimal values.yaml file From 94405fcb9d55be77481a9ccb3306f15cf8c62b59 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:33:52 -0500 Subject: [PATCH 140/178] Update Chart.yaml --- charts/sdc-client/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc-client/Chart.yaml b/charts/sdc-client/Chart.yaml index 56f8594..b5502c5 100644 --- a/charts/sdc-client/Chart.yaml +++ b/charts/sdc-client/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.0.1" maintainers: - name: pgodey From 28abbbd13e46549baba5bf95d8462f8404f7b44d Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Tue, 1 Apr 2025 16:50:16 -0500 Subject: [PATCH 141/178] Changes Removed dependency for token on configmap. Updating the token, now updates the deployment. --- charts/sdc-client/README.md | 151 +++++++++++++++++++- charts/sdc-client/templates/configmap.yaml | 18 --- charts/sdc-client/templates/deployment.yaml | 6 +- 3 files changed, 149 insertions(+), 26 deletions(-) delete mode 100644 charts/sdc-client/templates/configmap.yaml diff --git a/charts/sdc-client/README.md b/charts/sdc-client/README.md index 1bfed01..7778cdc 100644 --- a/charts/sdc-client/README.md +++ b/charts/sdc-client/README.md @@ -7,7 +7,9 @@ This Helm chart deploys the SDC-Client, which creates secure tunnels between sys The SDC-Client connects to SDC-Server instances. The architecture works as follows: - **SDC-Server**: Runs on any system (Kubernetes cluster, standalone server, etc.) and generates access tokens + - **SDC-Client**: Runs on any system (Kubernetes cluster, standalone server, etc.) and connects back to servers using tokens + - Each client creates a secure tunnel, enabling communication between the systems This chart supports deploying multiple SDC-Client instances, each connecting to a different server with its own token. @@ -17,10 +19,15 @@ This chart supports deploying multiple SDC-Client instances, each connecting to Before you begin, ensure you have: - Kubernetes 1.16+ cluster + - Helm 3.0+ installed + - Access tokens generated from your SDC-Server instances + - Network connectivity between your client cluster and server systems +- Sufficient resources in your cluster for the SDC-Client pods + ## Installing the Chart To install the chart with the release name `sdc-client`: @@ -31,6 +38,30 @@ helm install sdc-client ./sdc-client \ --values my-values.yaml ``` +### Installation Examples + +1. Basic installation with a single agent: + +```bash +helm install sdc-client ./sdc-client \ + --set agents[0].name=agent1 \ + --set agents[0].token=your-token-here +``` + +2. Installation with multiple agents and custom resources: + +```bash +helm install sdc-client ./sdc-client \ + --set agents[0].name=prod-agent \ + --set agents[0].token=prod-token \ + --set agents[0].resources.limits.cpu=500m \ + --set agents[0].resources.limits.memory=512Mi \ + --set agents[1].name=staging-agent \ + --set agents[1].token=staging-token \ + --set agents[1].resources.limits.cpu=200m \ + --set agents[1].resources.limits.memory=256Mi +``` + ## Uninstalling the Chart To uninstall/delete the deployment: @@ -44,7 +75,9 @@ helm uninstall sdc-client The chart creates separate deployments for each agent defined in your values file. Each deployment: 1. Runs its own instance of the SDC-Client container + 2. Uses a dedicated ConfigMap containing the unique token for its server connection + 3. Can have custom placement rules through nodeSelector, affinity, and tolerations This approach allows you to establish multiple secure tunnels from a single Kubernetes cluster to different target servers. @@ -103,24 +136,78 @@ Each entry in the `agents` list can have the following parameters: | `nodeSelector` | Node selector for this specific agent | Global `nodeSelector` | | `affinity` | Affinity rules for this specific agent | Global `affinity` | | `tolerations` | Tolerations for this specific agent | Global `tolerations` | +| `resources` | Resource limits and requests for this agent | Global `resources` | + +## Example Configurations + +### Basic Configuration + +```yaml +agents: + - name: "agent1" + token: "your-sdc-server-token-here" +``` + +### Production Configuration with Resource Limits + +```yaml +image: + repository: radiantone/sdc-client + tag: "latest" + pullPolicy: Always + +resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 200m + memory: 256Mi + +agents: + - name: "production" + token: "prod-token-123" + resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 500m + memory: 512Mi + nodeSelector: + environment: production +``` -## Example Configuration +### Multi-Environment Setup ```yaml agents: - # Production server connection - name: "production" token: "prod-token-123" + nodeSelector: + environment: production + resources: + limits: + cpu: 1000m + memory: 1Gi - # Staging server connection - name: "staging" token: "staging-token-456" + nodeSelector: + environment: staging + resources: + limits: + cpu: 500m + memory: 512Mi - # Development server connection with node selection - name: "development" token: "dev-token-789" nodeSelector: environment: development + resources: + limits: + cpu: 200m + memory: 256Mi ``` ## How It Works @@ -128,18 +215,71 @@ agents: When you deploy this chart: 1. For each entry in the `agents` list, the chart creates: + - A dedicated Deployment with the specified name + - A ConfigMap containing the token for that agent 2. Each SDC-Client instance: + - Connects to its designated server using the provided token + - Establishes a secure tunnel between the client cluster and server system + - Operates independently from other agents 3. The overall architecture enables: + - Multiple tunnels from a single Kubernetes cluster + - Independent configuration for each tunnel +## Troubleshooting + +### Common Issues and Solutions + +1. **Pod Fails to Start** + - Check pod logs: `kubectl logs -f deployment/sdc-client-agent1` + - Verify token is valid and properly formatted + - Ensure network connectivity to SDC-Server + - Check resource limits and requests + +2. **Connection Issues** + - Verify SDC-Server is running and accessible + - Check network policies and firewall rules + - Validate token permissions + - Ensure DNS resolution works correctly + +3. **Resource Constraints** + - Monitor pod resource usage: `kubectl top pod -l app.kubernetes.io/name=sdc-client` + - Adjust resource limits if needed + - Check node capacity: `kubectl describe nodes` + +4. **Token Issues** + - Verify token format and validity + - Check token expiration + - Ensure token has correct permissions + - Validate token in ConfigMap: `kubectl get configmap sdc-client-agent1 -o yaml` + +### Debugging Commands + +```bash +# Check pod status +kubectl get pods -l app.kubernetes.io/name=sdc-client + +# View pod logs +kubectl logs -f deployment/sdc-client-agent1 + +# Check pod events +kubectl describe pod -l app.kubernetes.io/name=sdc-client + +# Verify ConfigMap contents +kubectl get configmap -l app.kubernetes.io/name=sdc-client + +# Check service account and permissions +kubectl get serviceaccount -l app.kubernetes.io/name=sdc-client +``` + ## Minimal values.yaml file ```yaml @@ -175,4 +315,5 @@ affinity: {} ## Maintainers This chart is maintained by: -- pgodey (pgodey@radiantlogic.com) + +- pgodey () diff --git a/charts/sdc-client/templates/configmap.yaml b/charts/sdc-client/templates/configmap.yaml deleted file mode 100644 index a14912d..0000000 --- a/charts/sdc-client/templates/configmap.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.agents }} -# Create ConfigMaps for each agent -{{- range .Values.agents }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }}-env - labels: - app: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }} - chart: "{{ template "agent.chart" $ }}" - release: "{{ $.Release.Name }}" - heritage: "{{ $.Release.Service }}" - agent-name: {{ .name }} -data: - ServerHubConfiguration__AgentToken: {{ .token | quote }} -{{- end }} -{{- end }} diff --git a/charts/sdc-client/templates/deployment.yaml b/charts/sdc-client/templates/deployment.yaml index f4494fe..68f6470 100644 --- a/charts/sdc-client/templates/deployment.yaml +++ b/charts/sdc-client/templates/deployment.yaml @@ -41,9 +41,9 @@ spec: - name: http containerPort: 80 protocol: TCP - envFrom: - - configMapRef: - name: {{ include "agent.fullname.agent" (dict "root" $ "agentName" .name) }}-env + env: + - name: ServerHubConfiguration__AgentToken + value: {{ .token | quote }} resources: {{- if .resources }} {{- toYaml .resources | nindent 12 }} From c29745f3749c76e84c80692a84065d1ba0122974 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 15 Apr 2025 11:12:49 +0200 Subject: [PATCH 142/178] Update sdc version to 1.2.1 --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index cd0ad4b..27172d2 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.0 +version: 1.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.0" +appVersion: "1.2.1" maintainers: - name: pgodey From de815fd271139ae2c47d778f9ee241f433a58df0 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 24 Apr 2025 23:06:17 +0200 Subject: [PATCH 143/178] EOC 1.3.1 helm release --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index b7c1c8f..57b1514 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.1-rc.1 +version: 1.3.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.1-rc.1" +appVersion: "1.3.1" maintainers: - name: pgodey From c9e52375a2842d30f14b22cbb91233141e772342 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Thu, 24 Apr 2025 14:31:18 -0700 Subject: [PATCH 144/178] update some default values --- charts/eoc/values.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 9bae77d..52397ea 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -27,7 +27,7 @@ applications: fid: minVersion: "8.0.0" minVersionUpdate: "8.0.0" - nodeLimitUpdate: 0 + nodeLimit: 0 logsConfig: connector: enabled: true @@ -107,7 +107,7 @@ applications: nodeLimit: 0 ido: enabled: false - nodeLimit: 10 + nodeLimit: 0 minVersion: "1.0.0" minVersionUpdate: "1.0.0" features: @@ -228,7 +228,7 @@ backend: # should have enough permission to be able to create a service account username: admin password: xxxx - metricsPrefixes: ldap_,process_,push_,fid_,ia_ + metricsPrefixes: ldap_,process_,push_,fid_,ia_,sdc_,agent_ basicAuth: "" agents: api: @@ -248,7 +248,7 @@ backend: accessKeySecret: "" s3Region: "us-east-2" s3BucketName: "radiant-one-v8-sdc-distribution" - version: "1.0.0" + version: "1.2.1" image: repository: radiantone/eoc-backend pullPolicy: Always @@ -391,14 +391,14 @@ backend: cpu: 4 fid: persistence: - size: 200Gi + size: 500Gi resources: limits: - cpu: 4 - memory: 16Gi + cpu: 8 + memory: 32Gi requests: - cpu: 4 - memory: 16Gi + cpu: 6 + memory: 24Gi serviceStatusConfig: [] # - name: eoc # enabled: true From 567e517cdfd92f23bea700ee3f50791de1848df6 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Fri, 23 May 2025 16:04:21 +0200 Subject: [PATCH 145/178] Update eoc version to 1.3.2-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 57b1514..31d274d 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.1 +version: 1.3.2-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.1" +appVersion: "1.3.2-rc.1" maintainers: - name: pgodey From 15c22e701ca6a1f3e5b30fc86afbd2c88d8d00ba Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 28 May 2025 18:52:22 +0200 Subject: [PATCH 146/178] Release EOC 1.3.2 helm-chart --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 31d274d..0c44778 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.2-rc.1 +version: 1.3.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.2-rc.1" +appVersion: "1.3.2" maintainers: - name: pgodey From 3ed56978caa5cda685d653f1d472fb6fcd03ef57 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 1 Jul 2025 17:12:47 +0200 Subject: [PATCH 147/178] Add new values for promotion pipeline feature --- charts/eoc/templates/orchestrator_configmap.yaml | 2 ++ charts/eoc/templates/ui_configmap.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index 87562dc..b6ed898 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -19,6 +19,8 @@ data: REDIS_HOST: {{ .Values.orchestrator.redis.host | quote }} REDIS_PORT: {{ .Values.orchestrator.redis.port | quote }} ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} + APP_GIT_PRIVATE_KEY: {{ .Values.orchestrator.app.git.privateKey | quote }} + APP_GIT_REPO: {{ .Values.orchestrator.app.git.repo | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} {{- range $key, $value := (.Values.orchestrator).env }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index a3f2e91..2d1e998 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -23,6 +23,7 @@ data: VITE_TASK_MANAGEMENT_LOGS_ENABLED: {{ .Values.ui.taskManagementLogsEnabled | default false | quote }} VITE_TASK_MANAGEMENT_RE_RUN_ENABLED: {{ .Values.ui.taskManagementReRunEnabled | default false | quote }} VITE_TASK_MANAGEMENT_CANCEL_ENABLED: {{ .Values.ui.taskManagementCancelEnabled | default false | quote }} + VITE_PROMOTION_PIPELINES_ENABLED: {{ .Values.ui.promotionPipelinesEnabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From 99ed3235ff773db9ea23a6107d62576df2f753e4 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 1 Jul 2025 17:13:00 +0200 Subject: [PATCH 148/178] Update chart version --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 0c44778..ea8ea49 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.2 +version: 1.4.0-beta.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.3.2" +appVersion: "1.4.0-beta.1" maintainers: - name: pgodey From 8aafab51bef6e7a95f12ef1cdd71174e2a9d643f Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 2 Jul 2025 15:13:22 +0200 Subject: [PATCH 149/178] Update values --- charts/eoc/templates/orchestrator_configmap.yaml | 4 ++-- charts/eoc/templates/ui_configmap.yaml | 2 +- charts/eoc/values.yaml | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index b6ed898..6bf0904 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -19,8 +19,8 @@ data: REDIS_HOST: {{ .Values.orchestrator.redis.host | quote }} REDIS_PORT: {{ .Values.orchestrator.redis.port | quote }} ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }} - APP_GIT_PRIVATE_KEY: {{ .Values.orchestrator.app.git.privateKey | quote }} - APP_GIT_REPO: {{ .Values.orchestrator.app.git.repo | quote }} + APP_GIT_REPO: {{ .Values.applications.fid.pipelineConfig.git.repo | quote }} + APP_GIT_PRIVATE_KEY: {{ .Values.applications.fid.pipelineConfig.git.privateKey | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} {{- range $key, $value := (.Values.orchestrator).env }} diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 2d1e998..98d5600 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -23,7 +23,7 @@ data: VITE_TASK_MANAGEMENT_LOGS_ENABLED: {{ .Values.ui.taskManagementLogsEnabled | default false | quote }} VITE_TASK_MANAGEMENT_RE_RUN_ENABLED: {{ .Values.ui.taskManagementReRunEnabled | default false | quote }} VITE_TASK_MANAGEMENT_CANCEL_ENABLED: {{ .Values.ui.taskManagementCancelEnabled | default false | quote }} - VITE_PROMOTION_PIPELINES_ENABLED: {{ .Values.ui.promotionPipelinesEnabled | default false | quote }} + VITE_PROMOTION_PIPELINES_ENABLED: {{ .Values.eoc.pipeline.enabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 52397ea..87d099b 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -28,6 +28,14 @@ applications: minVersion: "8.0.0" minVersionUpdate: "8.0.0" nodeLimit: 0 + pipelineConfig: + # git config for promotion pipeline feature + git: + repo: "" + privateKey: | + -----BEGIN OPENSSH PRIVATE KEY----- + {private key needs to be multi-line and indented by 8} + -----END OPENSSH PRIVATE KEY----- logsConfig: connector: enabled: true @@ -114,6 +122,9 @@ features: mfa: enabled: false appName: "Radiant Logic EOC" + pipeline: + enabled: false + appName: "Promotion pipelines feature" ui: basePath: /eoc From 5f8f35cd3a3b1ea07398a6725ff38fd43b8786fc Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 2 Jul 2025 15:16:57 +0200 Subject: [PATCH 150/178] Fix values --- charts/eoc/templates/ui_configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/templates/ui_configmap.yaml b/charts/eoc/templates/ui_configmap.yaml index 98d5600..901b96b 100644 --- a/charts/eoc/templates/ui_configmap.yaml +++ b/charts/eoc/templates/ui_configmap.yaml @@ -23,7 +23,7 @@ data: VITE_TASK_MANAGEMENT_LOGS_ENABLED: {{ .Values.ui.taskManagementLogsEnabled | default false | quote }} VITE_TASK_MANAGEMENT_RE_RUN_ENABLED: {{ .Values.ui.taskManagementReRunEnabled | default false | quote }} VITE_TASK_MANAGEMENT_CANCEL_ENABLED: {{ .Values.ui.taskManagementCancelEnabled | default false | quote }} - VITE_PROMOTION_PIPELINES_ENABLED: {{ .Values.eoc.pipeline.enabled | default false | quote }} + VITE_PROMOTION_PIPELINES_ENABLED: {{ .Values.features.pipeline.enabled | default false | quote }} {{- range $key, $value := (.Values.ui).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From c79f26678d537a4c1e01448f3dc548121572ee9d Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 2 Jul 2025 15:22:32 +0200 Subject: [PATCH 151/178] remove trailing spaces --- charts/eoc/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 87d099b..7bbc2bc 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -124,7 +124,7 @@ features: appName: "Radiant Logic EOC" pipeline: enabled: false - appName: "Promotion pipelines feature" + appName: "Promotion pipelines feature" ui: basePath: /eoc From eed8e9d73e92a41638211122b97f423178408469 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Fri, 11 Jul 2025 16:02:47 +0200 Subject: [PATCH 152/178] Update eoc chart version to 1.4.0-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index ea8ea49..5fe1123 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.0-beta.1 +version: 1.4.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.0-beta.1" +appVersion: "1.4.0-rc.1" maintainers: - name: pgodey From 7541546fbfec7aa9a119b009b080e003d53ea814 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 21 Jul 2025 11:46:01 +0200 Subject: [PATCH 153/178] Update eoc chart version to 1.4.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 5fe1123..9a2fc26 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.0-rc.1 +version: 1.4.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.0-rc.1" +appVersion: "1.4.0" maintainers: - name: pgodey From 4b6772071c389d9f6b042da47960b5de64826eca Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Thu, 21 Aug 2025 22:59:38 +0200 Subject: [PATCH 154/178] Update eoc chart version to 1.4.1-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 9a2fc26..e018564 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.0 +version: 1.4.1-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.0" +appVersion: "1.4.1-rc.1" maintainers: - name: pgodey From 07139beae5b04bc0213ee1946e0248a624454093 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Sat, 23 Aug 2025 01:45:38 +0200 Subject: [PATCH 155/178] Remove es-index from defaultLogAggregator --- charts/eoc/Chart.yaml | 4 ++-- charts/eoc/values.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index e018564..2e88d44 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.1-rc.1 +version: 1.4.1-rc.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.1-rc.1" +appVersion: "1.4.1-rc.2" maintainers: - name: pgodey diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 7bbc2bc..04023b9 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -427,7 +427,6 @@ backend: type: "elasticsearch" host: "elasticsearch-master" port: "9200" - index_prefix: "es-index" scheduledMaintenanceConfig: {} # name: uptime-kuma # baseUrl: 'http://uptime-kuma.duploservices-ensemble-svc.svc.cluster.local:8000' From 24d7ac40286fc71f219935fe8d3e17b701c78323 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 3 Sep 2025 17:49:43 +0200 Subject: [PATCH 156/178] Set EOC chart version to 1.4.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 2e88d44..d966469 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.1-rc.2 +version: 1.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.1-rc.2" +appVersion: "1.4.1" maintainers: - name: pgodey From 1a0db3e138b98f926ae7f841db8df889b260e842 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Tue, 9 Sep 2025 11:14:57 +0200 Subject: [PATCH 157/178] Update EOC chart version to 1.5.0-beta.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index d966469..0aed060 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.1 +version: 1.5.0-beta.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.1" +appVersion: "1.5.0-beta.1" maintainers: - name: pgodey From cd7a83a3c6a5fc9b8f2bc8bab9a7906ad16610f2 Mon Sep 17 00:00:00 2001 From: Freddy May Date: Mon, 15 Sep 2025 09:56:13 +0200 Subject: [PATCH 158/178] Override the repository used by all the images in the postgresql bitnami chart --- charts/eoc/values.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 04023b9..8427cc3 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -520,6 +520,22 @@ redis: postgresql: enabled: false fullnameOverride: postgresql + image: + registry: docker.io + repository: radiantone/postgresql + tag: 15.1.0-debian-11-r7 + volumePermissions: + enabled: false + image: + registry: docker.io + repository: radiantone/bitnami-shell + tag: 11-debian-11-r57 + metrics: + enabled: false + image: + registry: docker.io + repository: radiantone/postgres-exporter + tag: 0.11.1-debian-11-r34 primary: nodeSelector: {} # tenantname: duploservices-ensemble-svc From 4506317a667fe08b4588ba0f736e6eb74340abac Mon Sep 17 00:00:00 2001 From: Freddy May Date: Mon, 15 Sep 2025 11:15:05 +0200 Subject: [PATCH 159/178] Override the repository used by all the images in the redis bitnami chart --- charts/eoc/values.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/charts/eoc/values.yaml b/charts/eoc/values.yaml index 8427cc3..998ed0f 100644 --- a/charts/eoc/values.yaml +++ b/charts/eoc/values.yaml @@ -500,6 +500,34 @@ orchestrator: redis: enabled: true fullnameOverride: redis + image: + registry: docker.io + repository: radiantone/redis + tag: 7.0.6-debian-11-r0 + sentinel: + enabled: false + image: + registry: docker.io + repository: radiantone/redis-sentinel + tag: 7.0.5-debian-11-r26 + metrics: + enabled: false + image: + registry: docker.io + repository: radiantone/redis-exporter + tag: 1.45.0-debian-11-r14 + volumePermissions: + enabled: false + image: + registry: docker.io + repository: radiantone/bitnami-shell + tag: 11-debian-11-r60 + sysctl: + enabled: false + image: + registry: docker.io + repository: radiantone/bitnami-shell + tag: 11-debian-11-r60 architecture: standalone auth: ## @param auth.enabled Enable password authentication From a7760b1896ca0167c16afc33f5e081b63b37e40e Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 15 Sep 2025 16:21:22 +0200 Subject: [PATCH 160/178] Update chart version to 1.5.0-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 0aed060..940c539 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.0-beta.1 +version: 1.5.0-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.0-beta.1" +appVersion: "1.5.0-rc.1" maintainers: - name: pgodey From dad403c552da989a9218ced8eb9e984f55739ec4 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 15 Sep 2025 18:48:05 +0200 Subject: [PATCH 161/178] Add GRAFANA_BASIC_AUTH for report generation --- charts/eoc/templates/orchestrator_configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index 6bf0904..c1ec756 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -23,6 +23,7 @@ data: APP_GIT_PRIVATE_KEY: {{ .Values.applications.fid.pipelineConfig.git.privateKey | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} + GRAFANA_BASIC_AUTH: {{ .Values.backend.grafana.basicAuth | default "" | quote }} {{- range $key, $value := (.Values.orchestrator).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From afc7ac3ec71abc82ba323e6da6d3ae18c26df6de Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Wed, 17 Sep 2025 18:39:12 +0200 Subject: [PATCH 162/178] Revert "Add GRAFANA_BASIC_AUTH for report generation" This reverts commit dad403c552da989a9218ced8eb9e984f55739ec4. --- charts/eoc/templates/orchestrator_configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/eoc/templates/orchestrator_configmap.yaml b/charts/eoc/templates/orchestrator_configmap.yaml index c1ec756..6bf0904 100644 --- a/charts/eoc/templates/orchestrator_configmap.yaml +++ b/charts/eoc/templates/orchestrator_configmap.yaml @@ -23,7 +23,6 @@ data: APP_GIT_PRIVATE_KEY: {{ .Values.applications.fid.pipelineConfig.git.privateKey | quote }} DUPLO_SERVICES_NAMESPACE: {{ .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }} ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }} - GRAFANA_BASIC_AUTH: {{ .Values.backend.grafana.basicAuth | default "" | quote }} {{- range $key, $value := (.Values.orchestrator).env }} {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }} {{- end }} From bef317ba0dbbc8f31779421aceaf74f47c4b24ae Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Mon, 29 Sep 2025 09:34:39 -0700 Subject: [PATCH 163/178] hot-fix bitnami image --- charts/sdc/templates/hooks/post-upgrade-hook.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sdc/templates/hooks/post-upgrade-hook.yaml b/charts/sdc/templates/hooks/post-upgrade-hook.yaml index 24d8ed9..724d326 100644 --- a/charts/sdc/templates/hooks/post-upgrade-hook.yaml +++ b/charts/sdc/templates/hooks/post-upgrade-hook.yaml @@ -21,7 +21,7 @@ spec: restartPolicy: Never containers: - name: post-upgrade-job - image: bitnami/kubectl:latest + image: radiantone/kubectl:latest command: - sh - -c From 3c8c89aa1a306ff5594b13113e1d9fea584ce29b Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 6 Oct 2025 17:08:10 +0200 Subject: [PATCH 164/178] Update EOC version to 1.5.0 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 940c539..f119041 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.0-rc.1 +version: 1.5.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.0-rc.1" +appVersion: "1.5.0" maintainers: - name: pgodey From 09224558653e65efbd67dadfbd4d83ddaa5a1459 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 08:48:30 -0600 Subject: [PATCH 165/178] Update chart.yaml Update the chart and app version to 1.2.2 to support the latest SDC 1.2.2 --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 27172d2..e517f06 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.1 +version: 1.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.1" +appVersion: "1.2.2" maintainers: - name: pgodey From 8f91f3f62075c09b5879d03135c23d9fc7155a35 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 09:30:07 -0600 Subject: [PATCH 166/178] Update PostgreSQL dependency to resolve image pull failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated PostgreSQL chart version from 12.1.3 to 17.0.1 to fix the ImagePullBackOff error in GitHub Actions. The previous version referenced a deprecated PostgreSQL image (15.1.0-debian-11-r7) that is no longer available in Bitnami's registry. Changes: - PostgreSQL chart: 12.1.3 → 17.0.1 - This resolves the "docker.io/bitnami/postgresql:15.1.0-debian-11-r7: not found" error - Ensures compatibility with current Bitnami image registry --- charts/sdc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index e517f06..2279a42 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -30,7 +30,7 @@ maintainers: dependencies: - name: postgresql - version: 12.1.3 + version: 17.0.1 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: cert-manager From 4d5b46438ae9711c608818ddc4bcc5f71c1e33f0 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 09:34:34 -0600 Subject: [PATCH 167/178] Fix PostgreSQL chart version to use available release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated PostgreSQL chart version from 17.0.1 to 16.7.27. The version 17.0.1 is not available in the Bitnami Helm repository, causing the GitHub Actions workflow to fail with "can't get a valid version". Changes: - PostgreSQL chart: 17.0.1 → 16.7.27 - This version uses PostgreSQL 17.6.0 (app version) - Provides a conservative upgrade path from 15.1.0 → 17.6.0 - Resolves the chart dependency resolution error --- charts/sdc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 2279a42..2d3145b 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -30,7 +30,7 @@ maintainers: dependencies: - name: postgresql - version: 17.0.1 + version: 16.7.27 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: cert-manager From 87c714e22e08645c755e234dc5cb7bc27b783ab4 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 09:54:21 -0600 Subject: [PATCH 168/178] Add Helm chart improvements and PostgreSQL configuration This commit implements several improvements to enhance the SDC Helm chart: 1. PostgreSQL Configuration: - Configure chart to use radiantone/postgresql:16.3.0 image - Updated README to reflect PostgreSQL chart version 16.7.27 - Provides controlled upgrade path from PostgreSQL 15.1.0 to 16.3.0 2. Added .helmignore file: - Excludes unnecessary files from chart packaging - Reduces chart size and improves deployment efficiency - Follows Helm best practices for production charts 3. Upgraded HPA API version: - Updated from deprecated autoscaling/v2beta1 to autoscaling/v2 - Modified metrics format to match v2 API specification - Ensures compatibility with Kubernetes 1.23+ 4. Enhanced Resource Configuration: - Added recommended production resource limits (commented) - Provides guidance: 250m/512Mi requests, 500m/1Gi limits - Maintains flexibility for different environments These changes improve chart maintainability, Kubernetes compatibility, and provide better production-ready defaults while preserving backward compatibility. --- charts/sdc/.helmignore | 17 +++++++++++++++++ charts/sdc/README.md | 2 +- charts/sdc/templates/hpa.yaml | 10 +++++++--- charts/sdc/values.yaml | 13 +++++++++---- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/charts/sdc/.helmignore b/charts/sdc/.helmignore index 0e8a0eb..ed86c11 100644 --- a/charts/sdc/.helmignore +++ b/charts/sdc/.helmignore @@ -21,3 +21,20 @@ .idea/ *.tmproj .vscode/ +# Documentation and sample files +*.md +!README.md +!CHANGELOG.md +values-sample.yaml +# CI/CD files +.github/ +.gitlab-ci.yml +.travis.yml +# Test files +*_test.yaml +*_test.yml +test/ +tests/ +# Helm specific +requirements.lock +Chart.lock.bak diff --git a/charts/sdc/README.md b/charts/sdc/README.md index a25d5e2..f0104dc 100644 --- a/charts/sdc/README.md +++ b/charts/sdc/README.md @@ -137,7 +137,7 @@ hooks: | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | 12.1.3 | +| https://charts.bitnami.com/bitnami | postgresql | 16.7.27 | | https://charts.jetstack.io | cert-manager | 1.11.0 | | https://helm.runix.net | pgadmin4 | 1.13.8 | | oci://ghcr.io/openfaasltd | inlets(inlets-uplink-provider) | 0.2.9 | diff --git a/charts/sdc/templates/hpa.yaml b/charts/sdc/templates/hpa.yaml index 22ae57b..20a9ed7 100644 --- a/charts/sdc/templates/hpa.yaml +++ b/charts/sdc/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "agent.fullname" . }} @@ -17,12 +17,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} diff --git a/charts/sdc/values.yaml b/charts/sdc/values.yaml index f091c50..15e856b 100644 --- a/charts/sdc/values.yaml +++ b/charts/sdc/values.yaml @@ -74,12 +74,13 @@ resources: {} # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # Recommended values for production: # limits: - # cpu: 100m - # memory: 128Mi + # cpu: 500m + # memory: 1Gi # requests: - # cpu: 100m - # memory: 128Mi + # cpu: 250m + # memory: 512Mi autoscaling: enabled: false @@ -207,6 +208,10 @@ cert-manager: postgresql: enabled: false fullnameOverride: postgresql + image: + registry: docker.io + repository: radiantone/postgresql + tag: 16.3.0 primary: nodeSelector: {} # tenantname: xxxx From ce1023ac178446c46ba620ded415e83a595b54b9 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 09:55:00 -0600 Subject: [PATCH 169/178] Document PostgreSQL version details in README Added comprehensive PostgreSQL version information: - Chart version: 16.7.27 - Image: radiantone/postgresql:16.3.0 - PostgreSQL version: 16.3.0 This provides clear documentation of the PostgreSQL configuration for users deploying the SDC chart. --- charts/sdc/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/sdc/README.md b/charts/sdc/README.md index f0104dc..1982325 100644 --- a/charts/sdc/README.md +++ b/charts/sdc/README.md @@ -23,9 +23,12 @@ Additionally CERT-MANAGER, POSTGRES and PGADMIN can also be deployed as dependen - cert-manager adds certificates and certificate issuers as resource types in Kubernetes clusters, and simplifies the process of obtaining, renewing and using those certificates. - It will ensure certificates are valid and up to date, and attempt to renew certificates at a configured time before expiry. -3. Posgresql +3. PostgreSQL - PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance +- **Chart Version:** 16.7.27 (Bitnami PostgreSQL Helm chart) +- **Image:** radiantone/postgresql:16.3.0 +- **PostgreSQL Version:** 16.3.0 4. PGAdmin From 7393879c5f9193727aa681822432d33b656e087f Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 09:57:55 -0600 Subject: [PATCH 170/178] Fix PostgreSQL chart version compatibility Changed PostgreSQL Helm chart version from 16.7.27 to 15.5.20 to match the radiantone/postgresql:16.3.0 image. Issue: - Chart version 16.7.27 expects PostgreSQL 17.6.0 - Our image contains PostgreSQL 16.3.0 - This mismatch could cause initialization and health check failures Resolution: - Chart version 15.5.20 is designed for PostgreSQL 16.3.0 - Ensures full compatibility between chart templates and image - Updated both Chart.yaml and README.md documentation Compatibility Matrix: - Chart: 15.5.20 (Bitnami) - Image: radiantone/postgresql:16.3.0 - PostgreSQL: 16.3.0 --- charts/sdc/Chart.yaml | 2 +- charts/sdc/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 2d3145b..18f87ae 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -30,7 +30,7 @@ maintainers: dependencies: - name: postgresql - version: 16.7.27 + version: 15.5.20 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: cert-manager diff --git a/charts/sdc/README.md b/charts/sdc/README.md index 1982325..0fed04d 100644 --- a/charts/sdc/README.md +++ b/charts/sdc/README.md @@ -26,7 +26,7 @@ Additionally CERT-MANAGER, POSTGRES and PGADMIN can also be deployed as dependen 3. PostgreSQL - PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance -- **Chart Version:** 16.7.27 (Bitnami PostgreSQL Helm chart) +- **Chart Version:** 15.5.20 (Bitnami PostgreSQL Helm chart) - **Image:** radiantone/postgresql:16.3.0 - **PostgreSQL Version:** 16.3.0 @@ -140,7 +140,7 @@ hooks: | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | 16.7.27 | +| https://charts.bitnami.com/bitnami | postgresql | 15.5.20 | | https://charts.jetstack.io | cert-manager | 1.11.0 | | https://helm.runix.net | pgadmin4 | 1.13.8 | | oci://ghcr.io/openfaasltd | inlets(inlets-uplink-provider) | 0.2.9 | From 74adb3a9377b7ce06d562868f4947513cde10937 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 10:06:29 -0600 Subject: [PATCH 171/178] Revert to production-tested PostgreSQL configuration Reverted to the original PostgreSQL configuration that has been proven stable in production environments: PostgreSQL Configuration: - Chart version: 12.1.3 (Bitnami PostgreSQL Helm chart) - Image: radiantone/postgresql:15.1.0-debian-11-r7 - PostgreSQL version: 15.1.0 This configuration matches what is currently deployed and working in production (running for 2+ years without issues). Changes: - Chart.yaml: postgresql dependency version 12.1.3 - values.yaml: image tag 15.1.0-debian-11-r7 - README.md: updated documentation to reflect correct versions --- charts/sdc/Chart.yaml | 2 +- charts/sdc/README.md | 8 ++++---- charts/sdc/values.yaml | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index 18f87ae..e517f06 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -30,7 +30,7 @@ maintainers: dependencies: - name: postgresql - version: 15.5.20 + version: 12.1.3 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: cert-manager diff --git a/charts/sdc/README.md b/charts/sdc/README.md index 0fed04d..e440a21 100644 --- a/charts/sdc/README.md +++ b/charts/sdc/README.md @@ -26,9 +26,9 @@ Additionally CERT-MANAGER, POSTGRES and PGADMIN can also be deployed as dependen 3. PostgreSQL - PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance -- **Chart Version:** 15.5.20 (Bitnami PostgreSQL Helm chart) -- **Image:** radiantone/postgresql:16.3.0 -- **PostgreSQL Version:** 16.3.0 +- **Chart Version:** 12.1.3 (Bitnami PostgreSQL Helm chart) +- **Image:** radiantone/postgresql:15.1.0-debian-11-r7 +- **PostgreSQL Version:** 15.1.0 4. PGAdmin @@ -140,7 +140,7 @@ hooks: | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | 15.5.20 | +| https://charts.bitnami.com/bitnami | postgresql | 12.1.3 | | https://charts.jetstack.io | cert-manager | 1.11.0 | | https://helm.runix.net | pgadmin4 | 1.13.8 | | oci://ghcr.io/openfaasltd | inlets(inlets-uplink-provider) | 0.2.9 | diff --git a/charts/sdc/values.yaml b/charts/sdc/values.yaml index 15e856b..a7c3448 100644 --- a/charts/sdc/values.yaml +++ b/charts/sdc/values.yaml @@ -209,9 +209,8 @@ postgresql: enabled: false fullnameOverride: postgresql image: - registry: docker.io repository: radiantone/postgresql - tag: 16.3.0 + tag: 15.1.0-debian-11-r7 primary: nodeSelector: {} # tenantname: xxxx From e511fd32a235078eda02f30405f7ee72c06062f4 Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Wed, 5 Nov 2025 10:08:30 -0600 Subject: [PATCH 172/178] Remove .helmignore to fix helm dependency update issue The .helmignore file was causing 'Chart.yaml file is missing' errors during helm dependency update in GitHub Actions workflow. Removing this file to resolve the dependency resolution issue. --- charts/sdc/.helmignore | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 charts/sdc/.helmignore diff --git a/charts/sdc/.helmignore b/charts/sdc/.helmignore deleted file mode 100644 index ed86c11..0000000 --- a/charts/sdc/.helmignore +++ /dev/null @@ -1,40 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -# Documentation and sample files -*.md -!README.md -!CHANGELOG.md -values-sample.yaml -# CI/CD files -.github/ -.gitlab-ci.yml -.travis.yml -# Test files -*_test.yaml -*_test.yml -test/ -tests/ -# Helm specific -requirements.lock -Chart.lock.bak From 4249153769fa50bbd2c0cc0b41feee47ff570318 Mon Sep 17 00:00:00 2001 From: pgodey <38923355+pgodey@users.noreply.github.com> Date: Sat, 20 Dec 2025 08:14:25 -0800 Subject: [PATCH 173/178] add hibernate option to sss service --- charts/sss/Chart.yaml | 2 +- charts/sss/templates/deployment.yaml | 2 +- charts/sss/values.yaml | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/sss/Chart.yaml b/charts/sss/Chart.yaml index 256c03f..7c0adfe 100644 --- a/charts/sss/Chart.yaml +++ b/charts/sss/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1 +version: 0.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sss/templates/deployment.yaml b/charts/sss/templates/deployment.yaml index ca9400e..7b64e27 100644 --- a/charts/sss/templates/deployment.yaml +++ b/charts/sss/templates/deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: {{- include "sss.labels" . | nindent 4 }} spec: - replicas: 1 + replicas: {{ ((.Values.global).hibernate | default false) | ternary 0 .Values.replicaCount }} selector: matchLabels: {{- include "sss.selectorLabels" . | nindent 6 }} diff --git a/charts/sss/values.yaml b/charts/sss/values.yaml index 9ccde8d..68be479 100644 --- a/charts/sss/values.yaml +++ b/charts/sss/values.yaml @@ -1,7 +1,12 @@ -# Default values for agent. # This is a YAML-formatted file. # Declare variables to be passed into your templates. +global: + # Hibernate the application + # Scales down pods to zero if set to true + # Default is false + hibernate: false + replicaCount: 1 image: From dd12d2a4c4f1d90a17405673881357f0350a02ab Mon Sep 17 00:00:00 2001 From: Freddy May Date: Wed, 18 Mar 2026 18:56:54 +0100 Subject: [PATCH 174/178] eoc 1.5.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index f119041..264e63c 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.0 +version: 1.5.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.0" +appVersion: "1.5.1" maintainers: - name: pgodey From d6e51546a9f03e48450c9b98d449f46380ca1e3c Mon Sep 17 00:00:00 2001 From: Gnani Rahul <89947795+gnanirahulnutakki@users.noreply.github.com> Date: Tue, 7 Apr 2026 19:04:18 -0500 Subject: [PATCH 175/178] [sdc] Bump version to 1.3.0 for new SDC server release Update chart version and appVersion to 1.3.0 to align with the new SDC server docker image: radiantone/sdc-server:1.3.0 --- charts/sdc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sdc/Chart.yaml b/charts/sdc/Chart.yaml index e517f06..7e994eb 100644 --- a/charts/sdc/Chart.yaml +++ b/charts/sdc/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.2 +version: 1.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.2.2" +appVersion: "1.3.0" maintainers: - name: pgodey From 7a2159469843005ed5dbcbd20c4381c032d23fba Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 27 Apr 2026 17:28:26 +0200 Subject: [PATCH 176/178] bump EOC chart and app version to 1.5.2-rc.1 Co-authored-by: Copilot --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 264e63c..68f247a 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.1 +version: 1.5.2-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.1" +appVersion: "1.5.2-rc.1" maintainers: - name: pgodey From 9a3091e289d5d9a7f1d825a5cda8ae9d61d099db Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Mon, 4 May 2026 17:06:06 +0200 Subject: [PATCH 177/178] bump EOC chart and app version to 1.5.2 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 68f247a..1fa38ef 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.2-rc.1 +version: 1.5.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.2-rc.1" +appVersion: "1.5.2" maintainers: - name: pgodey From 409d828a13a0892b2ff1ad8be418ccd194717af5 Mon Sep 17 00:00:00 2001 From: abdelkrim-djebbar Date: Fri, 29 May 2026 11:27:55 +0200 Subject: [PATCH 178/178] bump EOC chart and app version to 1.5.3-rc.1 --- charts/eoc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/eoc/Chart.yaml b/charts/eoc/Chart.yaml index 1fa38ef..7e8c2ec 100644 --- a/charts/eoc/Chart.yaml +++ b/charts/eoc/Chart.yaml @@ -7,13 +7,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.2 +version: 1.5.3-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.2" +appVersion: "1.5.3-rc.1" maintainers: - name: pgodey