From 4d276729c2a378bbd9c06f89518a7309e91fe0a4 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Thu, 27 May 2021 19:23:25 +0100 Subject: [PATCH 1/5] #167 update chart/docker image versions & helm dependencies Signed-off-by: Nigel Jones --- .../open-metadata-deployment/charts/egeria-base/Chart.yaml | 2 +- .../open-metadata-deployment/charts/egeria-base/values.yaml | 2 +- .../charts/odpi-egeria-lab/requirements.yaml | 2 +- .../charts/odpi-egeria-lab/values.yaml | 4 ++-- .../open-metadata-deployment/compose/tutorials/.env | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/Chart.yaml b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/Chart.yaml index c8b5c35efe1..892f8a0fcb6 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/Chart.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/Chart.yaml @@ -16,5 +16,5 @@ maintainers: email: nigel.l.jones+git@gmail.com dependencies: - name: kafka - version: 12.5.0 + version: 12.18.3 repository: https://charts.bitnami.com/bitnami diff --git a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml index 3a27742d401..f78efbd14fd 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml @@ -84,7 +84,7 @@ image: name: egeria presentation: name: egeria-react-ui - tag: latest + tag: 2.10.0 configure: name: egeria-configure diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/requirements.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/requirements.yaml index b221522a431..ddec835bd9f 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/requirements.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/requirements.yaml @@ -3,5 +3,5 @@ --- dependencies: - name: kafka - version: 12.4.0 + version: 12.18.3 repository: https://charts.bitnami.com/bitnami diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml index 6ba6461e5f9..897281552bc 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml @@ -59,14 +59,14 @@ image: name: egeria presentation: name: egeria-react-ui - tag: latest + tag: 2.10.0 configure: name: egeria-configure jupyter: name: jupyter uistatic: name: egeria-ui - tag: latest + tag: 2.8.0 nginx: name: nginx namespace: diff --git a/open-metadata-resources/open-metadata-deployment/compose/tutorials/.env b/open-metadata-resources/open-metadata-deployment/compose/tutorials/.env index cca98d8760e..3e08a81246b 100644 --- a/open-metadata-resources/open-metadata-deployment/compose/tutorials/.env +++ b/open-metadata-resources/open-metadata-deployment/compose/tutorials/.env @@ -5,10 +5,10 @@ egeria_version=2.10 # # Version of egeria-react-ui to use -egeria_react_ui_version=latest +egeria_react_ui_version=2.10.0 # Version of egeria-ui to use -egeria_ui_version=latest +egeria_ui_version=2.8.0 # Override if you wish to use images other than from docker hub odpi/egeria etc egeria_repo=odpi From f6ca361dac5c8cabdfb82142524b3549ed9eefc2 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 28 May 2021 17:09:30 +0100 Subject: [PATCH 2/5] #5211 fix ifNotPresent flag for release to minimize container downloads Signed-off-by: Nigel Jones --- .../open-metadata-deployment/charts/egeria-base/values.yaml | 2 +- .../odpi-egeria-lab/files/egeria-ui/application.properties | 0 .../open-metadata-deployment/charts/odpi-egeria-lab/values.yaml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties diff --git a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml index f78efbd14fd..da82301f219 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/egeria-base/values.yaml @@ -69,7 +69,7 @@ imageDefaults: registry: docker.io namespace: odpi tag: latest - pullPolicy: Always + pullPolicy: IfNotPresent # The following section defines all of the DOCKER images being used by this chart. Normally they should be left as is, # but are exposed here in case the user wishes to extend. By default, each will use the 'imageDefaults' above, but diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties new file mode 100644 index 00000000000..e69de29bb2d diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml index 897281552bc..6b1ad0d57b3 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/values.yaml @@ -44,7 +44,7 @@ imageDefaults: registry: docker.io namespace: odpi tag: latest - pullPolicy: Always + pullPolicy: IfNotPresent # The following section defines all of the DOCKER images being used by this chart. Normally they should be left as is, # but are exposed here in case the user wishes to extend. By default, each will use the 'imageDefaults' above, but From ffbd64cec1d24d1d3b22df0f11a95eb3bb8d8c24 Mon Sep 17 00:00:00 2001 From: Ljupcho Palashevski Date: Mon, 31 May 2021 11:38:47 +0200 Subject: [PATCH 3/5] Missing default properties for the landing page Signed-off-by: Ljupcho Palashevski Signed-off-by: Nigel Jones --- .../src/main/resources/application.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties index 408366f28d3..cafa50ce627 100644 --- a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties +++ b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties @@ -79,6 +79,9 @@ open.lineage.server.name=open-lineage # ui configuration properties omas.asset.catalog.page.size=50 +# landing page +app.description=Have a question? || Get in touch via our Slack community https://slack.lfai.foundation/ @@What is Open Metadata? || Find out more on our website https://egeria.odpi.org @@Have more cool ideas? || Feel free to let us know your ideas so we can make it better. +app.title=Egeria Open Metadata | Find the right data with governance ################################################ ### Logging @@ -96,4 +99,4 @@ logging.level.org.odpi.openmetadata=INFO # Comma-separated list of origins. # Example configuration below is for setting up local development environment where egeria-ui is hosted on one of the two urls. # cors.allowed-origins=http://localhost,http://localhost:8081 -cors.allowed-origins= +cors.allowed-origins=* \ No newline at end of file From 4e74069a9d632f53d79c3677bc5f40ff3a725102 Mon Sep 17 00:00:00 2001 From: Ljupcho Palashevski Date: Mon, 31 May 2021 11:40:40 +0200 Subject: [PATCH 4/5] Revert CORS default prop. Signed-off-by: Ljupcho Palashevski Signed-off-by: Nigel Jones --- .../ui-chassis-spring/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties index cafa50ce627..97c63344126 100644 --- a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties +++ b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/resources/application.properties @@ -99,4 +99,4 @@ logging.level.org.odpi.openmetadata=INFO # Comma-separated list of origins. # Example configuration below is for setting up local development environment where egeria-ui is hosted on one of the two urls. # cors.allowed-origins=http://localhost,http://localhost:8081 -cors.allowed-origins=* \ No newline at end of file +cors.allowed-origins= \ No newline at end of file From 2d1bc6a041051458f8d81af9300846699d8cdc79 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Tue, 1 Jun 2021 08:31:59 +0100 Subject: [PATCH 5/5] #5211 remove incorrect application.properties Signed-off-by: Nigel Jones --- .../charts/odpi-egeria-lab/files/egeria-ui/application.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-lab/files/egeria-ui/application.properties deleted file mode 100644 index e69de29bb2d..00000000000