From 41c9b3c2e0721c8b10c95cdfe6360d33e5b41324 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Thu, 23 Mar 2023 22:18:36 +0000 Subject: [PATCH 1/2] #215 fix missing image section in pts chart Signed-off-by: Nigel Jones --- charts/egeria-pts/values.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/charts/egeria-pts/values.yaml b/charts/egeria-pts/values.yaml index ed70966b..e55f5fb0 100644 --- a/charts/egeria-pts/values.yaml +++ b/charts/egeria-pts/values.yaml @@ -77,6 +77,17 @@ imageDefaults: tag: "4.0-SNAPSHOT" pullPolicy: IfNotPresent +# The following section defines all 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 +# these can be individually overridden for each image, if desired, by providing a subkey for 'namespace', 'tag' or +# 'pullPolicy' with the value to use for the override (if you want to use the public Docker registry, use +# 'docker.io/library' as the registry override, and set namespace to be your user or organization id). +image: + egeria: + name: egeria + configure: + name: egeria-configure + # Normally we install the strimzi operator as part of the Chart. However this requires admin permissions, and # will create cluster-scoped resources. Set to false to skip this when in a restricted environment, or needing multiple # installs of egeria charts in the same cluster. Requires the strimzi operator to be From 509076d2f0771d4c650dc74cf3d4d7bb4b6918c1 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 24 Mar 2023 15:54:27 +0000 Subject: [PATCH 2/2] Move to 4.0 container images prior to release & bump prerelease version Signed-off-by: Nigel Jones --- charts/egeria-base/Chart.yaml | 2 +- charts/egeria-base/values.yaml | 2 +- charts/egeria-cts/Chart.yaml | 2 +- charts/egeria-cts/values.yaml | 2 +- charts/egeria-lineage/Chart.yaml | 2 +- charts/egeria-pts/Chart.yaml | 2 +- charts/egeria-pts/values.yaml | 2 +- charts/odpi-egeria-lab/Chart.yaml | 2 +- charts/odpi-egeria-lab/values.yaml | 2 +- config/values/lab-mainversion.yaml | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/egeria-base/Chart.yaml b/charts/egeria-base/Chart.yaml index 16ffe0c7..0cb0a6a1 100644 --- a/charts/egeria-base/Chart.yaml +++ b/charts/egeria-base/Chart.yaml @@ -4,7 +4,7 @@ name: egeria-base description: A Helm chart for Egeria simple platform deployment apiVersion: v2 -version: 4.0-prerelease.3 +version: 4.0-prerelease.4 appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/egeria-base/values.yaml b/charts/egeria-base/values.yaml index 9c9ad565..bfad93b2 100644 --- a/charts/egeria-base/values.yaml +++ b/charts/egeria-base/values.yaml @@ -54,7 +54,7 @@ global: egeria: # Set to INFO, WARNING, DEBUG if needed logging: - version: "4.0-SNAPSHOT" + version: "4.0" # repositoryType: "local-graph-repository" repositoryType: "in-memory-repository" debug: false diff --git a/charts/egeria-cts/Chart.yaml b/charts/egeria-cts/Chart.yaml index 6585323d..cd8d2ecf 100644 --- a/charts/egeria-cts/Chart.yaml +++ b/charts/egeria-cts/Chart.yaml @@ -4,7 +4,7 @@ name: egeria-cts description: Egeria Conformance Test Suite deployment to Kubernetes apiVersion: v2 -version: 4.0-prerelease.1 +version: 4.0-prerelease.2 appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/egeria-cts/values.yaml b/charts/egeria-cts/values.yaml index dec627d9..f71d2010 100644 --- a/charts/egeria-cts/values.yaml +++ b/charts/egeria-cts/values.yaml @@ -68,7 +68,7 @@ resources: imageDefaults: registry: quay.io namespace: odpi - tag: "4.0-SNAPSHOT" + tag: "4.0" pullPolicy: IfNotPresent # The following section defines all DOCKER images being used by this chart. Normally they should be left as is, diff --git a/charts/egeria-lineage/Chart.yaml b/charts/egeria-lineage/Chart.yaml index 8db0e678..ba82784e 100644 --- a/charts/egeria-lineage/Chart.yaml +++ b/charts/egeria-lineage/Chart.yaml @@ -4,7 +4,7 @@ apiVersion: v2 name: egeria-lineage description: A Helm chart for the egeria integration lineage event driven connector sample type: application -version: 4.0-prerelease.1 +version: 4.0-prerelease.2 appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/egeria-pts/Chart.yaml b/charts/egeria-pts/Chart.yaml index 5192643a..d14630f1 100644 --- a/charts/egeria-pts/Chart.yaml +++ b/charts/egeria-pts/Chart.yaml @@ -4,7 +4,7 @@ name: egeria-pts description: Egeria Performance Test Suite deployment to Kubernetes apiVersion: v2 -version: 4.0-prerelease.1 +version: 4.0-prerelease.2 appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/egeria-pts/values.yaml b/charts/egeria-pts/values.yaml index e55f5fb0..238a3788 100644 --- a/charts/egeria-pts/values.yaml +++ b/charts/egeria-pts/values.yaml @@ -74,7 +74,7 @@ resources: imageDefaults: registry: quay.io namespace: odpi - tag: "4.0-SNAPSHOT" + tag: "4.0" pullPolicy: IfNotPresent # The following section defines all DOCKER images being used by this chart. Normally they should be left as is, diff --git a/charts/odpi-egeria-lab/Chart.yaml b/charts/odpi-egeria-lab/Chart.yaml index 63aeb548..c980d117 100644 --- a/charts/odpi-egeria-lab/Chart.yaml +++ b/charts/odpi-egeria-lab/Chart.yaml @@ -4,7 +4,7 @@ name: odpi-egeria-lab description: Egeria lab environment apiVersion: v2 -version: 4.0.0-prerelease.10 +version: 4.0.0-prerelease.11gi appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/odpi-egeria-lab/values.yaml b/charts/odpi-egeria-lab/values.yaml index 7f99ba9c..a1d43923 100644 --- a/charts/odpi-egeria-lab/values.yaml +++ b/charts/odpi-egeria-lab/values.yaml @@ -31,7 +31,7 @@ service: egeria: #logging: OFF development: true - version: "4.0-SNAPSHOT" + version: "4.0" #repositoryType: "local-graph-repository" repositoryType: "in-memory-repository" # See https://github.com/odpi/egeria-charts/issues/56 for status of the Egeria UI (polymer) in this environment diff --git a/config/values/lab-mainversion.yaml b/config/values/lab-mainversion.yaml index 30483172..14f181ea 100644 --- a/config/values/lab-mainversion.yaml +++ b/config/values/lab-mainversion.yaml @@ -4,12 +4,12 @@ # Example of showing how to use a specific version of egeria. This can include snapshots egeria: - version: "4.0-SNAPSHOT" + version: "4.0" image: egeria: - tag: 4.0-SNAPSHOT + tag: 4.0 pullPolicy: Always imageDefaults: - tag: 4.0-SNAPSHOT + tag: 4.0 jupyter: gitTagForNotebooks: main