From 5d82d5edd16ade2e751f0b63967f8ff0b0b0b735 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Thu, 6 Jul 2023 12:02:16 +0200 Subject: [PATCH] chore(pkg/driverbuilder): only copy kmod/bpf makefile if kmod/bpf build was requested. Signed-off-by: Federico Di Pierro --- pkg/driverbuilder/docker.go | 8 ++++++-- pkg/driverbuilder/kubernetes.go | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/driverbuilder/docker.go b/pkg/driverbuilder/docker.go index d2dbc859..37708e55 100644 --- a/pkg/driverbuilder/docker.go +++ b/pkg/driverbuilder/docker.go @@ -223,10 +223,14 @@ func (bp *DockerBuildProcessor) Start(b *builder.Build) error { files := []dockerCopyFile{ {"/driverkit/driverkit.sh", driverkitScript}, {"/driverkit/kernel.config", string(configDecoded)}, - {"/driverkit/module-Makefile", bufKmodMakefile.String()}, - {"/driverkit/bpf-Makefile", bufBpfMakefile.String()}, {"/driverkit/fill-driver-config.sh", bufFillDriverConfig.String()}, } + if c.BuildModule() { + files = append(files, dockerCopyFile{"/driverkit/module-Makefile", bufKmodMakefile.String()}) + } + if c.BuildProbe() { + files = append(files, dockerCopyFile{"/driverkit/bpf-Makefile", bufBpfMakefile.String()}) + } var buf bytes.Buffer err = tarWriterFiles(&buf, files) diff --git a/pkg/driverbuilder/kubernetes.go b/pkg/driverbuilder/kubernetes.go index 450cef1f..20d5c5a1 100644 --- a/pkg/driverbuilder/kubernetes.go +++ b/pkg/driverbuilder/kubernetes.go @@ -155,6 +155,13 @@ func (bp *KubernetesBuildProcessor) buildModule(b *builder.Build) error { "unlock.sh": deleteLock, }, } + if c.BuildModule() { + cm.Data["module-Makefile"] = bufKmodMakefile.String() + } + if c.BuildProbe() { + cm.Data["bpf-Makefile"] = bufBpfMakefile.String() + } + // Construct environment variable array of corev1.EnvVar var envs []corev1.EnvVar // Add http_porxy and https_proxy environment variable