Gh 99 update gaffer version (#108)

* gh-99 updated versions * gh-99 Updated gaffer version to 1.13.4 * gh-99 Fixed chart versions
gchq · Oct 28, 2020 · d171d13 · d171d13
1 parent f56f9eb
commit d171d13
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 38 deletions.
diff --git a/app_version b/app_version
@@ -1 +1 @@
-0.6.3
+0.7.0
diff --git a/cd/install.sh b/cd/install.sh
@@ -50,10 +50,10 @@ buildImages
 
 # Deploy Images to Kind
 kind load docker-image gchq/hdfs:3.2.1
-kind load docker-image gchq/gaffer:1.12.0
-kind load docker-image gchq/gaffer-rest:1.12.0
-kind load docker-image gchq/gaffer-road-traffic-loader:1.12.0
-kind load docker-image gchq/gaffer-operation-runner:1.12.0
+kind load docker-image gchq/gaffer:1.13.4
+kind load docker-image gchq/gaffer-rest:1.13.4
+kind load docker-image gchq/gaffer-road-traffic-loader:1.13.4
+kind load docker-image gchq/gaffer-operation-runner:1.13.4
 
 # Deploy containers onto Kind
 # Travis needs this setting to avoid reverse dns lookup errors

diff --git a/docker/gaffer-operation-runner/.env b/docker/gaffer-operation-runner/.env
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.12.0
-GAFFER_TOOLS_VERSION=1.12.0
+GAFFER_VERSION=1.13.4
+GAFFER_TOOLS_VERSION=1.13.1
 ACCUMULO_VERSION=1.9.3
 HADOOP_VERSION=3.2.1
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer-operation-runner/Dockerfile b/docker/gaffer-operation-runner/Dockerfile
@@ -16,7 +16,7 @@ ARG BUILDER_IMAGE_NAME=maven
 ARG BUILDER_IMAGE_TAG=3.6.3-jdk-8
 
 ARG BASE_IMAGE_NAME=gchq/gaffer
-ARG BASE_IMAGE_TAG=1.12.0
+ARG BASE_IMAGE_TAG=1.13.4
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 

diff --git a/docker/gaffer-operation-runner/operation-runner/pom.xml b/docker/gaffer-operation-runner/operation-runner/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>uk.gov.gchq.gaffer</groupId>
       <artifactId>graph</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.4</version>
     </dependency>
   </dependencies>
 

diff --git a/docker/gaffer-rest/.env b/docker/gaffer-rest/.env
@@ -1,2 +1,2 @@
-GAFFER_VERSION=1.12.0
-GAFFER_TOOLS_VERSION=1.12.0
+GAFFER_VERSION=1.13.4
+GAFFER_TOOLS_VERSION=1.13.1
diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile
@@ -20,8 +20,8 @@ ARG BASE_IMAGE_TAG=10.1.0.Final
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=1.12.0
-ARG GAFFER_TOOLS_VERSION=${GAFFER_VERSION}
+ARG GAFFER_VERSION=1.13.4
+ARG GAFFER_TOOLS_VERSION=1.13.1
 ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
 ARG GAFFER_TOOLS_GIT_REPO=https://github.com/gchq/gaffer-tools.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
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.12.0
-GAFFER_TOOLS_VERSION=1.12.0
+GAFFER_VERSION=1.13.4
+GAFFER_TOOLS_VERSION=1.13.1
 ACCUMULO_VERSION=1.9.3
 HADOOP_VERSION=3.2.1
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer-road-traffic-loader/Dockerfile b/docker/gaffer-road-traffic-loader/Dockerfile
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=8u242-jre-slim-buster
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=1.12.0
+ARG GAFFER_VERSION=1.13.4
 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
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.12.0
-GAFFER_TOOLS_VERSION=1.12.0
+GAFFER_VERSION=1.13.4
+GAFFER_TOOLS_VERSION=1.13.1
 ACCUMULO_VERSION=1.9.3
 HADOOP_VERSION=3.2.1
 ACCUMULO_CONF_DIR=/etc/accumulo/conf

diff --git a/docker/gaffer/Dockerfile b/docker/gaffer/Dockerfile
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=1.9.3
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=1.12.0
+ARG GAFFER_VERSION=1.13.4
 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/docs/aws-eks-deployment.md b/kubernetes/docs/aws-eks-deployment.md
@@ -21,8 +21,8 @@ The following instructions build all the container images and host them in AWS E
 
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
-export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-$GAFFER_VERSION}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
+export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.13.1}
 
 docker-compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build
 docker-compose --project-directory ../docker/gaffer-operation-runner/ -f ../docker/gaffer-operation-runner/docker-compose.yaml build 

