Updated Gaffer version to 1.18.0 (#188)

t92549 · web-flow · commit 6a08952c3f05 · 2021-08-04T21:37:11.000+01:00
diff --git a/cd/deploy_to_kind.sh b/cd/deploy_to_kind.sh
@@ -22,11 +22,11 @@ cd ./kubernetes/gaffer-road-traffic
 
 # Deploy Images to Kind
 kind load docker-image gchq/hdfs:3.2.1
-kind load docker-image gchq/gaffer:1.17.1
-kind load docker-image gchq/gaffer-rest:1.17.1
-kind load docker-image gchq/gaffer-ui:1.17.1
-kind load docker-image gchq/gaffer-road-traffic-loader:1.17.1
-kind load docker-image gchq/gaffer-operation-runner:1.17.1
+kind load docker-image gchq/gaffer:1.18.0
+kind load docker-image gchq/gaffer-rest:1.18.0
+kind load docker-image gchq/gaffer-ui:1.18.0
+kind load docker-image gchq/gaffer-road-traffic-loader:1.18.0
+kind load docker-image gchq/gaffer-operation-runner:1.18.0
 
 # Deploy containers onto Kind
 # Hostname check is disabled for CI
diff --git a/docker/gaffer-integration-tests/README.md b/docker/gaffer-integration-tests/README.md
@@ -8,7 +8,7 @@ Values from these will be copied accross to the src/tests/resources store proper
 
 To Build the Docker image, use:
 ```bash
-docker build -t gchq/gaffer-integration-tests:1.17.1 .
+docker build -t gchq/gaffer-integration-tests:1.18.0 .
 ```
 
 If you want to build a different branch or release version, you can provide a build arg:
diff --git a/docker/gaffer-operation-runner/.env b/docker/gaffer-operation-runner/.env
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.17.1
-GAFFER_TOOLS_VERSION=1.17.1
+GAFFER_VERSION=1.18.0
+GAFFER_TOOLS_VERSION=1.18.0
 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.17.1
+ARG BASE_IMAGE_TAG=1.18.0
 
 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.17.1</version>
+      <version>1.18.0</version>
     </dependency>
   </dependencies>
 
diff --git a/docker/gaffer-rest/.env b/docker/gaffer-rest/.env
@@ -1 +1 @@
-GAFFER_VERSION=1.17.1
+GAFFER_VERSION=1.18.0
diff --git a/docker/gaffer-rest/Dockerfile b/docker/gaffer-rest/Dockerfile
@@ -6,7 +6,7 @@ ARG BASE_IMAGE_TAG=8-jre-alpine
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_VERSION=1.17.1
+ARG GAFFER_VERSION=1.18.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
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.17.1
-GAFFER_TOOLS_VERSION=1.17.1
+GAFFER_VERSION=1.18.0
+GAFFER_TOOLS_VERSION=1.18.0
 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.17.1
+ARG GAFFER_VERSION=1.18.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-ui/.env b/docker/gaffer-ui/.env
@@ -1,2 +1,2 @@
-GAFFER_VERSION=1.17.1
-GAFFER_TOOLS_VERSION=1.17.1
+GAFFER_VERSION=1.18.0
+GAFFER_TOOLS_VERSION=1.18.0
diff --git a/docker/gaffer-ui/Dockerfile b/docker/gaffer-ui/Dockerfile
@@ -20,7 +20,7 @@ ARG BASE_IMAGE_TAG=10.1.0.Final
 
 FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder
 
-ARG GAFFER_TOOLS_VERSION=1.17.1
+ARG GAFFER_TOOLS_VERSION=1.18.0
 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/.env b/docker/gaffer/.env
@@ -1,5 +1,5 @@
-GAFFER_VERSION=1.17.1
-GAFFER_TOOLS_VERSION=1.17.1
+GAFFER_VERSION=1.18.0
+GAFFER_TOOLS_VERSION=1.18.0
 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.17.1
+ARG GAFFER_VERSION=1.18.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/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.17.1}
-export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.17.1}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.18.0}
+export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.18.0}
 
 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.17.1}
-export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.17.1}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.18.0}
+export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.18.0}
 
 docker-compose --project-directory ../docker/accumulo/ -f ../docker/accumulo/docker-compose.yaml build
 docker-compose --project-directory ../docker/gaffer-ui -f ../docker/gaffer-ui/docker-compose.yaml build
diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml
@@ -17,7 +17,7 @@ name: gaffer-road-traffic
 description: A Gaffer instance containing sample GB road traffic data from the Department of Transport
 type: application
 version: 0.13.0 # managed version
-appVersion: 1.17.1
+appVersion: 1.18.0
 home: https://github.com/gchq/Gaffer
 sources:
 - https://github.com/gchq/gaffer-docker
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.17.1}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.18.0}
 
 helm dependency update ../accumulo/
 helm dependency update ../gaffer/
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.17.1}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.18.0}
 
 helm dependency update ../accumulo/
 helm dependency update ../gaffer/
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.17.1
+    tag: 1.18.0
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}
@@ -393,4 +393,4 @@ gaffer:
     images:
       operationRunner:
         repository: gchq/gaffer-operation-runner
-        tag: 1.17.1
+        tag: 1.18.0
diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml
@@ -17,7 +17,7 @@ name: gaffer
 description: A large-scale entity and relation database supporting aggregation of properties
 type: application
 version: 0.13.0 # managed version
-appVersion: 1.17.1
+appVersion: 1.18.0
 home: https://github.com/gchq/Gaffer
 sources:
 - https://github.com/gchq/gaffer-docker
diff --git a/kubernetes/gaffer/docs/aws-eks-deployment.md b/kubernetes/gaffer/docs/aws-eks-deployment.md
@@ -33,8 +33,8 @@ By default the gaffer graph uses the in-memory MapStore. If you want to use an a
 
 ```bash
 export HADOOP_VERSION=${HADOOP_VERSION:-3.2.1}
-export GAFFER_VERSION=${GAFFER_VERSION:-1.17.1}
-export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.17.1}
+export GAFFER_VERSION=${GAFFER_VERSION:-1.18.0}
+export GAFFER_TOOLS_VERSION=${GAFFER_TOOLS_VERSION:-1.18.0}
 
 helm dependency update ../accumulo/
 helm dependency update ../gaffer/
diff --git a/kubernetes/gaffer/values.yaml b/kubernetes/gaffer/values.yaml
@@ -31,7 +31,7 @@ graph:
 ui:
   image:
     repository: gchq/gaffer-ui
-    tag: 1.17.1
+    tag: 1.18.0
     pullPolicy: IfNotPresent
     pullSecrets: []
   # See: https://github.com/gchq/gaffer-tools/tree/master/ui#configuration
@@ -54,7 +54,7 @@ api:
   replicaCount: 1
   image:
     repository: gchq/gaffer-rest
-    tag: 1.17.1
+    tag: 1.18.0
     pullPolicy: IfNotPresent
     pullSecrets: []
   resources: {}
@@ -91,7 +91,7 @@ accumulo:
   enabled: false
   image:
     repository: gchq/gaffer
-    tag: 1.17.1
+    tag: 1.18.0
   config:
     postInstallCommands:
     - users

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-GAFFER_VERSION=1.17.1`
	`1`	`+GAFFER_VERSION=1.18.0`