merge: main into branch

coder · ericpaulsen · Dec 7, 2022 · Oct 19, 2022 · Oct 19, 2022 · Oct 19, 2022
commit 43cd1186bfb047260b129d557c305fe445e2a410
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -70,6 +70,7 @@ coder:
     #   cpu: 100m
     #   memory: 128Mi
 
+<<<<<<< HEAD
   # coder.certs -- CA bundles to mount inside the Coder pod.
   certs:
     # coder.certs.secrets -- A list of CA bundle secrets to mount into the Coder
@@ -81,6 +82,36 @@ coder:
     secrets: []
       # - name: "my-ca-bundle"
       #   key: "ca-bundle.crt"
+=======
+  # coder.affinity -- Allows specifying an affinity rule for the `coder` deployment.
+  # The default rule prefers to schedule coder pods on different
+  # nodes, which is only applicable if coder.replicaCount is greater than 1.
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: app.coder.com
+                  operator: In
+                  values:
+                    - "true"
+            topologyKey: kubernetes.io/hostname
+          weight: 1
+
+  # coder.tolerations -- Tolerations for tainted nodes.
+  # See: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: {}
+    # - key: "key"
+    #   operator: "Equal"
+    #   value: "value"
+    #   effect: "NoSchedule"
+
+  # coder.nodeSelector -- Node labels for constraining coder pods to nodes.
+  # See: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  #  kubernetes.io/os: linux
+>>>>>>> main
 
   # coder.service -- The Service object to expose for Coder.
   service: