Merge branch 'master' into frontend_refactor

FORTH-ICS-INSPIRE · Apr 17, 2019 · 28d4bcd · 28d4bcd
2 parents f0b16f1 + 9f62fbc
commit 28d4bcd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 ## [UNRELEASED] (NAME) - YYYY-MM-DD
 ### Added
+- TBD (Added a new feature)
+
+### Changed
+- TBD (Changed existing functionality)
+
+### Fixed
+- TBD (bug-fix)
+
+### Removed
+- TBD (removed a feature)
+
+### Deprecated
+- TBD (soon-to-be removed feature)
+
+### Security
+- TBD (addressing vulnerability)
+
+## [1.2.0] (Athena) - 2019-04-10
+### Added
 - Support for dormant flags in hijacks
 - Storing hijack update (origin, neighbor) combinations in redis
 - Translate learn rule request in ARTEMIS-compatible dicts in backend
@@ -42,9 +61,6 @@
 - Configured prefix graph visualization (needs redesign)
 - Config data field from configs DB table
 
-### Deprecated
-- TBD (soon-to-be removed feature)
-
 ### Security
 - Using yaml dump and safe_load instead of pickling/unpickling
 

diff --git a/README.md b/README.md
@@ -254,6 +254,7 @@ to their homepages and licenses.
 
 ## Acknowledgements and Funding Sources
 This work is supported by the following funding sources on the European side (FORTH):
+* **European Research Council (ERC) grant agreement no. 790575 ([PHILOS Project](https://cordis.europa.eu/project/rcn/215015/en))**
 * **European Research Council (ERC) grant agreement no. 338402 ([NetVolution Project](http://netvolution.eu/))**
 * **[RIPE NCC Community Projects Fund](https://www.ripe.net/publications/news/announcements/ripe-community-projects-fund-2017-recipients-announced)**
 

diff --git a/artemis-chart/templates/configmap.yaml b/artemis-chart/templates/configmap.yaml
@@ -16,7 +16,7 @@ data:
   apiPort: {{ .Values.apiPort | default "3000" | quote }}
   dbHost: {{ .Values.dbHost | default "postgres" | quote }}
   dbPort: {{ .Values.dbPort | default "5432" | quote }}
-  dbVersion: {{ .Values.dbVersion | default "12" | quote }}
+  dbVersion: {{ .Values.dbVersion | default "15" | quote }}
   dbName: {{ .Values.dbName | default "artemis_db" | quote }}
   dbUser: {{ .Values.dbUser | default "artemis_user" | quote }}
   dbSchema: {{ .Values.dbSchema | default "public" | quote }}
@@ -29,7 +29,7 @@ data:
   webappPort: {{ .Values.webappPort | default "8000" | quote }}
   adminUser: {{ .Values.adminUser | default "admin" | quote }}
   adminEmail: {{ .Values.adminEmail | default "admin@admin.com" | quote }}
-  jsVersion: {{ .Values.jsVersion | default "0.1.2" | quote }}
+  jsVersion: {{ .Values.jsVersion | default "1.0.0" | quote }}
   rabbitmqHost: {{ .Values.rabbimtqHost | default "rabbitmq" | quote }}
   rabbitmqPort: {{ .Values.rabbimtqPort | default "5672" | quote }}
   rabbitmqUser: {{ .Values.rabbitmqUser | default "guest" | quote }}

diff --git a/artemis-chart/templates/graphql-deployment.yaml b/artemis-chart/templates/graphql-deployment.yaml
@@ -45,7 +45,7 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-secret
               key: hasuraJwt
-        image: hasura/graphql-engine:v1.0.0-alpha31
+        image: hasura/graphql-engine:v1.0.0-alpha42
         name: graphql
         resources: {}
       restartPolicy: Always

diff --git a/artemis-chart/values.yaml b/artemis-chart/values.yaml
@@ -15,7 +15,7 @@ apiPort: 3000
 # database
 dbHost: postgres
 dbPort: 5432
-dbVersion: 12
+dbVersion: 15
 dbName: artemis_db
 dbUser: artemis_user
 dbPass: Art3m1s
@@ -30,7 +30,7 @@ webappPort: 8000
 adminUser: admin
 adminPass: admin123
 adminEmail: admin@admin
-jsVersion: 0.1.2
+jsVersion: 1.0.0
 # rabbitmq
 rabbitmqHost: rabbitmq
 rabbitmqPort: 5672