Merge remote-tracking branch 'upstream/master'

kubernetes-sigs · Mar 29, 2020 · 1057502 · 1057502
2 parents 0ee203f + f55767a
commit 1057502
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -23,6 +23,7 @@ spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
       serviceAccountName: ebs-csi-controller-sa
+        beta.kubernetes.io/arch: amd64
       priorityClassName: system-cluster-critical
       tolerations:
         - operator: Exists

diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
@@ -21,6 +21,7 @@ spec:
     spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
+        beta.kubernetes.io/arch: amd64
       hostNetwork: true
       priorityClassName: system-node-critical
       tolerations: