Skip to content

Commit 378276f

Browse files
t92549t92549
authored
Gh-306: Update Gaffer version to 2.0.0-alpha-0.6 (#307)
* Update gaffer version to 2.0.0-alpha-0.6 * Added ToCsv fixes
1 parent 25d49e8 commit 378276f

File tree

32 files changed

+56
-46
lines changed

32 files changed

+56
-46
lines changed

Diff for: ‎docker/accumulo1.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ HADOOP_VERSION=3.2.2
33
ACCUMULO_VERSION=1.9.3
44
HADOOP_CONF_DIR=/etc/hadoop/conf
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf
6-
GAFFER_VERSION=2.0.0-alpha-0.5
7-
GAFFERPY_VERSION=2.0.0-alpha-0.5
6+
GAFFER_VERSION=2.0.0-alpha-0.6
7+
GAFFERPY_VERSION=2.0.0-alpha-0.6
88
SPARK_VERSION=3.1.2

Diff for: ‎docker/accumulo2.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ HADOOP_VERSION=3.3.3
33
ACCUMULO_VERSION=2.0.1
44
HADOOP_CONF_DIR=/etc/hadoop/conf
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf
6-
GAFFER_VERSION=2.0.0-alpha-0.5
7-
GAFFERPY_VERSION=2.0.0-alpha-0.5
6+
GAFFER_VERSION=2.0.0-alpha-0.6
7+
GAFFERPY_VERSION=2.0.0-alpha-0.6
88
SPARK_VERSION=3.1.2

Diff for: ‎docker/gaffer-federated-integration-tests/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZOOKEEPER_VERSION=3.7.1
2-
GAFFER_VERSION=2.0.0-alpha-0.5
3-
GAFFER_TESTER_VERSION=2.0.0-alpha-0.5
2+
GAFFER_VERSION=2.0.0-alpha-0.6
3+
GAFFER_TESTER_VERSION=2.0.0-alpha-0.6
44
ACCUMULO_VERSION=2.0.1
55
HADOOP_VERSION=3.3.3
66
ACCUMULO_CONF_DIR=/etc/accumulo/conf

Diff for: ‎docker/gaffer-integration-tests/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZOOKEEPER_VERSION=3.7.1
2-
GAFFER_VERSION=2.0.0-alpha-0.5
3-
GAFFER_TESTER_VERSION=2.0.0-alpha-0.5
2+
GAFFER_VERSION=2.0.0-alpha-0.6
3+
GAFFER_TESTER_VERSION=2.0.0-alpha-0.6
44
ACCUMULO_VERSION=2.0.1
55
HADOOP_VERSION=3.3.3
66
ACCUMULO_CONF_DIR=/etc/accumulo/conf

Diff for: ‎docker/gaffer-kerberos/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GAFFER_VERSION=2.0.0-alpha-0.5
1+
GAFFER_VERSION=2.0.0-alpha-0.6
22
GAFFER_KRB_PASSWORD=change-password-for-gaffer
33

44
ZOOKEEPER_VERSION=3.7.1

Diff for: ‎docker/gaffer-kerberos/gaffer-krb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE_NAME=gchq/gaffer
16-
ARG BASE_IMAGE_TAG=2.0.0-alpha-0.5
16+
ARG BASE_IMAGE_TAG=2.0.0-alpha-0.6
1717

1818
ARG USER=accumulo
1919
ARG GROUP=accumulo

Diff for: ‎docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE_NAME=gchq/gaffer-rest
16-
ARG BASE_IMAGE_TAG=2.0.0-alpha-0.5
16+
ARG BASE_IMAGE_TAG=2.0.0-alpha-0.6
1717

1818
FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
1919

Diff for: ‎docker/gaffer-pyspark-notebook/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZOOKEEPER_VERSION=3.7.1
2-
GAFFER_VERSION=2.0.0-alpha-0.5
3-
GAFFERPY_VERSION=2.0.0-alpha-0.5
2+
GAFFER_VERSION=2.0.0-alpha-0.6
3+
GAFFERPY_VERSION=2.0.0-alpha-0.6
44
ACCUMULO_VERSION=2.0.1
55
HADOOP_VERSION=3.3.3
66
SPARK_VERSION=3.1.2

Diff for: ‎docker/gaffer-pyspark-notebook/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ARG KUBECTL_VERSION=1.23.0
6060
RUN curl -fLo /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
6161
chmod +x /bin/kubectl
6262

63-
ARG GAFFERPY_VERSION=gaffer-tools-2.0.0-alpha-0.5
63+
ARG GAFFERPY_VERSION=gaffer-tools-2.0.0-alpha-0.6
6464
RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gaffer-tools && \
6565
pushd gaffer-tools/python-shell && \
6666
python setup.py install && \

Diff for: ‎docker/gaffer-pyspark-notebook/examples/gaffer-rest-api-road-traffic-example.ipynb

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -18,6 +19,7 @@
1819
]
1920
},
2021
{
22+
"attachments": {},
2123
"cell_type": "markdown",
2224
"metadata": {},
2325
"source": [
@@ -46,6 +48,7 @@
4648
]
4749
},
4850
{
51+
"attachments": {},
4952
"cell_type": "markdown",
5053
"metadata": {},
5154
"source": [
@@ -73,6 +76,7 @@
7376
]
7477
},
7578
{
79+
"attachments": {},
7680
"cell_type": "markdown",
7781
"metadata": {},
7882
"source": [
@@ -96,6 +100,7 @@
96100
]
97101
},
98102
{
103+
"attachments": {},
99104
"cell_type": "markdown",
100105
"metadata": {},
101106
"source": [
@@ -116,6 +121,7 @@
116121
]
117122
},
118123
{
124+
"attachments": {},
119125
"cell_type": "markdown",
120126
"metadata": {},
121127
"source": [
@@ -141,6 +147,7 @@
141147
]
142148
},
143149
{
150+
"attachments": {},
144151
"cell_type": "markdown",
145152
"metadata": {},
146153
"source": [
@@ -177,6 +184,7 @@
177184
]
178185
},
179186
{
187+
"attachments": {},
180188
"cell_type": "markdown",
181189
"metadata": {},
182190
"source": [
@@ -232,6 +240,7 @@
232240
]
233241
},
234242
{
243+
"attachments": {},
235244
"cell_type": "markdown",
236245
"metadata": {},
237246
"source": [
@@ -293,6 +302,7 @@
293302
]
294303
},
295304
{
305+
"attachments": {},
296306
"cell_type": "markdown",
297307
"metadata": {},
298308
"source": [
@@ -343,7 +353,7 @@
343353
" ),\n",
344354
" gaffer.ToCsv(\n",
345355
" include_header=True,\n",
346-
" element_generator=gaffer.CsvGenerator(\n",
356+
" csv_generator=gaffer.CsvGenerator(\n",
347357
" quoted=False,\n",
348358
" comma_replacement=\" \",\n",
349359
" fields={'VERTEX': 'Junction', 'startDate': 'StartDate', 'CAR': 'CarCount'}\n",
@@ -382,7 +392,7 @@
382392
"name": "python",
383393
"nbconvert_exporter": "python",
384394
"pygments_lexer": "ipython3",
385-
"version": "3.8.6"
395+
"version": "3.8.10"
386396
}
387397
},
388398
"nbformat": 4,

