Merge pull request #267 from lpalashevski/release-4.1

v4.1.0
odpi · May 30, 2023 · 1644855 · 1644855
2 parents 354d613 + 2e5633e
commit 1644855
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 18 deletions.
diff --git a/charts/egeria-base/Chart.yaml b/charts/egeria-base/Chart.yaml
@@ -4,8 +4,8 @@
 name: egeria-base
 description: A Helm chart for Egeria simple platform deployment
 apiVersion: v2
-version: 4.0.1
-appVersion: "4.0"
+version: 4.1.0
+appVersion: "4.1"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, base, simple
@@ -17,7 +17,7 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: strimzi-kafka-operator
-    version: 0.34.0
+    version: 0.35.0
     repository: https://strimzi.io/charts/
     condition: strimzi.enabled
   # TODO - reinstate dependencies after initial publish

diff --git a/charts/egeria-base/templates/kafka-cluster.yaml b/charts/egeria-base/templates/kafka-cluster.yaml
@@ -8,7 +8,7 @@ metadata:
   name: {{ .Release.Name }}-strimzi
 spec:
   kafka:
-    version: 3.3.2
+    version: {{ .Values.strimzi.kafka.version }}
     replicas: 1
     listeners:
       - name: plain

diff --git a/charts/egeria-base/values.yaml b/charts/egeria-base/values.yaml
@@ -164,6 +164,7 @@ image:
 strimzi:
   enabled: true
   kafka:
+    version: 3.4.0
     listeners:
       external:
         enabled: true

diff --git a/charts/egeria-cts/Chart.yaml b/charts/egeria-cts/Chart.yaml
@@ -4,8 +4,8 @@
 name: egeria-cts
 description: Egeria Conformance Test Suite deployment to Kubernetes
 apiVersion: v2
-version: 4.0.0
-appVersion: "4.0"
+version: 4.1.0
+appVersion: "4.1"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, cts

diff --git 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"
+  tag: "4.1"
   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
@@ -4,8 +4,8 @@ apiVersion: v2
 name: egeria-lineage
 description: A Helm chart for the egeria integration lineage event driven connector sample
 type: application
-version: 4.0.0
-appVersion: "4.0"
+version: 4.1.0
+appVersion: "4.1"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, base, simple, event, driven, lineage, sample, atruvia

diff --git a/charts/egeria-pts/Chart.yaml b/charts/egeria-pts/Chart.yaml
@@ -4,8 +4,8 @@
 name: egeria-pts
 description: Egeria Performance Test Suite deployment to Kubernetes
 apiVersion: v2
-version: 4.0.0
-appVersion: "4.0"
+version: 4.1.0
+appVersion: "4.1"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, pts

diff --git 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"
+  tag: "4.1"
   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
@@ -4,8 +4,8 @@
 name: odpi-egeria-lab
 description: Egeria lab environment
 apiVersion: v2
-version: 4.1-prerelease.1
-appVersion: "4.0"
+version: 4.1.0
+appVersion: "4.1"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, lab, jupyter, notebook
@@ -19,6 +19,6 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: strimzi-kafka-operator
-    version: 0.34.0
+    version: 0.35.0
     repository: https://strimzi.io/charts/
     condition: strimzi.enabled
diff --git a/charts/odpi-egeria-lab/templates/kafka-cluster.yaml b/charts/odpi-egeria-lab/templates/kafka-cluster.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ .Release.Name }}-strimzi
 spec:
   kafka:
-    version: 3.4.0
+    version: {{ .Values.kafka.version }}
     replicas: {{ .Values.kafka.replicas }}
     listeners:
       - name: plain

diff --git a/charts/odpi-egeria-lab/values.yaml b/charts/odpi-egeria-lab/values.yaml
@@ -83,12 +83,13 @@ jupyter:
   # tokenPlain:
   # ----
   # Git tag to checkout in the egeria-jupyter repo
-  gitTagForNotebooks: "main"
+  gitTagForNotebooks: "V4.1"
   resources: {}
 
 # Strimzi is used to setup an operator which will manage the custom resource we define.
 # These entries are used to define that custom resource
 kafka:
+  version: 3.4.0
   replicas: 1
   resources: {}
 zookeeper:
@@ -127,7 +128,7 @@ image:
     #registry: docker.io
     #namespace: jupyter
     name: jupyter
-    tag: "lab-3.5.2"
+    tag: "lab-4.0.0"
   uistatic:
     name: egeria-ui
     tag: "4.1.2"