Update deployment yamls

define a single daemonset which utilizes container manifest. Signed-off-by: adrianc <[email protected]>
adrianchiris · Mar 12, 2024 · 903b597 · 903b597
1 parent 4a91d9e
commit 903b597
Showing 1 changed file with 2 additions and 166 deletions.
diff --git a/deployments/sriovdp-daemonset.yaml b/deployments/sriovdp-daemonset.yaml
@@ -9,7 +9,7 @@ metadata:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: kube-sriov-device-plugin-amd64
+  name: kube-sriov-device-plugin
   namespace: kube-system
   labels:
     tier: node
@@ -26,174 +26,10 @@ spec:
         app: sriovdp
     spec:
       hostNetwork: true
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/control-plane
-        operator: Exists
-        effect: NoSchedule
       serviceAccountName: sriov-device-plugin
       containers:
       - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-amd64
-        imagePullPolicy: IfNotPresent
-        args:
-        - --log-dir=sriovdp
-        - --log-level=10
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "250m"
-            memory: "40Mi"
-          limits:
-            cpu: 1
-            memory: "200Mi"
-        volumeMounts:
-        - name: devicesock
-          mountPath: /var/lib/kubelet/device-plugins
-          readOnly: false
-        - name: plugins-registry
-          mountPath: /var/lib/kubelet/plugins_registry
-          readOnly: false
-        - name: log
-          mountPath: /var/log
-        - name: config-volume
-          mountPath: /etc/pcidp
-        - name: device-info
-          mountPath: /var/run/k8s.cni.cncf.io/devinfo/dp
-      volumes:
-        - name: devicesock
-          hostPath:
-            path: /var/lib/kubelet/device-plugins
-        - name: plugins-registry
-          hostPath:
-            path: /var/lib/kubelet/plugins_registry
-        - name: log
-          hostPath:
-            path: /var/log
-        - name: device-info
-          hostPath:
-            path: /var/run/k8s.cni.cncf.io/devinfo/dp
-            type: DirectoryOrCreate
-        - name: config-volume
-          configMap:
-            name: sriovdp-config
-            items:
-            - key: config.json
-              path: config.json
-
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-device-plugin-ppc64le
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriovdp
-spec:
-  selector:
-    matchLabels:
-      name: sriov-device-plugin
-  template:
-    metadata:
-      labels:
-        name: sriov-device-plugin
-        tier: node
-        app: sriovdp
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        kubernetes.io/arch: ppc64le
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      serviceAccountName: sriov-device-plugin
-      containers:
-      - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-ppc64le
-        imagePullPolicy: IfNotPresent
-        args:
-        - --log-dir=sriovdp
-        - --log-level=10
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "250m"
-            memory: "40Mi"
-          limits:
-            cpu: 1
-            memory: "200Mi"
-        volumeMounts:
-        - name: devicesock
-          mountPath: /var/lib/kubelet/device-plugins
-          readOnly: false
-        - name: plugins-registry
-          mountPath: /var/lib/kubelet/plugins_registry
-          readOnly: false
-        - name: log
-          mountPath: /var/log
-        - name: config-volume
-          mountPath: /etc/pcidp
-        - name: device-info
-          mountPath: /var/run/k8s.cni.cncf.io/devinfo/dp
-      volumes:
-        - name: devicesock
-          hostPath:
-            path: /var/lib/kubelet/device-plugins
-        - name: plugins-registry
-          hostPath:
-            path: /var/lib/kubelet/plugins_registry
-        - name: log
-          hostPath:
-            path: /var/log
-        - name: device-info
-          hostPath:
-            path: /var/run/k8s.cni.cncf.io/devinfo/dp
-            type: DirectoryOrCreate
-        - name: config-volume
-          configMap:
-            name: sriovdp-config
-            items:
-            - key: config.json
-              path: config.json
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-sriov-device-plugin-arm64
-  namespace: kube-system
-  labels:
-    tier: node
-    app: sriovdp
-spec:
-  selector:
-    matchLabels:
-      name: sriov-device-plugin
-  template:
-    metadata:
-      labels:
-        name: sriov-device-plugin
-        tier: node
-        app: sriovdp
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        kubernetes.io/arch: arm64
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      serviceAccountName: sriov-device-plugin
-      containers:
-      - name: kube-sriovdp
-        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-arm64
+        image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest
         imagePullPolicy: IfNotPresent
         args:
         - --log-dir=sriovdp