Skip to content

Commit 0f094fc

Browse files
FedeDPpoiana
authored andcommitted
fix(pkg/driverbuilder): fixed kubernetes command.
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
1 parent cd9e5b3 commit 0f094fc

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

pkg/driverbuilder/kubernetes.go

+13-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ func (bp *KubernetesBuildProcessor) buildModule(b *builder.Build) error {
112112
return err
113113
}
114114

115+
// We run a script that downloads libs,
116+
// download and extracts kernelURLs saving its output to KERNELDIR env variable,
117+
// then finally runs the build script.
118+
res = fmt.Sprintf("%s\nexport KERNELDIR=$(%s)\n%s", libsDownloadScript, kernelDownloadScript, res)
119+
115120
if c.ModuleFilePath != "" {
116121
res = fmt.Sprintf("%s\n%s", "touch "+moduleLockFile, res)
117122
res = fmt.Sprintf("%s\n%s", res, "rm "+moduleLockFile)
@@ -128,7 +133,7 @@ func (bp *KubernetesBuildProcessor) buildModule(b *builder.Build) error {
128133
buildCmd := []string{
129134
"/bin/bash",
130135
"-l",
131-
"/driverkit/download-libs.sh && KERNELDIR=$(/driverkit/download-headers.sh) /driverkit/driverkit.sh",
136+
"/driverkit/driverkit.sh",
132137
}
133138

134139
commonMeta := metav1.ObjectMeta{
@@ -176,13 +181,19 @@ func (bp *KubernetesBuildProcessor) buildModule(b *builder.Build) error {
176181
secuContext := corev1.PodSecurityContext{
177182
RunAsUser: &bp.runAsUser,
178183
}
184+
185+
imagePullSecrets := make([]corev1.LocalObjectReference, 0)
186+
if bp.imagePullSecret != "" {
187+
imagePullSecrets = append(imagePullSecrets, corev1.LocalObjectReference{Name: bp.imagePullSecret})
188+
}
189+
179190
pod := &corev1.Pod{
180191
ObjectMeta: commonMeta,
181192
Spec: corev1.PodSpec{
182193
ActiveDeadlineSeconds: pointer.Int64Ptr(deadline),
183194
RestartPolicy: corev1.RestartPolicyNever,
184195
SecurityContext: &secuContext,
185-
ImagePullSecrets: []corev1.LocalObjectReference{{Name: bp.imagePullSecret}},
196+
ImagePullSecrets: imagePullSecrets,
186197
Containers: []corev1.Container{
187198
{
188199
Name: name,

0 commit comments

Comments
 (0)