Merge pull request #93 from maiqueb/template-dp-configmap

manifests: template the device plugin config map name

Author: kubevirt-bot

Makefile

@@ -1,4 +1,5 @@
 CNI_MOUNT_PATH ?= /opt/cni/bin
+DEVICE_PLUGIN_CONFIG_MAP_NAME ?= macvtap-deviceplugin-config
 
 IMAGE_NAME ?= macvtap-cni
 IMAGE_REGISTRY ?= quay.io/kubevirt
@@ -105,7 +106,7 @@ test/unit: $(GO)
 	$(GO) test ./cmd/... ./pkg/... -v --ginkgo.v
 
 manifests:
-	IMAGE_REGISTRY=$(IMAGE_REGISTRY) IMAGE_NAME=$(IMAGE_NAME) IMAGE_TAG=$(IMAGE_TAG) CNI_MOUNT_PATH=$(CNI_MOUNT_PATH) NAMESPACE=$(NAMESPACE) IMAGE_PULL_POLICY=$(IMAGE_PULL_POLICY) ./hack/generate-manifests.sh
+	IMAGE_REGISTRY=$(IMAGE_REGISTRY) IMAGE_NAME=$(IMAGE_NAME) IMAGE_TAG=$(IMAGE_TAG) CNI_MOUNT_PATH=$(CNI_MOUNT_PATH) NAMESPACE=$(NAMESPACE) IMAGE_PULL_POLICY=$(IMAGE_PULL_POLICY) DEVICE_PLUGIN_CONFIG_MAP_NAME=$(DEVICE_PLUGIN_CONFIG_MAP_NAME) ./hack/generate-manifests.sh
 
 vendor: $(GO)
 	$(GO) mod tidy

hack/generate-manifests.sh

@@ -2,9 +2,10 @@
 
 set -ex
 
-CNI_MOUNT_PATH=${CNI_MOUNT_PATH}       # the default is stored in Makefile
-NAMESPACE=${NAMESPACE}                 # the default is store in Makefile
-IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY} # the default is store in Makefile
+CNI_MOUNT_PATH=${CNI_MOUNT_PATH}                               # the default is stored in Makefile
+NAMESPACE=${NAMESPACE}                                         # the default is stored in Makefile
+IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY}                         # the default is stored in Makefile
+DEVICE_PLUGIN_CONFIG_MAP_NAME=${DEVICE_PLUGIN_CONFIG_MAP_NAME} # the default is stored in Makefile
 
 # compose the full img name - defaults in Makefile
 MACVTAP_IMG=${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
@@ -20,5 +21,6 @@ for template in templates/*.in; do
         -e "s#{{ .CniMountPath }}#${CNI_MOUNT_PATH}#g" \
         -e "s#{{ .Namespace }}#${NAMESPACE}#g" \
         -e "s#{{ .ImagePullPolicy }}#${IMAGE_PULL_POLICY}#g" \
+        -e "s#{{ .DevicePluginConfigName }}#${DEVICE_PLUGIN_CONFIG_MAP_NAME}#g" \
         ${template} > ${DESTINATION}/${name}
 done

templates/macvtap.yaml.in

@@ -20,7 +20,7 @@ spec:
         command: ["/macvtap-deviceplugin", "-v", "3", "-logtostderr"]
         envFrom:
           - configMapRef:
-              name: macvtap-deviceplugin-config
+              name: '{{ .DevicePluginConfigName }}'
         image: '{{ .MacvtapImage }}'
         imagePullPolicy: '{{ .ImagePullPolicy }}'
         resources: