update(pkg/driverbuilder/builder): support also GKE 5.4 kernels (ubun…

…tu-generic builder)

Signed-off-by: Leonardo Di Donato <[email protected]>

pkg/driverbuilder/builder/ubuntu.go

@@ -156,6 +156,7 @@ func fetchUbuntuGenericKernelURL(baseURL string, kr kernelrelease.KernelRelease,
  firstExtra := extractExtraNumber(kr.Extraversion)
  if kr.IsGKE() {
  return []string{
+ // For 4.15 GKE kernels
  fmt.Sprintf(
  "%s/linux-gke-%s.%s-headers-%s-%s_%s-%s.%d_amd64.deb",
  baseURL,
@@ -176,20 +177,20 @@ func fetchUbuntuGenericKernelURL(baseURL string, kr kernelrelease.KernelRelease,
  firstExtra,
  kernelVersion,
  ),
- }
- } else {
- return []string{
+ // For 5.4 GKE kernels
  fmt.Sprintf(
- "%s/linux-headers-%s-%s_%s-%s.%d_all.deb",
+ "%s/linux-gke-%s.%s-headers-%s-%s_%s-%s.%d~18.04.1_amd64.deb",
  baseURL,
+ kr.Version,
+ kr.PatchLevel,
  kr.Fullversion,
  firstExtra,
  kr.Fullversion,
  firstExtra,
  kernelVersion,
  ),
  fmt.Sprintf(
- "%s/linux-headers-%s%s_%s-%s.%d_amd64.deb",
+ "%s/linux-headers-%s%s_%s-%s.%d~18.04.1_amd64.deb",
  baseURL,
  kr.Fullversion,
  kr.FullExtraversion,
@@ -199,6 +200,27 @@ func fetchUbuntuGenericKernelURL(baseURL string, kr kernelrelease.KernelRelease,
  ),
  }
  }
+
+ return []string{
+ fmt.Sprintf(
+ "%s/linux-headers-%s-%s_%s-%s.%d_all.deb",
+ baseURL,
+ kr.Fullversion,
+ firstExtra,
+ kr.Fullversion,
+ firstExtra,
+ kernelVersion,
+ ),
+ fmt.Sprintf(
+ "%s/linux-headers-%s%s_%s-%s.%d_amd64.deb",
+ baseURL,
+ kr.Fullversion,
+ kr.FullExtraversion,
+ kr.Fullversion,
+ firstExtra,
+ kernelVersion,
+ ),
+ }
 }
 
 func fetchUbuntuAWSKernelURLS(baseURL string, kr kernelrelease.KernelRelease, kernelVersion uint16) []string {