diff --git a/kubernetes/docs/kind-deployment.md b/kubernetes/docs/kind-deployment.md
@@ -27,8 +27,8 @@ To import the images, run this from the kubernetes directory:
 
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
-export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-$GAFFER_VERSION}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
+export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.13.1}
 
 docker-compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build
 docker-compose --project-directory ../docker/gaffer-operation-runner/ -f ../docker/gaffer-operation-runner/docker-compose.yaml build

diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml
@@ -16,13 +16,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: 0.6.3 # managed version
-appVersion: 1.12.0 
+version: 0.7.0 # managed version
+appVersion: 1.13.4 
 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: ^0.6.3 # managed version
+  version: ^0.7.0 # managed version
   repository: file://../gaffer/
diff --git a/kubernetes/gaffer-road-traffic/docs/aws-eks-deployment.md b/kubernetes/gaffer-road-traffic/docs/aws-eks-deployment.md
@@ -33,7 +33,7 @@ Finally, deploy the Helm Chart by running this from the kubernetes/gaffer-road-t
 
 ```
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
 
 helm dependency update ../gaffer/
 helm dependency update

diff --git a/kubernetes/gaffer-road-traffic/docs/kind-deployment.md b/kubernetes/gaffer-road-traffic/docs/kind-deployment.md
@@ -8,7 +8,7 @@ After the cluster is provisioned, update the values.yaml with the passwords for
 Once that's done, run this to deploy and test the Road Traffic Graph. 
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
 
 helm dependency update ../gaffer/
 helm dependency update

diff --git a/kubernetes/gaffer-road-traffic/values.yaml b/kubernetes/gaffer-road-traffic/values.yaml
@@ -18,7 +18,7 @@ fullnameOverride: ""
 loader:
   image:
     repository: gchq/gaffer-road-traffic-loader
-    tag: 1.12.0
+    tag: 1.13.4
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}

diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml
@@ -16,8 +16,8 @@ apiVersion: v2
 name: gaffer
 description: A large-scale entity and relation database supporting aggregation of properties
 type: application
-version: 0.6.3 # managed version
-appVersion: 1.12.0
+version: 0.7.0 # managed version
+appVersion: 1.13.4
 home: https://github.com/gchq/Gaffer
 sources:
 - https://github.com/gchq/gaffer-docker
@@ -27,6 +27,6 @@ dependencies:
   repository: https://kubernetes-charts-incubator.storage.googleapis.com
   condition: zookeeper.enabled
 - name: hdfs
-  version: ^0.6.3 # managed version
+  version: ^0.7.0 # managed version
   repository: file://../hdfs/
   condition: hdfs.enabled
diff --git a/kubernetes/gaffer/docs/aws-eks-deployment.md b/kubernetes/gaffer/docs/aws-eks-deployment.md
@@ -30,7 +30,7 @@ Next you'll need to setup the passwords for the accumulo users in the values.yam
 Finally, deploy the Helm Chart:
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
 
 helm dependency update
 

diff --git a/kubernetes/gaffer/docs/kind-deployment.md b/kubernetes/gaffer/docs/kind-deployment.md
@@ -9,7 +9,7 @@ Gaffer is then ready be deployed:
 
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.12.0}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.13.4}
 
 helm dependency update
 

diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml
@@ -103,7 +103,7 @@ accumulo:
 
   image:
     repository: gchq/gaffer
-    tag: 1.12.0
+    tag: 1.13.4
     pullPolicy: IfNotPresent
     pullSecrets: []
 
@@ -155,7 +155,7 @@ api:
   replicaCount: 1
   image:
     repository: gchq/gaffer-rest
-    tag: 1.12.0
+    tag: 1.13.4
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}
@@ -181,4 +181,4 @@ testImages:
     tag: 7.67.0
   operationRunner:
     repository: gchq/gaffer-operation-runner
-    tag: 1.12.0
+    tag: 1.13.4
diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml
@@ -16,5 +16,5 @@ apiVersion: v2
 name: hdfs
 description: Deploys the Hadoop Distributed File System (HDFS)
 type: application
-version: 0.6.3 # managed version
+version: 0.7.0 # managed version
 appVersion: 3.2.1