New changes #47

keyvaann · 2020-08-27T14:25:58Z

Merge back recent updates and additions to the charts

Signed-off-by: Keyvan <keyvan@thehyve.nl>

…sed stack

…cemonitor

fixes configuration issues on gateway

Add cc schema registry proxy

- Fixed health check - Separated ManagementPortal helmfile

Misc changes for ManagementPortal database checks

Add s3 proxy

add more-promasys-sync oauth config to management-portal

Add appconfig and merge radar-kubernetes

Signed-off-by: Keyvan <keyvan@thehyve.nl>

blootsvoets

Fine in general, however some variables should be generalised to merge this into RADAR-Kubernetes

base.yaml

blootsvoets · 2020-08-31T09:42:51Z

charts/management-portal/templates/configmap.yaml

@@ -22,5 +22,6 @@ data:
    radar_rest_sources_auth_backend;res_ManagementPortal;{{ .Values.client_secrets.radar_rest_sources_backend }};PROJECT.READ,SOURCETYPE.READ,SUBJECT.READ,SOURCE.READ;client_credentials;;;43200;86400;{};
    radar_rest_sources_authorizer;res_restAuthorizer;;SOURCETYPE.READ,PROJECT.READ,SUBJECT.READ;authorization_code;https://{{ .Values.server_name }}/rest-sources/authorizer/login;;43200;86400;{};
    radar_fitbit_connector;res_restAuthorizer;{{ .Values.client_secrets.radarFitbitConnector }};SUBJECT.READ;client_credentials;;;43200;;{};
-    radar_appconfig;res_ManagementPortal;test;SOURCETYPE.READ,MEASUREMENT.CREATE,PROJECT.READ,SUBJECT.READ,OAUTHCLIENTS.READ;{{ .Values.client_secrets.radarAppconfig }};;3600;78000;;
-    radar_appconfig_frontend;res_appconfig;;SOURCETYPE.READ,MEASUREMENT.CREATE,PROJECT.READ,PROJECT.CREATE,PROJECT.UPDATE,SUBJECT.READ,SUBJECT.UPDATE,OAUTHCLIENTS.READ;authorization_code,refresh_token;https://{{ .Values.server_name }}/appconfig/login;3600;78000;;
+    more_promasys_sync_client;res_ManagementPortal;{{ .Values.client_secrets.morePromasysSync }};PROJECT.READ,PROJECT.CREATE,SUBJECT.READ,SUBJECT.CREATE;client_credentials;;;43200;;{};


Not part of radar-kubernetes

Fixed in 855e582

blootsvoets · 2020-08-31T09:44:10Z

charts/management-portal/templates/secrets-postgres-keystore.yaml

+    heritage: {{ .Release.Service | quote }}
+type: Opaque
+data:
+  root.crt: {{ .Files.Get "files/BaltimoreCyberTrustRoot.crt.pem" | b64enc | quote }}


For more general application, change this to files/root.crt.

Fixed in fbda1ed

blootsvoets · 2020-08-31T09:45:34Z

charts/management-portal/templates/deployment.yaml

@@ -47,14 +47,20 @@ spec:
          - name: SPRING_PROFILES_ACTIVE
            value: "prod,swagger"
          - name: SPRING_DATASOURCE_URL
-            value: "jdbc:postgresql://{{ .Values.postgres.host }}:5432/managementportal"
+            value: "jdbc:postgresql://{{ .Values.postgres.host }}:5432/managementportal?ssl=true&sslmode=verify-ca"


SSL configuration is not true in general. Perhaps instead of a postgres host, this should take a JDBC URL, e.g. {{ .Values.postgres.url }}.

Fixed in fbda1ed

blootsvoets · 2020-08-31T09:47:36Z

base.yaml

    radarAppconfig: secret
+  sendGrid:


We don't need a reference to sendGrid, instead smtp can be used

Wouldn't it be good to reference the configurable options in here?

Yes that’s fine, but they’re just plain old SMTP settings, just rename sendGrid to smtp.

Fixed in 71673c7

blootsvoets · 2020-08-31T09:47:51Z

base.yaml

@@ -131,7 +146,15 @@ management_portal:
    radar_upload_frontend: secret
    radar_rest_sources_backend: secret
    radarFitbitConnector: secret
+    morePromasysSync: secret


Not needed in RADAR-kubernetes

Fixed in 855e582

blootsvoets · 2020-08-31T09:50:34Z

helmfile.d/10-base.yaml

+    - ../../etc/production.yaml
+    secrets:
+    - ../../secrets/production.yaml


To streamline this, could we create a environment.yaml which contains references to these production / secrets files? This would not be committed to Git, although we can add a template. Or we need to add documentation to force all users to use these locations.

Waiting to find a way to solve or workaround roboll/helmfile#1454

