From f7983e1db11d2598b13fd9fe6a366bb3e71f188f Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Fri, 12 Jan 2024 14:59:23 +0000 Subject: [PATCH 1/7] Updating Gaffer version to 2.1.0 --- docker/accumulo1.env | 6 +++--- docker/accumulo2.env | 6 +++--- docker/gaffer-federated-integration-tests/.env | 4 ++-- 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 +- docker/gremlin-gaffer/.env | 2 +- docker/gremlin-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 +- 26 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docker/accumulo1.env b/docker/accumulo1.env index 570967fb..5de87e9e 100644 --- a/docker/accumulo1.env +++ b/docker/accumulo1.env @@ -3,7 +3,7 @@ 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.0.0 -GAFFER_TESTER_VERSION=2.0.0 -GAFFERPY_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 +GAFFER_TESTER_VERSION=2.1.0 +GAFFERPY_VERSION=2.1.0 SPARK_VERSION=3.1.2 diff --git a/docker/accumulo2.env b/docker/accumulo2.env index d4d48ddb..e415ae8f 100644 --- a/docker/accumulo2.env +++ b/docker/accumulo2.env @@ -3,7 +3,7 @@ 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.0.0 -GAFFER_TESTER_VERSION=2.0.0 -GAFFERPY_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 +GAFFER_TESTER_VERSION=2.1.0 +GAFFERPY_VERSION=2.1.0 SPARK_VERSION=3.1.2 diff --git a/docker/gaffer-federated-integration-tests/.env b/docker/gaffer-federated-integration-tests/.env index ba332c25..798f9bf3 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.0.0 -GAFFER_TESTER_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 +GAFFER_TESTER_VERSION=2.1.0 ACCUMULO_VERSION=2.0.1 HADOOP_VERSION=3.3.3 ACCUMULO_CONF_DIR=/etc/accumulo/conf diff --git a/docker/gaffer-integration-tests/.env b/docker/gaffer-integration-tests/.env index ba332c25..798f9bf3 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.0.0 -GAFFER_TESTER_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 +GAFFER_TESTER_VERSION=2.1.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 index 32fa884d..79a080fa 100644 --- a/docker/gaffer-kerberos/.env +++ b/docker/gaffer-kerberos/.env @@ -1,4 +1,4 @@ -GAFFER_VERSION=2.0.0 +GAFFER_VERSION=2.1.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 index 3845e902..f6e0cfd2 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.0.0 +GAFFER_VERSION=2.1.0 GAFFER_KRB_PASSWORD=change-password-for-gaffer -GAFFER_TESTER_VERSION=2.0.0 +GAFFER_TESTER_VERSION=2.1.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 index 13127da5..fa2233ad 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.0.0 +ARG BASE_IMAGE_TAG=2.1.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 index da98bf20..d10fe932 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.0.0 +ARG BASE_IMAGE_TAG=2.1.0 FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} diff --git a/docker/gaffer-pyspark-notebook/.env b/docker/gaffer-pyspark-notebook/.env index b0556850..2c1f748c 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.0.0 -GAFFERPY_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 +GAFFERPY_VERSION=2.1.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 index 8bce231a..6818cd8e 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.0.0 +ARG GAFFERPY_VERSION=gafferpy-2.1.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 index c1bc9e35..f2fcf3c5 100644 --- a/docker/gaffer-rest/.env +++ b/docker/gaffer-rest/.env @@ -1,2 +1,2 @@ -GAFFER_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 ACCUMULO_VERSION=2.0.1 diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile index ab66de1b..45c863b9 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.0.0 +ARG GAFFER_VERSION=2.1.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 index dc4cb998..fcb7759e 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.0.0 +GAFFER_VERSION=2.1.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 index 454c7552..591d482e 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.0.0 +ARG GAFFER_VERSION=2.1.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 index dc4cb998..fcb7759e 100644 --- a/docker/gaffer/.env +++ b/docker/gaffer/.env @@ -1,5 +1,5 @@ ZOOKEEPER_VERSION=3.7.1 -GAFFER_VERSION=2.0.0 +GAFFER_VERSION=2.1.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 index fe17e0ea..93c65af4 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.0.0 +ARG GAFFER_VERSION=2.1.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/docker/gremlin-gaffer/.env b/docker/gremlin-gaffer/.env index b9a28848..e273dcd5 100644 --- a/docker/gremlin-gaffer/.env +++ b/docker/gremlin-gaffer/.env @@ -1,5 +1,5 @@ ZOOKEEPER_VERSION=3.7.1 -GAFFER_VERSION=2.0.0 +GAFFER_VERSION=2.1.0 GREMLIN_VERSION=3.6.4 ACCUMULO_VERSION=2.0.1 HADOOP_VERSION=3.3.3 diff --git a/docker/gremlin-gaffer/Dockerfile b/docker/gremlin-gaffer/Dockerfile index ffb80399..c450386a 100644 --- a/docker/gremlin-gaffer/Dockerfile +++ b/docker/gremlin-gaffer/Dockerfile @@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=3.6.4 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder ARG BASE_IMAGE_TAG -ARG GAFFER_VERSION=2.0.0 +ARG GAFFER_VERSION=2.1.0 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 c961ae08..4146e5c5 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.0.0 # managed version +version: 2.1.0 # 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.0.0 # managed version + version: ^2.1.0 # managed version repository: file://../hdfs/ condition: hdfs.enabled diff --git a/kubernetes/gaffer-jhub/Chart.yaml b/kubernetes/gaffer-jhub/Chart.yaml index e2737f8b..5b978711 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.0.0 # managed version +version: 2.1.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 index b6c8b35f..26bf8f84 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.0.0" # managed + description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.1.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.0.0 # managed + image: gchq/gaffer-pyspark-notebook:2.1.0 # managed optionsServer: replicaCount: 1 image: @@ -141,4 +141,4 @@ optionsServer: testImages: python: repository: gchq/gaffer-pyspark-notebook - tag: 2.0.0 # managed version + tag: 2.1.0 # managed version diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml index cb2cb126..ec9777dc 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.0.0 # managed version -appVersion: 2.0.0 # managed version +version: 2.1.0 # managed version +appVersion: 2.1.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.0.0 # managed version + version: ^2.1.0 # managed version repository: file://../gaffer/ diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml index a89f66cb..e0cd94b5 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.0.0 # managed version + tag: 2.1.0 # managed version pullPolicy: IfNotPresent pullSecrets: [] resources: {} diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml index 01018758..e976dd03 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.0.0 # managed version -appVersion: 2.0.0 +version: 2.1.0 # managed version +appVersion: 2.1.0 home: https://github.com/gchq/Gaffer sources: - https://github.com/gchq/gaffer-docker dependencies: - name: accumulo - version: ^2.0.0 # managed version + version: ^2.1.0 # managed version repository: file://../accumulo/ condition: accumulo.enabled diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml index 6f9fafea..0f8315f7 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.0.0-accumulo-2.0.1 # managed version + tag: 2.1.0-accumulo-2.0.1 # managed version pullPolicy: IfNotPresent pullSecrets: [] resources: {} @@ -61,7 +61,7 @@ accumulo: enabled: false image: repository: gchq/gaffer - tag: 2.0.0-accumulo-2.0.1 # managed version + tag: 2.1.0-accumulo-2.0.1 # managed version config: postInstallCommands: - users diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml index bccd15d1..9dcbee2d 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.0.0 # managed version +version: 2.1.0 # managed version appVersion: 3.3.3 # managed version From d6848b2bdc0cac97f6463a76b60f86436d8082b8 Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Fri, 12 Jan 2024 15:02:22 +0000 Subject: [PATCH 2/7] Updated copyright headers --- docker/gaffer-kerberos/gaffer-krb/Dockerfile | 2 +- docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile | 2 +- docker/gaffer-pyspark-notebook/Dockerfile | 2 +- docker/gaffer-rest/Dockerfile | 2 +- docker/gaffer-road-traffic-loader/Dockerfile | 2 +- docker/gaffer/Dockerfile | 2 +- docker/gremlin-gaffer/Dockerfile | 2 +- kubernetes/accumulo/Chart.yaml | 2 +- kubernetes/gaffer-jhub/Chart.yaml | 2 +- kubernetes/gaffer-jhub/values.yaml | 2 +- kubernetes/gaffer-road-traffic/Chart.yaml | 2 +- kubernetes/gaffer-road-traffic/values.yaml | 2 +- kubernetes/gaffer/Chart.yaml | 2 +- kubernetes/gaffer/values.yaml | 2 +- kubernetes/hdfs/Chart.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docker/gaffer-kerberos/gaffer-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-krb/Dockerfile index fa2233ad..396b30e0 100644 --- a/docker/gaffer-kerberos/gaffer-krb/Dockerfile +++ b/docker/gaffer-kerberos/gaffer-krb/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2023 Crown Copyright +# Copyright 2023-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile index d10fe932..d504fec5 100644 --- a/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile +++ b/docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2023 Crown Copyright +# Copyright 2023-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gaffer-pyspark-notebook/Dockerfile b/docker/gaffer-pyspark-notebook/Dockerfile index 6818cd8e..616c2682 100644 --- a/docker/gaffer-pyspark-notebook/Dockerfile +++ b/docker/gaffer-pyspark-notebook/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile index 45c863b9..27fe7735 100644 --- a/docker/gaffer-rest/Dockerfile +++ b/docker/gaffer-rest/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gaffer-road-traffic-loader/Dockerfile b/docker/gaffer-road-traffic-loader/Dockerfile index 591d482e..e2220ef9 100644 --- a/docker/gaffer-road-traffic-loader/Dockerfile +++ b/docker/gaffer-road-traffic-loader/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gaffer/Dockerfile b/docker/gaffer/Dockerfile index 93c65af4..1f3b7555 100644 --- a/docker/gaffer/Dockerfile +++ b/docker/gaffer/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docker/gremlin-gaffer/Dockerfile b/docker/gremlin-gaffer/Dockerfile index c450386a..d654c610 100644 --- a/docker/gremlin-gaffer/Dockerfile +++ b/docker/gremlin-gaffer/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2023 Crown Copyright +# Copyright 2023-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/accumulo/Chart.yaml b/kubernetes/accumulo/Chart.yaml index 4146e5c5..51372a23 100644 --- a/kubernetes/accumulo/Chart.yaml +++ b/kubernetes/accumulo/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer-jhub/Chart.yaml b/kubernetes/gaffer-jhub/Chart.yaml index 5b978711..0946d215 100644 --- a/kubernetes/gaffer-jhub/Chart.yaml +++ b/kubernetes/gaffer-jhub/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer-jhub/values.yaml b/kubernetes/gaffer-jhub/values.yaml index 26bf8f84..2c441a3f 100644 --- a/kubernetes/gaffer-jhub/values.yaml +++ b/kubernetes/gaffer-jhub/values.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml index ec9777dc..6f56a838 100644 --- a/kubernetes/gaffer-road-traffic/Chart.yaml +++ b/kubernetes/gaffer-road-traffic/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml index e0cd94b5..6bdc3a89 100644 --- a/kubernetes/gaffer-road-traffic/values.yaml +++ b/kubernetes/gaffer-road-traffic/values.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml index e976dd03..03fcc118 100644 --- a/kubernetes/gaffer/Chart.yaml +++ b/kubernetes/gaffer/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml index 0f8315f7..f5ee5e43 100644 --- a/kubernetes/gaffer/values.yaml +++ b/kubernetes/gaffer/values.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml index 9dcbee2d..6f57041a 100644 --- a/kubernetes/hdfs/Chart.yaml +++ b/kubernetes/hdfs/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 6d4a072cb60cb1863b88f3eeef84f9b99750290d Mon Sep 17 00:00:00 2001 From: t92549 <80890692+t92549@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:08:41 +0000 Subject: [PATCH 3/7] Removed double slash causing spring error --- kubernetes/gaffer/templates/graph-status-check-hook.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/gaffer/templates/graph-status-check-hook.yaml b/kubernetes/gaffer/templates/graph-status-check-hook.yaml index e3ee3ad9..d0b70e13 100644 --- a/kubernetes/gaffer/templates/graph-status-check-hook.yaml +++ b/kubernetes/gaffer/templates/graph-status-check-hook.yaml @@ -1,6 +1,6 @@ {{- /* -Copyright 2020 Crown Copyright +Copyright 2020-2024 Crown Copyright Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,6 +31,6 @@ spec: containers: - name: curl image: {{ .Values.test.images.curl.repository }}:{{ .Values.test.images.curl.tag}} - command: ["/bin/sh", "-c", "statusCode=-1 && until [ \"${statusCode}\" = \"200\" ] || [ $(( ATTEMPTS++ )) -gt 300 ]; do sleep 1; statusCode=$(curl -f -s -o /dev/null -w \"%{http_code}\" http://{{ include "gaffer.fullname" . }}-api:80/{{ pluck "server.context-path" .Values.graph.applicationProperties | first }}/graph/status); echo \"$(date) - http://{{ include "gaffer.fullname" . }}-api:80{{ pluck "server.context-path" .Values.graph.applicationProperties | first }}/graph/status : ${statusCode}\"; done; [ \"${statusCode}\" != \"200\" ] && exit 1; exit 0"] + command: ["/bin/sh", "-c", "statusCode=-1 && until [ \"${statusCode}\" = \"200\" ] || [ $(( ATTEMPTS++ )) -gt 300 ]; do sleep 1; statusCode=$(curl -f -s -o /dev/null -w \"%{http_code}\" http://{{ include "gaffer.fullname" . }}-api:80{{ pluck "server.context-path" .Values.graph.applicationProperties | first }}/graph/status); echo \"$(date) - http://{{ include "gaffer.fullname" . }}-api:80{{ pluck "server.context-path" .Values.graph.applicationProperties | first }}/graph/status : ${statusCode}\"; done; [ \"${statusCode}\" != \"200\" ] && exit 1; exit 0"] restartPolicy: Never {{- end }} From dd7baa8808e78c4c5b5e44b9d5ff1544c5a82726 Mon Sep 17 00:00:00 2001 From: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:33:17 +0000 Subject: [PATCH 4/7] Update type schema for road-traffic-data-loader Changed in Gaffer PR 2966 --- docker/gaffer-road-traffic-loader/config/schema/types.json | 6 +++--- kubernetes/gaffer-road-traffic/values.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/gaffer-road-traffic-loader/config/schema/types.json b/docker/gaffer-road-traffic-loader/config/schema/types.json index ecb051c7..a0deb5bc 100644 --- a/docker/gaffer-road-traffic-loader/config/schema/types.json +++ b/docker/gaffer-road-traffic-loader/config/schema/types.json @@ -100,12 +100,12 @@ } }, "hllp": { - "class": "com.clearspring.analytics.stream.cardinality.HyperLogLogPlus", + "class": "org.apache.datasketches.hll.HllSketch", "aggregateFunction": { - "class": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.binaryoperator.HyperLogLogPlusAggregator" + "class": "uk.gov.gchq.gaffer.sketches.datasketches.cardinality.binaryoperator.HllSketchAggregator" }, "serialiser": { - "class": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.serialisation.HyperLogLogPlusSerialiser" + "class": "uk.gov.gchq.gaffer.sketches.datasketches.cardinality.serialisation.HllSketchSerialiser" } }, "counts.freqmap": { diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml index 6bdc3a89..38978710 100644 --- a/kubernetes/gaffer-road-traffic/values.yaml +++ b/kubernetes/gaffer-road-traffic/values.yaml @@ -206,12 +206,12 @@ gaffer: } }, "hllp": { - "class": "com.clearspring.analytics.stream.cardinality.HyperLogLogPlus", + "class": "org.apache.datasketches.hll.HllSketch", "aggregateFunction": { - "class": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.binaryoperator.HyperLogLogPlusAggregator" + "class": "uk.gov.gchq.gaffer.sketches.datasketches.cardinality.binaryoperator.HllSketchAggregator" }, "serialiser": { - "class": "uk.gov.gchq.gaffer.sketches.clearspring.cardinality.serialisation.HyperLogLogPlusSerialiser" + "class": "uk.gov.gchq.gaffer.sketches.datasketches.cardinality.serialisation.HllSketchSerialiser" } }, "counts.freqmap": { From 89fb17426e71a9998aad6f62f3f4aa39f41b1b1d Mon Sep 17 00:00:00 2001 From: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:38:57 +0000 Subject: [PATCH 5/7] Hotfix for missing sketches classes See Gaffer issue #3159 --- docker/gaffer/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/gaffer/Dockerfile b/docker/gaffer/Dockerfile index 1f3b7555..ffbb9fd5 100644 --- a/docker/gaffer/Dockerfile +++ b/docker/gaffer/Dockerfile @@ -60,5 +60,9 @@ RUN allFilesDownloaded="TRUE" && \ done \ fi +# Hotfix for Gaffer 2.1.0, see Gaffer issue #3159 +RUN wget -nv "${GAFFER_DOWNLOAD_URL}/org/apache/datasketches/datasketches-memory/2.2.0/datasketches-memory-2.2.0.jar" +RUN wget -nv "${GAFFER_DOWNLOAD_URL}/org/apache/datasketches/datasketches-java/4.0.0/datasketches-java-4.0.0.jar" + FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} COPY --from=builder --chown=root:root /jars/*.jar /opt/accumulo/lib/ext/ From a6c62df4a035792412cc76c8c9517fc1e1d7b05f Mon Sep 17 00:00:00 2001 From: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:06:10 +0000 Subject: [PATCH 6/7] Free extra disk space in Actions runner Update settings for build space action in continuous-integration.yaml --- .github/workflows/continuous-integration.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index d55dba4f..cd2a976c 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Crown Copyright +# Copyright 2020-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,11 +27,13 @@ jobs: steps: - name: Maximize build space - uses: easimon/maximize-build-space@v4 + uses: easimon/maximize-build-space@v10 with: remove-dotnet: 'true' remove-android: 'true' - overprovision-lvm: 'true' + remove-haskell: 'true' + remove-codeql: 'true' + remove-docker-images: 'true' - uses: actions/checkout@v4 with: From 4cd4f0d9e430233ac3b3de694f0f8aeda69b7394 Mon Sep 17 00:00:00 2001 From: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:20:49 +0000 Subject: [PATCH 7/7] Free more runner disk space --- .github/workflows/continuous-integration.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index cd2a976c..fc97fbc4 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -34,6 +34,8 @@ jobs: remove-haskell: 'true' remove-codeql: 'true' remove-docker-images: 'true' + swap-size-mb: 1024 + overprovision-lvm: 'true' - uses: actions/checkout@v4 with: