From b80a35e49a4e12f41ceb0b60a41c7e2c3cb5283d Mon Sep 17 00:00:00 2001
From: Tasko Olevski <olevski90@gmail.com>
Date: Tue, 16 Nov 2021 00:13:07 +0100
Subject: [PATCH] chore: prep 1.2.0 release (#807)

---
 CHANGELOG.md                                 | 12 ++++++++++++
 helm-chart/renku-notebooks/Chart.yaml        |  2 +-
 helm-chart/renku-notebooks/requirements.lock |  6 +++---
 helm-chart/renku-notebooks/requirements.yaml |  2 +-
 helm-chart/renku-notebooks/values.yaml       |  7 ++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16c0606ee..820f68ab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog for renku-notebooks
 
+## [1.2.0](https://github.com/SwissDataScienceCenter/renku-notebooks/compare/1.1.1...1.2.0) (2021-11-15)
+
+### Bug Fixes
+
+* **app:** check out the correct branch instead of always master([#802](https://github.com/SwissDataScienceCenter/renku-notebooks/issues/802)) ([5a9ffbe](https://github.com/SwissDataScienceCenter/renku-notebooks/commit/5a9ffbeed0ae299e10f35b35d9ada34069d00e97))
+* **chart:** use current fallback renku image ([#803](https://github.com/SwissDataScienceCenter/renku-notebooks/issues/803)) ([30df71b](https://github.com/SwissDataScienceCenter/renku-notebooks/commit/30df71bf98f6635bb90552a5944148fb245a2f51))
+
+### Features
+
+* **chart:** add session tolerations, affinity, nodeSelector ([#806](https://github.com/SwissDataScienceCenter/renku-notebooks/issues/806)) ([49a2d54](https://github.com/SwissDataScienceCenter/renku-notebooks/commit/49a2d545bd041b2e4342093bb578ad8305b66a5e))
+* **app:** new Amalthea version - 0.2.1
+
 ## [1.1.1](https://github.com/SwissDataScienceCenter/renku-notebooks/compare/1.1.0...1.1.1) (2021-11-08)
 
 ### Bug Fixes
diff --git a/helm-chart/renku-notebooks/Chart.yaml b/helm-chart/renku-notebooks/Chart.yaml
index 5f54364bc..f221f7534 100644
--- a/helm-chart/renku-notebooks/Chart.yaml
+++ b/helm-chart/renku-notebooks/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: '1.0'
 description: A Helm chart for the Renku Notebooks service
 name: renku-notebooks
-version: 1.1.1
+version: 1.2.0
diff --git a/helm-chart/renku-notebooks/requirements.lock b/helm-chart/renku-notebooks/requirements.lock
index 80970c950..a2765d5aa 100644
--- a/helm-chart/renku-notebooks/requirements.lock
+++ b/helm-chart/renku-notebooks/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: amalthea
   repository: https://swissdatasciencecenter.github.io/helm-charts/
-  version: 0.1.3
-digest: sha256:85ed8b853f3a5b9027a4b6f263e15fb3d056a3516bb58f31b941e3c0c201083f
-generated: "2021-11-08T11:20:54.330125+01:00"
+  version: 0.2.1
+digest: sha256:bcfa119be4ac8677f1ac2b2a7ea25537a1d683809ad9f382d3dd4083e50f70da
+generated: "2021-11-15T23:33:56.673807+01:00"
diff --git a/helm-chart/renku-notebooks/requirements.yaml b/helm-chart/renku-notebooks/requirements.yaml
index e1e5ba831..79215fd49 100644
--- a/helm-chart/renku-notebooks/requirements.yaml
+++ b/helm-chart/renku-notebooks/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
 - name: amalthea
   repository: "https://swissdatasciencecenter.github.io/helm-charts/"
-  version: 0.1.3
+  version: 0.2.1
diff --git a/helm-chart/renku-notebooks/values.yaml b/helm-chart/renku-notebooks/values.yaml
index 8621800d0..7c426ab0a 100644
--- a/helm-chart/renku-notebooks/values.yaml
+++ b/helm-chart/renku-notebooks/values.yaml
@@ -80,7 +80,12 @@ sessionIngress:
     nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
 
 ## Setup node selector, tolerations and node affinities for user sessions that are launched
-## by the notebook service.
+## by the notebook service. These can be used so that user sessions are only scheduled on 
+## dedicated nodes rather than on all nodes in a cluster. A strict setup where session pods
+## are scheduled only on dedicated nodes and nothing else is scheduled on said nodes would involve:
+## (i) taints on the nodes to prevent other non-session workloads from getting scheduled there,
+## (ii) tolerations below to make sure the user session pods can get schedulded on the dedicated nodes,
+## (iii) node affinity below to make sure the user sessions do not get scheduled on other nodes.
 sessionNodeSelector: {}
 sessionTolerations: []
 sessionAffinity: {}