3 files changed, 22 insertions, 21 deletions

diff --git a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
index ae956794..5bfc6268 100644
--- a/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
+++ b/recipes-containers/kubernetes/kubernetes/0001-build-golang.sh-convert-remaining-go-calls-to-use.patch
@@ -14,32 +14,32 @@ Index: kubernetes/hack/lib/golang.sh
 ===================================================================
 --- kubernetes.orig/hack/lib/golang.sh
 +++ kubernetes/hack/lib/golang.sh
-@@ -689,7 +689,7 @@
+@@ -743,7 +743,7 @@ kube::golang::build_some_binaries() {
          kube::golang::create_coverage_dummy_test "${package}"
          kube::util::trap_add "kube::golang::delete_coverage_dummy_test \"${package}\"" EXIT
  
 -        go test -c -o "$(kube::golang::outfile_for_binary "${package}" "${platform}")" \
 +        $GO test -c -o "$(kube::golang::outfile_for_binary "${package}" "${platform}")" \
            -covermode count \
-           -coverpkg k8s.io/...,k8s.io/kubernetes/vendor/k8s.io/... \
+           -coverpkg k8s.io/... \
            "${build_args[@]}" \
-@@ -701,13 +701,13 @@
+@@ -755,13 +755,13 @@ kube::golang::build_some_binaries() {
      done
      if [[ "${#uncovered[@]}" != 0 ]]; then
        V=2 kube::log::info "Building ${uncovered[*]} without coverage..."
--      GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "${uncovered[@]}"
-+      GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "${uncovered[@]}"
+-      GOPROXY=off go install "${build_args[@]}" "${uncovered[@]}"
++      GOPROXY=off $GO install "${build_args[@]}" "${uncovered[@]}"
      else
        V=2 kube::log::info "Nothing to build without coverage."
-      fi
-    else
+     fi
+   else
      V=2 kube::log::info "Coverage is disabled."
--    GO111MODULE=on GOPROXY=off go install "${build_args[@]}" "$@"
-+    GO111MODULE=on GOPROXY=off $GO install "${build_args[@]}" "$@"
-    fi
+-    GOPROXY=off go install "${build_args[@]}" "$@"
++    GOPROXY=off $GO install "${build_args[@]}" "$@"
+   fi
  }
  
-@@ -769,7 +769,7 @@
+@@ -821,7 +821,7 @@ kube::golang::build_binaries_for_platfor
      testpkg=$(dirname "${test}")
  
      mkdir -p "$(dirname "${outfile}")"
@@ -47,4 +47,4 @@ Index: kubernetes/hack/lib/golang.sh
 +    $GO test -c \
        ${goflags:+"${goflags[@]}"} \
        -gcflags="${gogcflags}" \
-       -asmflags="${goasmflags}" \
+       -ldflags="${goldflags}" \
diff --git a/recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist b/recipes-containers/kubernetes/kubernetes/00_cni-containerd-net.conflist
index ca434d6f..ca434d6f 100644
--- a/recipes-containers/kubernetes/kubernetes/cni-containerd-net.conflist
+++ b/recipes-containers/kubernetes/kubernetes/00_cni-containerd-net.conflist
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index 0df6dbfa..b6eb4946 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -5,16 +5,16 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
 maintenance, and scaling of applications. \
 "
 
-PV = "v1.29.1+git${SRCREV_kubernetes}"
-CVE_VERSION = "1.29.1"
-SRCREV_kubernetes = "a02da633101bd7919153dd56412b09221c0139bf"
+PV = "v1.32.0+git"
+CVE_VERSION = "1.32.0"
+SRCREV_kubernetes = "5fe148234f8ab1184f26069c4f7bef6c37efe347"
 SRCREV_kubernetes-release = "21382abdbfa8e6a43fd417306fa649cb651cc06e"
 PE = "1"
 
 BBCLASSEXTEND = "devupstream:target"
 LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 DEFAULT_PREFERENCE:class-devupstream = "-1"
-SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=release-1.29;name=kubernetes;protocol=https \
+SRC_URI:class-devupstream = "git://github.com/kubernetes/kubernetes.git;branch=release-1.32;name=kubernetes;protocol=https \
                              git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https \
                             "
 SRCREV_kubernetes:class-devupstream = "e3b5e621f07f0fee298f641ebded61b8f393fe27"
@@ -23,7 +23,7 @@ PV:class-devupstream = "v1.28.2+git${SRCREV_kubernetes}"
 
 SRCREV_FORMAT ?= "kubernetes_release"
 
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.29;name=kubernetes;protocol=https;destsuffix=git/src/github.com/kubernetes/kubernetes \
+SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.32;name=kubernetes;protocol=https;destsuffix=git/src/github.com/kubernetes/kubernetes \
            git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release;protocol=https"
 
 SRC_URI:append = " \
@@ -31,7 +31,7 @@ SRC_URI:append = " \
            file://0001-cross-don-t-build-tests-by-default.patch \
            file://0001-build-golang.sh-convert-remaining-go-calls-to-use.patch \
            file://0001-build-hack-allow-go-1.20-building.patch \
-           file://cni-containerd-net.conflist \
+           file://00_cni-containerd-net.conflist \
            file://k8s-init \
            file://99-kubernetes.conf \
           "
@@ -92,6 +92,7 @@ do_compile() {
         export CC="${CC}"
         export LD="${LD}"
         export GOBIN=""
+        export GOFLAGS="-trimpath"
 
         # to limit what is built, use 'WHAT', i.e. make WHAT=cmd/kubelet
         make cross CGO_FLAGS=${CGO_FLAGS} GO=${GO} KUBE_BUILD_PLATFORMS=${GOOS}/${GOARCH} GOLDFLAGS="" DBG=1
@@ -111,14 +112,14 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d "${D}${BIN_PREFIX}${base_bindir}"
-        install -m 755 "${WORKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}"
+        install -m 755 "${UNPACKDIR}/k8s-init" "${D}${BIN_PREFIX}${base_bindir}"
 
         install -d ${D}${sysconfdir}/sysctl.d
-        install -m 0644 "${WORKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d"
+        install -m 0644 "${UNPACKDIR}/99-kubernetes.conf" "${D}${sysconfdir}/sysctl.d"
     fi
 }
 
-CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conflist"
+CNI_NETWORKING_FILES ?= "${UNPACKDIR}/00_cni-containerd-net.conflist"
 
 PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc ${PN}-host"