Diff for: ‎docker/gaffer-rest/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GAFFER_VERSION=2.0.0-alpha-0.5
1+
GAFFER_VERSION=2.0.0-alpha-0.6
22
ACCUMULO_VERSION=2.0.1

Diff for: ‎docker/gaffer-rest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=8-jre-alpine
2121
FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
2222

2323
ARG ACCUMULO_VERSION=2.0.1
24-
ARG GAFFER_VERSION=2.0.0-alpha-0.5
24+
ARG GAFFER_VERSION=2.0.0-alpha-0.6
2525
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
2626
ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
2727

Diff for: ‎docker/gaffer-road-traffic-loader/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ZOOKEEPER_VERSION=3.7.1
2-
GAFFER_VERSION=2.0.0-alpha-0.5
2+
GAFFER_VERSION=2.0.0-alpha-0.6
33
ACCUMULO_VERSION=2.0.1
44
HADOOP_VERSION=3.3.3
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf

Diff for: ‎docker/gaffer-road-traffic-loader/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=8u322-jre-slim-bullseye
2020

2121
FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
2222

23-
ARG GAFFER_VERSION=2.0.0-alpha-0.5
23+
ARG GAFFER_VERSION=2.0.0-alpha-0.6
2424
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
2525
ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
2626

Diff for: ‎docker/gaffer/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ZOOKEEPER_VERSION=3.7.1
2-
GAFFER_VERSION=2.0.0-alpha-0.5
2+
GAFFER_VERSION=2.0.0-alpha-0.6
33
ACCUMULO_VERSION=2.0.1
44
HADOOP_VERSION=3.3.3
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf

Diff for: ‎docker/gaffer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG BASE_IMAGE_TAG=2.0.1
2121
FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
2222

2323
ARG BASE_IMAGE_TAG
24-
ARG GAFFER_VERSION=2.0.0-alpha-0.5
24+
ARG GAFFER_VERSION=2.0.0-alpha-0.6
2525
ARG GAFFER_LIBS=bitmap-library,sketches-library,time-library
2626
ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
2727
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git

Diff for: ‎kubernetes/accumulo/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apiVersion: v2
1515
name: accumulo
1616
description: A Key-Value Accumulo store
1717
type: application
18-
version: 2.0.0-alpha-0.5 # managed version
18+
version: 2.0.0-alpha-0.6 # managed version
1919
appVersion: 2.0.1
2020
home: https://github.com/gchq/Gaffer
2121
sources:
@@ -26,6 +26,6 @@ dependencies:
2626
repository: https://charts.helm.sh/incubator/
2727
condition: zookeeper.enabled
2828
- name: hdfs
29-
version: ^2.0.0-alpha-0.5 # managed version
29+
version: ^2.0.0-alpha-0.6 # managed version
3030
repository: file://../hdfs/
3131
condition: hdfs.enabled

Diff for: ‎kubernetes/accumulo/docs/kind-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ First follow the [instructions here](../../docs/kind-deployment.md) to provision
77

88
```bash
99
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
10-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
10+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
1111

1212
helm dependency update
1313

Diff for: ‎kubernetes/docs/aws-eks-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following instructions build all the container images and host them in AWS E
1818

1919
```bash
2020
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
21-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
21+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
2222

2323
docker compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build
2424
docker compose --project-directory ../docker/gaffer-road-traffic-loader/ -f ../docker/gaffer-road-traffic-loader/docker-compose.yaml build

Diff for: ‎kubernetes/docs/kind-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To import the images, run this from the kubernetes directory:
2323

