From a5731c01ff2b76e4c82a86405288be8bc16b5bfd Mon Sep 17 00:00:00 2001
From: Radim Hrazdil <rhrazdil@redhat.com>
Date: Thu, 10 Sep 2020 16:23:47 +0200
Subject: [PATCH] Bump macvtap dep to v0.3.0

It contains the following PRs:
- Change vbom.ml/util dependency with github.com/fvbommel/util [0]
    Fixes vbom dependency
- Adding quotes in macvtap.yaml.in [1]
    Allows using yq to edit macvtap.yaml.in

[0] https://github.com/kubevirt/macvtap-cni/pull/25
[1] https://github.com/kubevirt/macvtap-cni/pull/24

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
---
 components.yaml                         |  4 ++--
 data/macvtap/002-macvtap-daemonset.yaml | 12 ++++++------
 pkg/components/components.go            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components.yaml b/components.yaml
index 0063bfbcd8..aee2755b03 100644
--- a/components.yaml
+++ b/components.yaml
@@ -37,7 +37,7 @@ components:
     metadata: "v0.12.0"
   macvtap-cni:
     url: "https://github.com/kubevirt/macvtap-cni"
-    commit: "14e5a3c7bf516bd4542366a78b7af02f04230ac5"
+    commit: "1c618bd38e9923b9595eb87e08765131c98c0f7f"
     branch: "master"
     update-policy: "tagged"
-    metadata: "v0.2.0"
+    metadata: "v0.3.0"
diff --git a/data/macvtap/002-macvtap-daemonset.yaml b/data/macvtap/002-macvtap-daemonset.yaml
index d2b839c33e..9559287f02 100644
--- a/data/macvtap/002-macvtap-daemonset.yaml
+++ b/data/macvtap/002-macvtap-daemonset.yaml
@@ -11,7 +11,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: macvtap-cni
-  namespace: {{ .Namespace }}
+  namespace: '{{ .Namespace }}'
 spec:
   selector:
     matchLabels:
@@ -29,8 +29,8 @@ spec:
         envFrom:
           - configMapRef:
               name: macvtap-deviceplugin-config
-        image: {{ .MacvtapImage }}
-        imagePullPolicy: {{ .ImagePullPolicy }}
+        image: '{{ .MacvtapImage }}'
+        imagePullPolicy: '{{ .ImagePullPolicy }}'
         resources:
           requests:
             cpu: "60m"
@@ -43,8 +43,8 @@ spec:
       initContainers:
       - name: install-cni
         command: ['cp', '/macvtap-cni', '/host/opt/cni/bin/macvtap']
-        image: {{ .MacvtapImage }}
-        imagePullPolicy: {{ .ImagePullPolicy }}
+        image: '{{ .MacvtapImage }}'
+        imagePullPolicy: '{{ .ImagePullPolicy }}'
         securityContext:
           privileged: true
         volumeMounts:
@@ -57,4 +57,4 @@ spec:
             path: /var/lib/kubelet/device-plugins
         - name: cni
           hostPath:
-            path: {{ .CniMountPath }}
+            path: '{{ .CniMountPath }}'
diff --git a/pkg/components/components.go b/pkg/components/components.go
index 3a637d3e97..c523c2d86a 100644
--- a/pkg/components/components.go
+++ b/pkg/components/components.go
@@ -32,7 +32,7 @@ const (
 	NMStateHandlerImageDefault    = "quay.io/nmstate/kubernetes-nmstate-handler@sha256:444ab3349882ac58f594396529708146993b831c2e3e1d524eaa12e17e09f150"
 	OvsCniImageDefault            = "quay.io/kubevirt/ovs-cni-plugin@sha256:4101c52617efb54a45181548c257a08e3689f634b79b9dfcff42bffd8b25af53"
 	OvsMarkerImageDefault         = "quay.io/kubevirt/ovs-cni-marker@sha256:0f08d6b1550a90c9f10221f2bb07709d1090e7c675ee1a711981bd429074d620"
-	MacvtapCniImageDefault        = "quay.io/kubevirt/macvtap-cni@sha256:2606ac545cc69af5766d929bd82f86df5098a5e1c8ac26cfd2cdf99c46da8067"
+	MacvtapCniImageDefault        = "quay.io/kubevirt/macvtap-cni@sha256:667553f83bd35351c576673d898865c774a6f59a123c28e794bae240c00ab26f"
 )
 
 type AddonsImages struct {