From 81cd658d1bf2153faafa95a49699271f730aaf7b Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Mon, 13 May 2024 10:47:34 +0000 Subject: [PATCH] update gaffer version to 2.2.1 --- docker/accumulo1.env | 6 +++--- docker/accumulo2.env | 6 +++--- docker/gaffer-federated-integration-tests/.env | 4 ++-- docker/gaffer-gremlin/pom.xml | 2 +- docker/gaffer-integration-tests/.env | 4 ++-- docker/gaffer-kerberos/.env | 2 +- docker/gaffer-kerberos/gaffer-integration-tests-krb/.env | 4 ++-- docker/gaffer-kerberos/gaffer-krb/Dockerfile | 2 +- docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile | 2 +- docker/gaffer-pyspark-notebook/.env | 4 ++-- docker/gaffer-pyspark-notebook/Dockerfile | 2 +- docker/gaffer-rest/.env | 2 +- docker/gaffer-rest/Dockerfile | 2 +- docker/gaffer-road-traffic-loader/.env | 2 +- docker/gaffer-road-traffic-loader/Dockerfile | 2 +- docker/gaffer/.env | 2 +- docker/gaffer/Dockerfile | 2 +- kubernetes/accumulo/Chart.yaml | 4 ++-- kubernetes/gaffer-jhub/Chart.yaml | 2 +- kubernetes/gaffer-jhub/values.yaml | 6 +++--- kubernetes/gaffer-road-traffic/Chart.yaml | 6 +++--- kubernetes/gaffer-road-traffic/values.yaml | 2 +- kubernetes/gaffer/Chart.yaml | 6 +++--- kubernetes/gaffer/values.yaml | 4 ++-- kubernetes/hdfs/Chart.yaml | 2 +- 25 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docker/accumulo1.env b/docker/accumulo1.env index ee70779c..a2322bcf 100644 --- 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.2.0 -GAFFER_TESTER_VERSION=2.2.0 -GAFFERPY_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 +GAFFER_TESTER_VERSION=2.2.1 +GAFFERPY_VERSION=2.2.1 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 index f4c45a51..16c6fb59 100644 --- 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.2.0 -GAFFER_TESTER_VERSION=2.2.0 -GAFFERPY_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 +GAFFER_TESTER_VERSION=2.2.1 +GAFFERPY_VERSION=2.2.1 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 index 8cff2ddc..6aa00e96 100644 --- 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.2.0 -GAFFER_TESTER_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 +GAFFER_TESTER_VERSION=2.2.1 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 index d8bd598f..fdd199ba 100644 --- a/docker/gaffer-gremlin/pom.xml +++ b/docker/gaffer-gremlin/pom.xml @@ -24,7 +24,7 @@ - 2.2.0 + 2.2.1 2.36 diff --git a/docker/gaffer-integration-tests/.env b/docker/gaffer-integration-tests/.env index 8cff2ddc..6aa00e96 100644 --- a/docker/gaffer-integration-tests/.env +++ b/docker/gaffer-integration-tests/.env @@ -1,6 +1,6 @@ ZOOKEEPER_VERSION=3.7.1 -GAFFER_VERSION=2.2.0 -GAFFER_TESTER_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 +GAFFER_TESTER_VERSION=2.2.1 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 index 586488d0..1f4646d1 100644 --- a/docker/gaffer-kerberos/.env +++ b/docker/gaffer-kerberos/.env @@ -1,4 +1,4 @@ -GAFFER_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 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 index f8a57e62..070cddeb 100644 --- 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.2.0 +GAFFER_VERSION=2.2.1 GAFFER_KRB_PASSWORD=change-password-for-gaffer -GAFFER_TESTER_VERSION=2.2.0 +GAFFER_TESTER_VERSION=2.2.1 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 index 26a74896..659240b7 100644 --- 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.2.0 +ARG BASE_IMAGE_TAG=2.2.1 ARG USER=accumulo ARG GROUP=accumulo diff --git a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile index 7ac2d602..df9647d5 100644 --- 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.2.0 +ARG BASE_IMAGE_TAG=2.2.1 FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} diff --git a/docker/gaffer-pyspark-notebook/.env b/docker/gaffer-pyspark-notebook/.env index 62f488ae..182fd4a2 100644 --- a/docker/gaffer-pyspark-notebook/.env +++ b/docker/gaffer-pyspark-notebook/.env @@ -1,6 +1,6 @@ ZOOKEEPER_VERSION=3.7.1 -GAFFER_VERSION=2.2.0 -GAFFERPY_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 +GAFFERPY_VERSION=2.2.1 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 index f9696ac8..76bbfd52 100644 --- 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.2.0 +ARG GAFFERPY_VERSION=gafferpy-2.2.1 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 index 12ce9673..0e15e429 100644 --- a/docker/gaffer-rest/.env +++ b/docker/gaffer-rest/.env @@ -1,2 +1,2 @@ -GAFFER_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 ACCUMULO_VERSION=2.0.1 diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile index f76052ad..5c0118ee 100644 --- a/docker/gaffer-rest/Dockerfile +++ b/docker/gaffer-rest/Dockerfile @@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=8-jre-alpine FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder ARG ACCUMULO_VERSION=2.0.1 -ARG GAFFER_VERSION=2.2.0 +ARG GAFFER_VERSION=2.2.1 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 index 9d5e2ffd..aa623c52 100644 --- 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.2.0 +GAFFER_VERSION=2.2.1 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 index 78db6cca..05116ee0 100644 --- a/docker/gaffer-road-traffic-loader/Dockerfile +++ b/docker/gaffer-road-traffic-loader/Dockerfile @@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=8u322-jre-slim-bullseye FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder -ARG GAFFER_VERSION=2.2.0 +ARG GAFFER_VERSION=2.2.1 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 index 9d5e2ffd..aa623c52 100644 --- a/docker/gaffer/.env +++ b/docker/gaffer/.env @@ -1,5 +1,5 @@ ZOOKEEPER_VERSION=3.7.1 -GAFFER_VERSION=2.2.0 +GAFFER_VERSION=2.2.1 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 index 5a995050..99a86f71 100644 --- 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.2.0 +ARG GAFFER_VERSION=2.2.1 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 index 99d4edc2..5dcb1225 100644 --- 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.2.0 # managed version +version: 2.2.1 # managed version appVersion: 2.0.1 home: https://github.com/gchq/Gaffer sources: @@ -26,6 +26,6 @@ dependencies: repository: https://charts.helm.sh/incubator/ condition: zookeeper.enabled - name: hdfs - version: ^2.2.0 # managed version + version: ^2.2.1 # managed version repository: file://../hdfs/ condition: hdfs.enabled diff --git a/kubernetes/gaffer-jhub/Chart.yaml b/kubernetes/gaffer-jhub/Chart.yaml index 1b44e33e..37913303 100644 --- 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.2.0 # managed version +version: 2.2.1 # 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 index 9616b25a..2def8c05 100644 --- 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.2.0" # managed + description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.2.1" # 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.2.0 # managed + image: gchq/gaffer-pyspark-notebook:2.2.1 # managed optionsServer: replicaCount: 1 image: @@ -141,4 +141,4 @@ optionsServer: testImages: python: repository: gchq/gaffer-pyspark-notebook - tag: 2.2.0 # managed version + tag: 2.2.1 # managed version diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml index b2ab9494..1a01fc09 100644 --- 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.2.0 # managed version -appVersion: 2.2.0 # managed version +version: 2.2.1 # managed version +appVersion: 2.2.1 # 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.2.0 # managed version + version: ^2.2.1 # managed version repository: file://../gaffer/ diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml index 8953c537..e1a1f9ca 100644 --- 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.2.0 # managed version + tag: 2.2.1 # managed version pullPolicy: IfNotPresent pullSecrets: [] resources: {} diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml index 532bdcfd..867085e0 100644 --- 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.2.0 # managed version -appVersion: 2.2.0 +version: 2.2.1 # managed version +appVersion: 2.2.1 home: https://github.com/gchq/Gaffer sources: - https://github.com/gchq/gaffer-docker dependencies: - name: accumulo - version: ^2.2.0 # managed version + version: ^2.2.1 # managed version repository: file://../accumulo/ condition: accumulo.enabled diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml index 6f2ddf9c..1d90086e 100644 --- a/kubernetes/gaffer/values.yaml +++ b/kubernetes/gaffer/values.yaml @@ -31,7 +31,7 @@ api: replicaCount: 1 image: repository: gchq/gaffer-rest - tag: 2.2.0-accumulo-2.0.1 # managed version + tag: 2.2.1-accumulo-2.0.1 # managed version pullPolicy: IfNotPresent pullSecrets: [] resources: {} @@ -61,7 +61,7 @@ accumulo: enabled: false image: repository: gchq/gaffer - tag: 2.2.0-accumulo-2.0.1 # managed version + tag: 2.2.1-accumulo-2.0.1 # managed version config: postInstallCommands: - users diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml index b5145d49..3aa621f4 100644 --- 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.2.0 # managed version +version: 2.2.1 # managed version appVersion: 3.3.3 # managed version