Merge remote-tracking branch 'origin/master' into nightly

CHANGELOG.md

@@ -19,6 +19,7 @@ Every user-facing change should have an entry in this changelog. Please respect
 ## Unreleased
 
 - [Fix] Fix 500 error during studio login. (by @regisb)
+- [Fix] Fix updates for the Caddy deployment in multi-node Kubernetes clusters (#660). Previously, Caddy configuration updates might fail if the Kubernetes cluster had more than one worker node. (by @fghaas)
 
 ## v13.2.2 (2022-05-06)
 

tutor/templates/k8s/deployments.yml

@@ -14,6 +14,22 @@ spec:
       labels:
         app.kubernetes.io/name: caddy
     spec:
+      {%- if ENABLE_WEB_PROXY %}
+      # This Deployment uses a persistent volume claim. This requires
+      # that in order to enable rolling updates (i.e. use a deployment
+      # strategy other than Replace), we schedule the new Pod to the
+      # same node as the original Pod.
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                    - caddy
+              topologyKey: "kubernetes.io/hostname"
+      {%- endif %}
       containers:
         - name: caddy
           image: {{ DOCKER_IMAGE_CADDY }}