Restrict Trident pods to amd64 linux nodes (#109)

Closes: #264
NetApp · Sep 12, 2019 · c5ee929 · c5ee929
1 parent f64b432
commit c5ee929
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,14 @@
 
 [Releases](https://github.com/NetApp/trident/releases)
 
-## Changes since v19.04.0
+## Changes since v19.07.0
+
+**Fixes:**
+- **Kubernetes:** Added fix to ensure Trident pods only run on amd64/linux nodes.
+
+**Enhancements:**
+
+## v19.07.0
 
 **Fixes:**
 - **Kubernetes:** Improved volume import transaction cleanup during failure scenarios.

diff --git a/cli/k8s_client/yaml_factory.go b/cli/k8s_client/yaml_factory.go
@@ -243,6 +243,9 @@ spec:
           initialDelaySeconds: 120
           periodSeconds: 120
           timeoutSeconds: 90
+      nodeSelector:
+        beta.kubernetes.io/os: linux
+        beta.kubernetes.io/arch: amd64
 `
 
 func GetCSIServiceYAML(label string) string {
@@ -401,6 +404,9 @@ spec:
         volumeMounts:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
+      nodeSelector:
+        beta.kubernetes.io/os: linux
+        beta.kubernetes.io/arch: amd64
       volumes:
       - name: socket-dir
         emptyDir:
@@ -503,6 +509,9 @@ spec:
         volumeMounts:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
+      nodeSelector:
+        kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
       volumes:
       - name: socket-dir
         emptyDir:
@@ -606,6 +615,9 @@ spec:
         volumeMounts:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
+      nodeSelector:
+        kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
       volumes:
       - name: socket-dir
         emptyDir:
@@ -723,6 +735,9 @@ spec:
           mountPath: /plugin
         - name: registration-dir
           mountPath: /registration
+      nodeSelector:
+        beta.kubernetes.io/os: linux
+        beta.kubernetes.io/arch: amd64
       volumes:
       - name: plugin-dir
         hostPath:
@@ -842,6 +857,9 @@ spec:
           mountPath: /plugin
         - name: registration-dir
           mountPath: /registration
+      nodeSelector:
+        kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
       volumes:
       - name: plugin-dir
         hostPath:
@@ -1059,6 +1077,9 @@ spec:
     volumeMounts:
     - name: etcd-vol
       mountPath: /var/etcd/data
+  nodeSelector:
+    beta.kubernetes.io/os: linux
+    beta.kubernetes.io/arch: amd64
   volumes:
   - name: etcd-vol
     persistentVolumeClaim:
@@ -1093,6 +1114,9 @@ spec:
     - name: setup-dir
       mountPath: /setup
   restartPolicy: Never
+  nodeSelector:
+    beta.kubernetes.io/os: linux
+    beta.kubernetes.io/arch: amd64
   volumes:
   - name: setup-dir
     configMap:
@@ -1123,6 +1147,9 @@ spec:
     image: {TRIDENT_IMAGE}
     workingDir: /
     command: {COMMAND}
+  nodeSelector:
+    beta.kubernetes.io/os: linux
+    beta.kubernetes.io/arch: amd64
   restartPolicy: Never
 `