Skip to content

Commit cf6dc39

Browse files
d47853d47853
authored
Gh 74 update gaffer version (#77)
* gh-74 Updated Gaffer version * gh-74 Updated App version for minor release
1 parent 684e931 commit cf6dc39

File tree

22 files changed

+35
-35
lines changed

22 files changed

+35
-35
lines changed

‎app_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.1
1+
0.6.0

‎cd/install.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ buildImages
5050

5151
# Deploy Images to Kind
5252
kind load docker-image gchq/hdfs:3.2.1
53-
kind load docker-image gchq/gaffer:1.11.0
54-
kind load docker-image gchq/gaffer-rest:1.11.0
55-
kind load docker-image gchq/gaffer-road-traffic-loader:1.11.0
56-
kind load docker-image gchq/gaffer-operation-runner:1.11.0
53+
kind load docker-image gchq/gaffer:1.12.0
54+
kind load docker-image gchq/gaffer-rest:1.12.0
55+
kind load docker-image gchq/gaffer-road-traffic-loader:1.12.0
56+
kind load docker-image gchq/gaffer-operation-runner:1.12.0
5757

5858
# Deploy containers onto Kind
5959
# Travis needs this setting to avoid reverse dns lookup errors

‎docker/gaffer-operation-runner/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GAFFER_VERSION=1.11.0
2-
GAFFER_TOOLS_VERSION=1.11.0
1+
GAFFER_VERSION=1.12.0
2+
GAFFER_TOOLS_VERSION=1.12.0
33
ACCUMULO_VERSION=1.9.3
44
HADOOP_VERSION=3.2.1
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf

‎docker/gaffer-operation-runner/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ARG BUILDER_IMAGE_NAME=maven
1616
ARG BUILDER_IMAGE_TAG=3.6.3-jdk-8
1717

1818
ARG BASE_IMAGE_NAME=gchq/gaffer
19-
ARG BASE_IMAGE_TAG=1.11.0
19+
ARG BASE_IMAGE_TAG=1.12.0
2020

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

‎docker/gaffer-operation-runner/operation-runner/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>uk.gov.gchq.gaffer</groupId>
3737
<artifactId>graph</artifactId>
38-
<version>1.11.0</version>
38+
<version>1.12.0</version>
3939
</dependency>
4040
</dependencies>
4141

‎docker/gaffer-rest/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GAFFER_VERSION=1.11.0
2-
GAFFER_TOOLS_VERSION=1.11.0
1+
GAFFER_VERSION=1.12.0
2+
GAFFER_TOOLS_VERSION=1.12.0

‎docker/gaffer-rest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=10.1.0.Final
2020

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

23-
ARG GAFFER_VERSION=1.11.0
23+
ARG GAFFER_VERSION=1.12.0
2424
ARG GAFFER_TOOLS_VERSION=${GAFFER_VERSION}
2525
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
2626
ARG GAFFER_TOOLS_GIT_REPO=https://github.com/gchq/gaffer-tools.git

‎docker/gaffer-road-traffic-loader/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GAFFER_VERSION=1.11.0
2-
GAFFER_TOOLS_VERSION=1.11.0
1+
GAFFER_VERSION=1.12.0
2+
GAFFER_TOOLS_VERSION=1.12.0
33
ACCUMULO_VERSION=1.9.3
44
HADOOP_VERSION=3.2.1
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf

‎docker/gaffer-road-traffic-loader/Dockerfile

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

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

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

‎docker/gaffer/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GAFFER_VERSION=1.11.0
2-
GAFFER_TOOLS_VERSION=1.11.0
1+
GAFFER_VERSION=1.12.0
2+
GAFFER_TOOLS_VERSION=1.12.0
33
ACCUMULO_VERSION=1.9.3
44
HADOOP_VERSION=3.2.1
55
ACCUMULO_CONF_DIR=/etc/accumulo/conf

‎docker/gaffer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=1.9.3
2020

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

23-
ARG GAFFER_VERSION=1.11.0
23+
ARG GAFFER_VERSION=1.12.0
2424
ARG GAFFER_LIBS=bitmap-library,sketches-library,time-library
2525
ARG GAFFER_DOWNLOAD_URL=https://repo1.maven.org/maven2
2626
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git

‎kubernetes/aws-eks-deployment.md

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

2121
```bash
2222
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
23-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
23+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
2424
export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-$GAFFER_VERSION}
2525

2626
docker-compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build

‎kubernetes/gaffer-road-traffic/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ apiVersion: v2
1616
name: gaffer-road-traffic
1717
description: A Gaffer instance containing sample GB road traffic data from the Department of Transport
1818
type: application
19-
version: 0.5.1
20-
appVersion: 1.11.0
19+
version: 0.6.0
20+
appVersion: 1.12.0
2121
home: https://github.com/gchq/Gaffer
2222
sources:
2323
- https://github.com/gchq/gaffer-docker
2424
- https://data.gov.uk/dataset/208c0e7b-353f-4e2d-8b7a-1a7118467acc/gb-road-traffic-counts
2525
dependencies:
2626
- name: gaffer
27-
version: ^0.5.1
27+
version: ^0.6.0
2828
repository: file://../gaffer/

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Deploy the Helm Chart with:
2727

2828
```
2929
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
30-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
30+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
3131
3232
helm dependency update ../gaffer/
3333
helm dependency update

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

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

55
```bash
66
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
7-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
7+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
88

99
helm dependency update ../gaffer/
1010
helm dependency update

‎kubernetes/gaffer-road-traffic/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fullnameOverride: ""
1818
loader:
1919
image:
2020
repository: gchq/gaffer-road-traffic-loader
21-
tag: 1.11.0
21+
tag: 1.12.0
2222
pullPolicy: IfNotPresent
2323
pullSecrets: []
2424
resources: {}

‎kubernetes/gaffer/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ apiVersion: v2
1616
name: gaffer
1717
description: A large-scale entity and relation database supporting aggregation of properties
1818
type: application
19-
version: 0.5.1
20-
appVersion: 1.11.0
19+
version: 0.6.0
20+
appVersion: 1.12.0
2121
home: https://github.com/gchq/Gaffer
2222
sources:
2323
- https://github.com/gchq/gaffer-docker
@@ -27,6 +27,6 @@ dependencies:
2727
repository: https://kubernetes-charts-incubator.storage.googleapis.com
2828
condition: zookeeper.enabled
2929
- name: hdfs
30-
version: ^0.5.1
30+
version: ^0.6.0
3131
repository: file://../hdfs/
3232
condition: hdfs.enabled

‎kubernetes/gaffer/docs/aws-eks-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Deploy the Helm Chart with:
2626

2727
```bash
2828
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
29-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
29+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
3030

3131
helm dependency update
3232

‎kubernetes/gaffer/docs/kind-deployment.md

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

55
```bash
66
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
7-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
7+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
88

99
helm dependency update
1010

‎kubernetes/gaffer/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ accumulo:
103103

104104
image:
105105
repository: gchq/gaffer
106-
tag: 1.11.0
106+
tag: 1.12.0
107107
pullPolicy: IfNotPresent
108108
pullSecrets: []
109109

@@ -156,7 +156,7 @@ api:
156156
replicaCount: 1
157157
image:
158158
repository: gchq/gaffer-rest
159-
tag: 1.11.0
159+
tag: 1.12.0
160160
pullPolicy: IfNotPresent
161161
pullSecrets: []
162162
resources: {}
@@ -183,4 +183,4 @@ testImages:
183183
tag: 7.67.0
184184
operationRunner:
185185
repository: gchq/gaffer-operation-runner
186-
tag: 1.11.0
186+
tag: 1.12.0

‎kubernetes/hdfs/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ apiVersion: v2
1616
name: hdfs
1717
description: Deploys the Hadoop Distributed File System (HDFS)
1818
type: application
19-
version: 0.5.1
19+
version: 0.6.0
2020
appVersion: 3.2.1

‎kubernetes/kind-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If the versions of the container images you would like to deploy are not availab
2525

2626
```bash
2727
export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
28-
export GAFFER_VERSION=${GAFFER_VERSION:-1.11.0}
28+
export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
2929
export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-$GAFFER_VERSION}
3030

3131
docker-compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build

0 commit comments

Comments
 (0)