2424
```bash
2525
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
26-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
26+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
2727

2828
docker compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build
2929
docker compose --project-directory ../docker/gaffer-road-traffic-loader/ -f ../docker/gaffer-road-traffic-loader/docker-compose.yaml build

Diff for: ‎kubernetes/gaffer-jhub/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apiVersion: v2
1515
name: gaffer-jhub
1616
description: A Jupyter Hub instance, with Gaffer integrations
1717
type: application
18-
version: 2.0.0-alpha-0.5 # managed version
18+
version: 2.0.0-alpha-0.6 # managed version
1919
home: https://github.com/gchq/Gaffer
2020
sources:
2121
- https://github.com/gchq/gaffer-docker

Diff for: ‎kubernetes/gaffer-jhub/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jupyterhub:
6565
kubespawner_override:
6666
image: jupyter/minimal-notebook:399cbb986c6b
6767
- display_name: "Gaffer pySpark Notebook"
68-
description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.0.0-alpha-0.5" # managed
68+
description: "Python 3, Hadoop 3.3.3, Spark 3.1.2, AWS CLI 2, kubectl 1.23.0, gafferpy 2.0.0-alpha-0.6" # managed
6969
slug: "gaffer-pyspark"
7070
default: true
7171
enable_hdfs: true
@@ -74,7 +74,7 @@ jupyterhub:
7474
spark_image: gchq/spark-py:3.1.2 # managed
7575
spark_ingress_host: "{{USERNAME}}-{{SERVERNAME}}.spark.example.com"
7676
kubespawner_override:
77-
image: gchq/gaffer-pyspark-notebook:2.0.0-alpha-0.5 # managed
77+
image: gchq/gaffer-pyspark-notebook:2.0.0-alpha-0.6 # managed
7878
optionsServer:
7979
replicaCount: 1
8080
image:
@@ -141,4 +141,4 @@ optionsServer:
141141
testImages:
142142
python:
143143
repository: gchq/gaffer-pyspark-notebook
144-
tag: 2.0.0-alpha-0.5 # managed version
144+
tag: 2.0.0-alpha-0.6 # managed version

Diff for: ‎kubernetes/gaffer-road-traffic/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ apiVersion: v2
1515
name: gaffer-road-traffic
1616
description: A Gaffer instance containing sample GB road traffic data from the Department of Transport
1717
type: application
18-
version: 2.0.0-alpha-0.5 # managed version
19-
appVersion: 2.0.0-alpha-0.5 # managed version
18+
version: 2.0.0-alpha-0.6 # managed version
19+
appVersion: 2.0.0-alpha-0.6 # managed version
2020
home: https://github.com/gchq/Gaffer
2121
sources:
2222
- https://github.com/gchq/gaffer-docker
2323
- https://data.gov.uk/dataset/208c0e7b-353f-4e2d-8b7a-1a7118467acc/gb-road-traffic-counts
2424
dependencies:
2525
- name: gaffer
26-
version: ^2.0.0-alpha-0.5 # managed version
26+
version: ^2.0.0-alpha-0.6 # managed version
2727
repository: file://../gaffer/

Diff for: ‎kubernetes/gaffer-road-traffic/config/tests/query2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
{
107107
"class" : "uk.gov.gchq.gaffer.operation.impl.output.ToCsv",
108108
"includeHeader" : false,
109-
"elementGenerator" : {
109+
"csvGenerator" : {
110110
"class" : "uk.gov.gchq.gaffer.data.generator.CsvGenerator",
111111
"fields" : {
112112
"VERTEX" : "Junction",

Diff for: ‎kubernetes/gaffer-road-traffic/docs/aws-eks-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Finally, deploy the Helm Chart by running this from the kubernetes/gaffer-road-t
3333

3434
```
3535
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
36-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
36+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
3737
3838
helm dependency update ../accumulo/
3939
helm dependency update ../gaffer/

Diff for: ‎kubernetes/gaffer-road-traffic/docs/kind-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ After the cluster is provisioned, update the values.yaml with the passwords for
88
Once that's done, run this to deploy and test the Road Traffic Graph.
99
```bash
1010
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
11-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
11+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
1212

1313
helm dependency update ../accumulo/
1414
helm dependency update ../gaffer/

Diff for: ‎kubernetes/gaffer-road-traffic/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ labels: {}
1717
loader:
1818
image:
1919
repository: gchq/gaffer-road-traffic-loader
20-
tag: 2.0.0-alpha-0.5 # managed version
20+
tag: 2.0.0-alpha-0.6 # managed version
2121
pullPolicy: IfNotPresent
2222
pullSecrets: []
2323
resources: {}

Diff for: ‎kubernetes/gaffer/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ apiVersion: v2
1515
name: gaffer
1616
description: A large-scale entity and relation database supporting aggregation of properties
1717
type: application
18-
version: 2.0.0-alpha-0.5 # managed version
19-
appVersion: 2.0.0-alpha-0.5
18+
version: 2.0.0-alpha-0.6 # managed version
19+
appVersion: 2.0.0-alpha-0.6
2020
home: https://github.com/gchq/Gaffer
2121
sources:
2222
- https://github.com/gchq/gaffer-docker
2323
dependencies:
2424
- name: accumulo
25-
version: ^2.0.0-alpha-0.5 # managed version
25+
version: ^2.0.0-alpha-0.6 # managed version
2626
repository: file://../accumulo/
2727
condition: accumulo.enabled

Diff for: ‎kubernetes/gaffer/docs/aws-eks-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ By default the gaffer graph uses the in-memory MapStore. If you want to use an a
3232

3333
```bash
3434
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
35-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
35+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
3636

3737
helm dependency update ../accumulo/
3838
helm dependency update ../gaffer/

Diff for: ‎kubernetes/gaffer/docs/kind-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The standard Gaffer deployment will give you an in-memory store. To change this
99

1010
```bash
1111
export HADOOP_VERSION=${HADOOP_VERSION:-3.3.3}
12-
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.5}
12+
export GAFFER_VERSION=${GAFFER_VERSION:-2.0.0-alpha-0.6}
1313

1414
helm dependency update
1515

0 commit comments

Comments
 (0)