From 6467a7d3732696b4883c5af768cf86c960d06baf Mon Sep 17 00:00:00 2001
From: Borball Zhai <borball.zh@gmail.com>
Date: Wed, 28 Aug 2024 02:34:02 -0400
Subject: [PATCH] Set EnvironmentFile=/etc/mco/proxy.env in the systemd
 services generated by mcpproducer  (#1168)

So that the systemd services can pull the images through proxy if the proxy is set on the cluster
---
 pkg/mcproducer/templates/machine-config.gotmpl  | 2 ++
 pkg/mcproducer/testdata/machineconfig-test.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkg/mcproducer/templates/machine-config.gotmpl b/pkg/mcproducer/templates/machine-config.gotmpl
index 305658281..677e624c1 100644
--- a/pkg/mcproducer/templates/machine-config.gotmpl
+++ b/pkg/mcproducer/templates/machine-config.gotmpl
@@ -20,6 +20,7 @@ spec:
             User=root
             Type=oneshot
             TimeoutSec=10
+            EnvironmentFile=/etc/mco/proxy.env
             Environment="IN_TREE_MODULE_TO_REMOVE={{.InTreeModuleToRemove}}"
             Environment="KERNEL_MODULE={{.KernelModule}}"
             Environment="KERNEL_MODULE_IMAGE_FILEPATH={{.KernelModuleImageFilepath}}"
@@ -43,6 +44,7 @@ spec:
             [Service]
             User=root
             Type=oneshot
+            EnvironmentFile=/etc/mco/proxy.env
             Environment="KERNEL_MODULE_IMAGE={{.KernelModuleImage}}"
             Environment="KERNEL_MODULE_IMAGE_FILEPATH={{.KernelModuleImageFilepath}}"
             Environment="WORKER_IMAGE={{.WorkerImage}}"
diff --git a/pkg/mcproducer/testdata/machineconfig-test.yaml b/pkg/mcproducer/testdata/machineconfig-test.yaml
index 7ec266579..b8ba84563 100644
--- a/pkg/mcproducer/testdata/machineconfig-test.yaml
+++ b/pkg/mcproducer/testdata/machineconfig-test.yaml
@@ -20,6 +20,7 @@ spec:
             User=root
             Type=oneshot
             TimeoutSec=10
+            EnvironmentFile=/etc/mco/proxy.env
             Environment="IN_TREE_MODULE_TO_REMOVE=testInTreeKernelModuleName"
             Environment="KERNEL_MODULE=testKernelModuleName"
             Environment="KERNEL_MODULE_IMAGE_FILEPATH=/var/lib/image_file_day1.tar"
@@ -43,6 +44,7 @@ spec:
             [Service]
             User=root
             Type=oneshot
+            EnvironmentFile=/etc/mco/proxy.env
             Environment="KERNEL_MODULE_IMAGE=quay.io/project/repo:some-tag12"
             Environment="KERNEL_MODULE_IMAGE_FILEPATH=/var/lib/image_file_day1.tar"
             Environment="WORKER_IMAGE=quay.io/edge-infrastructure/kernel-module-management-worker:latest"