Update code generator script

The script we were using is fully deprecated so we need to upgrade
to a new code generator.

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
 
     - name: Generate code
       if: steps.changed-files.outputs.any_changed == 'true'
-      run: chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh && ./hack/generate-code.sh && hack/verify-codegen.sh
+      run: ./hack/generate-code.sh && hack/verify-codegen.sh
 
     - name: Run go fmt
       if: steps.changed-files.outputs.any_changed == 'true'

cmd/controlloop/controlloop.go

@@ -19,9 +19,9 @@ import (
 	nadclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned"
 	nadinformers "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions"
 
-	wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
-	wbinformers "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/informers/externalversions"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/controlloop"
+	wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
+	wbinformers "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/informers/externalversions"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/reconciler"
 )

cmd/nodeslicecontroller/node_slice_controller.go

@@ -13,8 +13,8 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 
-	clientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
-	informers "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/informers/externalversions"
+	clientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
+	informers "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/informers/externalversions"
 	node_controller "github.com/k8snetworkplumbingwg/whereabouts/pkg/node-controller"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/node-controller/signals"
 )

cmd/whereabouts_test.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"
-	wbclientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
-	"github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned/fake"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/config"
+	wbclientset "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned/fake"
 	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage/kubernetes"
 	whereaboutstypes "github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 )

e2e/client/whereabouts.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/k8snetworkplumbingwg/whereabouts/e2e/entities"
 	whereaboutscnicncfiov1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"
-	wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/client/clientset/versioned"
+	wbclient "github.com/k8snetworkplumbingwg/whereabouts/pkg/generated/clientset/versioned"
 )
 
 const (

hack/update-codegen.sh

@@ -20,11 +20,15 @@ set -o pipefail
 
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-bash ./vendor/k8s.io/code-generator/generate-groups.sh "client,informer,lister" \
-  github.com/k8snetworkplumbingwg/whereabouts/pkg/client \
-  github.com/k8snetworkplumbingwg/whereabouts/pkg/api \
-  whereabouts.cni.cncf.io:v1alpha1 \
-  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+source "${CODEGEN_PKG}/kube_codegen.sh"
 
-cp -r github.com/k8snetworkplumbingwg/whereabouts/pkg/client/* pkg/client
+THIS_PKG="github.com/k8snetworkplumbingwg/whereabouts"
+
+kube::codegen::gen_client \
+    --with-watch \
+    --output-dir "${SCRIPT_ROOT}/pkg/generated" \
+    --output-pkg "${THIS_PKG}/pkg/generated" \
+    --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
+    "${SCRIPT_ROOT}/pkg/api"
 

hack/verify-codegen.sh

@@ -4,13 +4,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 DIFFROOT="${SCRIPT_ROOT}/pkg"
-TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"
-_tmp="${SCRIPT_ROOT}/_tmp"
+TMP_DIFFROOT="$(mktemp -d -t "$(basename "$0").XXXXXX")/pkg"
 
 cleanup() {
-    rm -rf "${_tmp}"
+  rm -rf "${TMP_DIFFROOT}"
 }
 trap "cleanup" EXIT SIGINT
 
@@ -20,6 +19,7 @@ mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
 "${SCRIPT_ROOT}/hack/update-codegen.sh"
+
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0
 diff -Naupr "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?