prepare release v2.6.0

cn337131 · Aug 5, 2024 · 485bbeb · 485bbeb
1 parent 885ee4d
commit 485bbeb
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 41 deletions.
diff --git a/docker/accumulo1.env b/docker/accumulo1.env
@@ -3,9 +3,9 @@ HADOOP_VERSION=3.2.2
 ACCUMULO_VERSION=1.9.3
 HADOOP_CONF_DIR=/etc/hadoop/conf
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
-GAFFER_VERSION=2.4.0
-GAFFER_TESTER_VERSION=2.4.0
-GAFFERPY_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
+GAFFER_TESTER_VERSION=2.6.0
+GAFFERPY_VERSION=2.6.0
 SPARK_VERSION=3.1.2
 TINKERPOP_VERSION=3.7.1
 KUBECTL_VERSION=1.23.0
diff --git a/docker/accumulo2.env b/docker/accumulo2.env
@@ -3,9 +3,9 @@ HADOOP_VERSION=3.3.3
 ACCUMULO_VERSION=2.0.1
 HADOOP_CONF_DIR=/etc/hadoop/conf
 ACCUMULO_CONF_DIR=/etc/accumulo/conf
-GAFFER_VERSION=2.4.0
-GAFFER_TESTER_VERSION=2.4.0
-GAFFERPY_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
+GAFFER_TESTER_VERSION=2.6.0
+GAFFERPY_VERSION=2.6.0
 SPARK_VERSION=3.1.2
 TINKERPOP_VERSION=3.7.1
 KUBECTL_VERSION=1.23.0
diff --git a/docker/gaffer-federated-integration-tests/.env b/docker/gaffer-federated-integration-tests/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.4.0
-GAFFER_TESTER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
+GAFFER_TESTER_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer-gremlin/pom.xml b/docker/gaffer-gremlin/pom.xml
@@ -24,7 +24,7 @@
 
     <!-- Properties can be overriden for CI/CD -->
     <properties>
-        <gaffer.version>2.4.0</gaffer.version>
+        <gaffer.version>2.6.0</gaffer.version>
         <jersey.version>2.36</jersey.version>
     </properties>
 

diff --git a/docker/gaffer-integration-tests/.env b/docker/gaffer-integration-tests/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.4.0
-GAFFER_TESTER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
+GAFFER_TESTER_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer-kerberos/.env b/docker/gaffer-kerberos/.env
@@ -1,4 +1,4 @@
-GAFFER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
 GAFFER_KRB_PASSWORD=change-password-for-gaffer
 
 ZOOKEEPER_VERSION=3.7.1

diff --git a/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env b/docker/gaffer-kerberos/gaffer-integration-tests-krb/.env
@@ -1,6 +1,6 @@
-GAFFER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
 GAFFER_KRB_PASSWORD=change-password-for-gaffer
-GAFFER_TESTER_VERSION=2.4.0
+GAFFER_TESTER_VERSION=2.6.0
 
 ZOOKEEPER_VERSION=3.7.1
 ZOOKEEPER_KRB_PASSWORD=change-password-for-zookeeper

diff --git a/docker/gaffer-kerberos/gaffer-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-krb/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASE_IMAGE_NAME=gchq/gaffer
-ARG BASE_IMAGE_TAG=2.4.0
+ARG BASE_IMAGE_TAG=2.6.0
 
 ARG USER=accumulo
 ARG GROUP=accumulo

diff --git a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASE_IMAGE_NAME=gchq/gaffer-rest
-ARG BASE_IMAGE_TAG=2.4.0
+ARG BASE_IMAGE_TAG=2.6.0
 
 FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
 

diff --git a/docker/gaffer-pyspark-notebook/.env b/docker/gaffer-pyspark-notebook/.env
@@ -1,6 +1,6 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.4.0
-GAFFERPY_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
+GAFFERPY_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 SPARK_VERSION=3.1.2

diff --git a/docker/gaffer-pyspark-notebook/Dockerfile b/docker/gaffer-pyspark-notebook/Dockerfile
@@ -60,7 +60,7 @@ ARG KUBECTL_VERSION=1.23.0
 RUN curl -fLo /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
 	chmod +x /bin/kubectl
 
-ARG GAFFERPY_VERSION=gafferpy-2.4.0
+ARG GAFFERPY_VERSION=gafferpy-2.6.0
 RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gafferpy && \
 	pushd gafferpy && \
 	python setup.py install && \

diff --git a/docker/gaffer-rest/.env b/docker/gaffer-rest/.env
@@ -1,2 +1,2 @@
-GAFFER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=8-latest
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
 ARG ACCUMULO_VERSION=2.0.1
-ARG GAFFER_VERSION=2.4.0
+ARG GAFFER_VERSION=2.6.0
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 

diff --git a/docker/gaffer-road-traffic-loader/.env b/docker/gaffer-road-traffic-loader/.env
@@ -1,5 +1,5 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer-road-traffic-loader/Dockerfile b/docker/gaffer-road-traffic-loader/Dockerfile
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=8-jre-headless-latest
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=2.4.0
+ARG GAFFER_VERSION=2.6.0
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 

diff --git a/docker/gaffer/.env b/docker/gaffer/.env
@@ -1,5 +1,5 @@
 ZOOKEEPER_VERSION=3.7.1
-GAFFER_VERSION=2.4.0
+GAFFER_VERSION=2.6.0
 ACCUMULO_VERSION=2.0.1
 HADOOP_VERSION=3.3.3
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer/Dockerfile b/docker/gaffer/Dockerfile
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=2.0.1
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
 ARG BASE_IMAGE_TAG
-ARG GAFFER_VERSION=2.4.0
+ARG GAFFER_VERSION=2.6.0
 ARG GAFFER_LIBS=bitmap-library,sketches-library,time-library
 ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git

diff --git a/kubernetes/accumulo/Chart.yaml b/kubernetes/accumulo/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 name: accumulo
 description: A Key-Value Accumulo store
 type: application
-version: 2.4.0 # managed version
+version: 2.6.0 # managed version
 appVersion: 2.0.1
 home: https://github.com/gchq/Gaffer
 sources:
@@ -26,6 +26,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami/
     condition: zookeeper.enabled
   - name: hdfs
-    version: ^2.4.0 # managed version
+    version: ^2.6.0 # managed version
     repository: file://../hdfs/
     condition: hdfs.enabled
diff --git a/kubernetes/gaffer-jhub/Chart.yaml b/kubernetes/gaffer-jhub/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v2
 name: gaffer-jhub
 description: A Jupyter Hub instance, with Gaffer integrations
 type: application
-version: 2.4.0 # managed version
+version: 2.6.0 # managed version
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker

diff --git a/kubernetes/gaffer-jhub/values.yaml b/kubernetes/gaffer-jhub/values.yaml
@@ -65,7 +65,7 @@ jupyterhub:
         kubespawner_override:
           image: jupyter/minimal-notebook:399cbb986c6b
       - display_name: "Gaffer pySpark Notebook"
-        description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.3.0" # managed
+        description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.4.0" # managed
         slug: "gaffer-pyspark"
         default: true
         enable_hdfs: true
@@ -74,7 +74,7 @@ jupyterhub:
         spark_image: gchq/spark-py:3.1.2 # managed
         spark_ingress_host: "{{USERNAME}}-{{SERVERNAME}}.spark.example.com"
         kubespawner_override:
-          image: gchq/gaffer-pyspark-notebook:2.3.0 # managed
+          image: gchq/gaffer-pyspark-notebook:2.4.0 # managed
 optionsServer:
   replicaCount: 1
   image:
@@ -141,4 +141,4 @@ optionsServer:
 testImages:
   python:
     repository: gchq/gaffer-pyspark-notebook
-    tag: 2.3.0 # managed version
+    tag: 2.4.0 # managed version
diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml
@@ -15,13 +15,13 @@ apiVersion: v2
 name: gaffer-road-traffic
 description: A Gaffer instance containing sample GB road traffic data from the Department of Transport
 type: application
-version: 2.4.0 # managed version
-appVersion: 2.3.0 # managed version
+version: 2.6.0 # managed version
+appVersion: 2.4.0 # managed version
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker
   - https://data.gov.uk/dataset/208c0e7b-353f-4e2d-8b7a-1a7118467acc/gb-road-traffic-counts
 dependencies:
   - name: gaffer
-    version: ^2.4.0 # managed version
+    version: ^2.6.0 # managed version
     repository: file://../gaffer/
diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml
@@ -17,7 +17,7 @@ labels: {}
 loader:
   image:
     repository: gchq/gaffer-road-traffic-loader
-    tag: 2.3.0 # managed version
+    tag: 2.4.0 # managed version
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}

diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml
@@ -15,13 +15,13 @@ apiVersion: v2
 name: gaffer
 description: A large-scale entity and relation database supporting aggregation of properties
 type: application
-version: 2.4.0 # managed version
-appVersion: 2.3.0
+version: 2.6.0 # managed version
+appVersion: 2.4.0
 home: https://github.com/gchq/Gaffer
 sources:
   - https://github.com/gchq/gaffer-docker
 dependencies:
   - name: accumulo
-    version: ^2.4.0 # managed version
+    version: ^2.6.0 # managed version
     repository: file://../accumulo/
     condition: accumulo.enabled
diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml
@@ -31,7 +31,7 @@ api:
   replicaCount: 1
   image:
     repository: gchq/gaffer-rest
-    tag: 2.3.0-accumulo-2.0.1 # managed version
+    tag: 2.4.0-accumulo-2.0.1 # managed version
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}
@@ -61,7 +61,7 @@ accumulo:
   enabled: false
   image:
     repository: gchq/gaffer
-    tag: 2.3.0-accumulo-2.0.1 # managed version
+    tag: 2.4.0-accumulo-2.0.1 # managed version
   config:
     postInstallCommands:
       - users

diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml
@@ -15,5 +15,5 @@ apiVersion: v2
 name: hdfs
 description: Deploys the Hadoop Distributed File System (HDFS)
 type: application
-version: 2.4.0 # managed version
+version: 2.6.0 # managed version
 appVersion: 3.3.3 # managed version