Merge pull request #158 from ostelco/develop

Bump prime & pseudonym server
ostelco · Jun 7, 2018 · 1a47b98 · 1a47b98
2 parents 2de0d43 + 3ed827e
commit 1a47b98
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/prime/build.gradle b/prime/build.gradle
@@ -20,7 +20,7 @@ sourceSets {
   }
 }
 
-version = "1.5.0"
+version = "1.5.1"
 dependencies {
   // interface module between prime and prime-modules
   implementation project(':prime-api')

diff --git a/prime/config/config.yaml b/prime/config/config.yaml
@@ -12,6 +12,8 @@ modules:
     config:
       authenticationCachePolicy: maximumSize=10000, expireAfterAccess=10m
       pseudonymEndpoint: http://pseudonym-server-service.default.svc.cluster.local
+      jerseyClient:
+        timeout: 2s
   - type: admin
 
 server:

diff --git a/pseudonym-server/build.gradle b/pseudonym-server/build.gradle
@@ -14,7 +14,7 @@ dependencies {
   implementation project(':ocs-api')
   implementation 'com.google.guava:guava:24.1-jre'
   // Match with grpc-netty-shaded via PubSub
-  // implementation 'io.grpc:grpc-netty-shaded:1.10.1'
+  implementation 'io.grpc:grpc-netty-shaded:1.10.1'
   implementation 'com.google.cloud:google-cloud-bigquery:1.28.0'
   implementation 'com.google.cloud:google-cloud-datastore:1.28.0'
   implementation 'com.google.cloud:google-cloud-pubsub:0.46.0-beta'

diff --git a/pseudonym-server/pseudonym-server.yaml b/pseudonym-server/pseudonym-server.yaml
@@ -15,6 +15,6 @@ spec:
     spec:
       containers:
       - name: pseudonym-server
-        image: gcr.io/pantel-2decb/pseudonym-server:v1.2
+        image: gcr.io/pantel-2decb/pseudonym-server:v1.4
         ports:
         - containerPort: 8080