Fixed in a3568f3

Signed-off-by: Keyvan <keyvan@thehyve.nl>

* dev: Use helmfile layering for more flexibility Minor fixes and improvments Added Confluent helm charts as submodule

New changes

keyvaann and others added 30 commits July 6, 2020 20:54

Added kubeContext

0267da0

Signed-off-by: Keyvan <keyvan@thehyve.nl>

commit first changes

0401d0e

working configurations

c1d4879

working ssl config (verify-ca)

ca33e59

integrate sendgrid with management portal mail service

82821b8

adapt kafka-init to optionally init radar-base for confluent cloud ba…

ee5f31c

…sed stack

correct mount path and remove unnecessary config

038b5ec

single point for confluent cloud config on base.yml

f5a935a

override schema registry url if confluent cloud is enabled.

414845f

migrate to camelcase syntax and to config format of radar-gateway:0.5.0

4c71c00

finalize configmap adaptation for gateway and optionally deploy servi…

0255f2d

…cemonitor

add back rest-proxy to helmfile

879889c

commit initial set-up for schema-registry-proxy

c7aaae9

add basic auth

c25d295

working redirect to external-host

8d5d6ac

move all annotations to single point

ffb47e4

working auth configuration

4cbb20b

fixes configuration issues on gateway

0fab95b

Merge pull request #2 from MorePlatform/fix-gateway

9f9bb9f

fixes configuration issues on gateway

Merge pull request #1 from MorePlatform/add-cc-schema-registry-proxy

c05b39e

Add cc schema registry proxy

Add radar-s3-connector combined with s3proxy to stack

b1d8687

Fix connection test

3cb2b67

Misc changes for ManagementPortal database checks

d272486

- Fixed health check - Separated ManagementPortal helmfile

Use hierarchical s3-proxy settings

851da7f

Renamed s3proxy to s3-proxy for clarity

e823624

Merge pull request #4 from MorePlatform/update-mp

636accc

Misc changes for ManagementPortal database checks

Use updated S3 values

6eb853c

Enable radar-output

8abe5eb

Disable master-slave replication in redis by default

c181d97

Merge branch 'master' into add-s3-proxy

8ccade4

blootsvoets and others added 16 commits July 23, 2020 17:05

Fixed catalog-server

7dc5456

Change confluent_cloud variable case

16dfded

Merge pull request #3 from MorePlatform/add-s3-proxy

b218365

Add s3 proxy

Working setup

769928c

Enable ssl-redirect

e3a7f29

add more-promasys-sync oauth config to management-portal

04bd2f3

Merge pull request #5 from MorePlatform/more-promasys-sync

b774460

add more-promasys-sync oauth config to management-portal

Update using relative paths

f9779bd

Merge remote-tracking branch 'radar/appconfig' into appconfig

0fb0b6c

Fix app-config deployment

66436fe

Fix app-config setup

3a88e11

Fixed appconfig resource limits

565c271

Merge pull request #6 from MorePlatform/appconfig

984e9c2

Add appconfig and merge radar-kubernetes

Set default secret for radarAppConfig

c4575e1

Minor fixes and improvments

6151585

Signed-off-by: Keyvan <keyvan@thehyve.nl>

Merged new changes

884e392

keyvaann requested review from blootsvoets and nivemaham August 27, 2020 14:25

blootsvoets reviewed Aug 31, 2020

View reviewed changes

keyvaann and others added 5 commits September 1, 2020 18:36

Removed reference to chdr

a13145d

More general configuration for management-portal

fbda1ed

Signed-off-by: Keyvan <keyvan@thehyve.nl>

Replaced sendGrid references with smtp

71673c7

Signed-off-by: Keyvan <keyvan@thehyve.nl>

Added ability to add extra oauth_clients to management-portal

855e582

Signed-off-by: Keyvan <keyvan@thehyve.nl>

Merge branch 'dev' into new-changes

a3568f3

* dev: Use helmfile layering for more flexibility Minor fixes and improvments Added Confluent helm charts as submodule

blootsvoets approved these changes Sep 2, 2020

View reviewed changes

keyvaann merged commit ec0ff2d into dev Sep 3, 2020

keyvaann deleted the new-changes branch September 3, 2020 13:14

blootsvoets pushed a commit that referenced this pull request Dec 21, 2022

Merge pull request #47 from RADAR-base/new-changes

b5201dc

New changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New changes #47

New changes #47

keyvaann commented Aug 27, 2020

blootsvoets left a comment

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

blootsvoets Sep 1, 2020

keyvaann Sep 1, 2020

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

blootsvoets Aug 31, 2020

keyvaann Sep 1, 2020

keyvaann Sep 2, 2020

New changes #47

New changes #47

Conversation

keyvaann commented Aug 27, 2020

blootsvoets left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment