Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh-338: Updating Gaffer version to 2.1.0 #339

Merged
merged 7 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/accumulo1.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions docker/accumulo2.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/gaffer-federated-integration-tests/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-integration-tests/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/gaffer-kerberos/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-kerberos/gaffer-integration-tests-krb/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-kerberos/gaffer-krb/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-pyspark-notebook/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-pyspark-notebook/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/gaffer-rest/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GAFFER_VERSION=2.0.0
GAFFER_VERSION=2.1.0
ACCUMULO_VERSION=2.0.1
4 changes: 2 additions & 2 deletions docker/gaffer-rest/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/gaffer-road-traffic-loader/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-road-traffic-loader/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/gaffer/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/gremlin-gaffer/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/gremlin-gaffer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions kubernetes/accumulo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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:
Expand All @@ -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
4 changes: 2 additions & 2 deletions kubernetes/gaffer-jhub/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/gaffer-jhub/values.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -141,4 +141,4 @@ optionsServer:
testImages:
python:
repository: gchq/gaffer-pyspark-notebook
tag: 2.0.0 # managed version
tag: 2.1.0 # managed version
8 changes: 4 additions & 4 deletions kubernetes/gaffer-road-traffic/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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/
4 changes: 2 additions & 2 deletions kubernetes/gaffer-road-traffic/values.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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: {}
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/gaffer/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
6 changes: 3 additions & 3 deletions kubernetes/gaffer/values.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/hdfs/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Loading