Run update-codegen in module mode

Signed-off-by: James Munnelly <jmunnelly@apple.com>

go.mod

@@ -236,4 +236,9 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )
 
-replace golang.org/x/net => golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
+replace (
+	golang.org/x/net => golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
+
+	// Update gengo to ensure we have the --trim-path-prefix feature in code-generator tools.
+	k8s.io/gengo => k8s.io/gengo v0.0.0-20211115164449-b448ea381d54
+)

go.sum

@@ -1909,14 +1909,8 @@ k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM=
 k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI=
 k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc=
-k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
-k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/gengo v0.0.0-20211115164449-b448ea381d54 h1:LTfmarWsAxo+qlLq6d4FunAM9ZQSq8i6QI+/btzVk+U=
+k8s.io/gengo v0.0.0-20211115164449-b448ea381d54/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

hack/BUILD.bazel

@@ -157,6 +157,9 @@ sh_binary(
         GOROOT,
         GAZELLE,
         KAZEL,
+        "//:go.mod",
+        "//:go.sum",
+        "//hack/boilerplate:all-srcs",
         "@io_k8s_code_generator//cmd/client-gen",
         "@io_k8s_code_generator//cmd/conversion-gen",
         "@io_k8s_code_generator//cmd/deepcopy-gen",

hack/build/repos.bzl

@@ -4131,8 +4131,9 @@ def go_repositories():
         build_file_generation = "on",
         build_file_proto_mode = "disable",
         importpath = "k8s.io/gengo",
-        sum = "h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=",
-        version = "v0.0.0-20210813121822-485abfe95c7c",
+        replace = "k8s.io/gengo",
+        sum = "h1:LTfmarWsAxo+qlLq6d4FunAM9ZQSq8i6QI+/btzVk+U=",
+        version = "v0.0.0-20211115164449-b448ea381d54",
     )
 
     go_repository(

hack/update-codegen.sh

@@ -105,28 +105,7 @@ conversiongen=$PWD/$7
 
 shift 7
 
-fake_gopath=""
-fake_repopath=""
-ensure-in-gopath() {
-  export GOROOT=$go_sdk
-
-  fake_gopath=$(mktemp -d -t codegen.gopath.XXXX)
-
-  fake_repopath=$fake_gopath/src/github.com/jetstack/cert-manager
-  mkdir -p "$fake_repopath"
-  cp -R "$BUILD_WORKSPACE_DIRECTORY/." "$fake_repopath"
-
-  export GOPATH=$fake_gopath
-  cd "$fake_repopath"
-  echo "Created fake GOPATH to run code generators in"
-}
-
-cleanup_gopath() {
-  export GO111MODULE=off
-  "$go" clean --modcache
-  rm -rf "$fake_gopath" || true
-}
-trap cleanup_gopath EXIT
+export GOROOT=$go_sdk
 
 # clean will delete files matching name in path.
 #
@@ -151,24 +130,6 @@ mkcp() {
 # Export mkcp for use in sub-shells
 export -f mkcp
 
-copyfiles() {
-  # Don't copy data if the workspace directory is already within the GOPATH
-  if [ "${BUILD_WORKSPACE_DIRECTORY:0:${#GOPATH}}" = "$GOPATH" ]; then
-    return 0
-  fi
-
-  path=$1
-  name=$2
-  if [[ ! -d "$path" ]]; then
-    return 0
-  fi
-  (
-    cd "$GOPATH/src/$module_name/$path"
-
-    find "." -name "$name" -exec bash -c "mkcp {} \"$BUILD_WORKSPACE_DIRECTORY/$path/{}\"" \;
-  )
-}
-
 gen-deepcopy() {
   clean pkg/apis 'zz_generated.deepcopy.go'
   clean pkg/acme/webhook/apis 'zz_generated.deepcopy.go'
@@ -180,10 +141,8 @@ gen-deepcopy() {
     --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     --output-file-base zz_generated.deepcopy \
+    --trim-path-prefix="$module_name" \
     --bounding-dirs "${module_name}"
-  for dir in "${deepcopy_inputs[@]}"; do
-    copyfiles "$dir" "zz_generated.deepcopy.go"
-  done
 }
 
 gen-clientsets() {
@@ -196,8 +155,8 @@ gen-clientsets() {
     --clientset-name versioned \
     --input-base "" \
     --input "$joined" \
+    --trim-path-prefix="$module_name" \
     --output-package "${client_package}"/clientset
-  copyfiles "${client_subpackage}/clientset" "*.go"
 }
 
 gen-listers() {
@@ -208,8 +167,8 @@ gen-listers() {
   "$listergen" \
     --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
+    --trim-path-prefix="$module_name" \
     --output-package "${client_package}"/listers
-  copyfiles "${client_subpackage}/listers" "*.go"
 }
 
 gen-informers() {
@@ -222,8 +181,8 @@ gen-informers() {
     --input-dirs "$joined" \
     --versioned-clientset-package "${client_package}"/clientset/versioned \
     --listers-package "${client_package}"/listers \
+    --trim-path-prefix="$module_name" \
     --output-package "${client_package}"/informers
-  copyfiles "${client_subpackage}/informers" "*.go"
 }
 
 gen-defaulters() {
@@ -235,10 +194,8 @@ gen-defaulters() {
   "$defaultergen" \
     --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
+    --trim-path-prefix="$module_name" \
     -O zz_generated.defaults
-  for dir in "${defaulter_inputs[@]}"; do
-    copyfiles "$dir" "zz_generated.defaults.go"
-  done
 }
 
 gen-conversions() {
@@ -258,24 +215,12 @@ gen-conversions() {
       --extra-peer-dirs $( IFS=$','; echo "${CONVERSION_EXTRA_PEER_PKGS[*]}" ) \
       --extra-dirs $( IFS=$','; echo "${CONVERSION_PKGS[*]}" ) \
       --input-dirs $( IFS=$','; echo "${CONVERSION_PKGS[*]}" ) \
+      --trim-path-prefix="$module_name" \
       -O zz_generated.conversion
-
-  # copy into source folder
-  for dir in "${conversion_inputs[@]}"; do
-    copyfiles "$dir" "zz_generated.conversion.go"
-  done
 }
 
 runfiles="$(pwd)"
-export GO111MODULE=off
-ensure-in-gopath
-old=${GOCACHE:-}
-export GOCACHE=$(mktemp -d -t codegen.gocache.XXXX)
-export GO111MODULE=on
-export GOSUMDB=sum.golang.org
-"$go_sdk/bin/go" mod vendor
-export GO111MODULE=off
-export GOCACHE=$old
+cd "$BUILD_WORKSPACE_DIRECTORY"
 
 gen-deepcopy
 gen-clientsets
@@ -285,6 +230,5 @@ gen-defaulters
 gen-conversions
 
 ## Call update-bazel
-export GO111MODULE=on
 cd "$runfiles"
 "$@"

internal/apis/acme/v1/doc.go

@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/acme/v1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=../../../../pkg/apis/acme/v1
+// +k8s:defaulter-gen-input=github.com/jetstack/cert-manager/pkg/apis/acme/v1
 
 // +groupName=acme.cert-manager.io
 package v1

internal/apis/acme/v1alpha2/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/acme/v1alpha2
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=acme.cert-manager.io

internal/apis/acme/v1alpha3/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/acme/v1alpha3
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=acme.cert-manager.io

internal/apis/acme/v1beta1/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/acme/v1beta1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=acme.cert-manager.io

internal/apis/certmanager/v1/doc.go

@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=../../../../pkg/apis/certmanager/v1
+// +k8s:defaulter-gen-input=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1
 
 // +groupName=cert-manager.io
 package v1

internal/apis/certmanager/v1alpha2/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha2
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=cert-manager.io

internal/apis/certmanager/v1alpha3/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha3
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=cert-manager.io

internal/apis/certmanager/v1beta1/doc.go

@@ -17,7 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/internal/apis/certmanager/v1beta1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=./
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=cert-manager.io

internal/apis/config/webhook/v1alpha1/doc.go

@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/config/webhook
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=../../../../../pkg/apis/config/webhook/v1alpha1
+// +k8s:defaulter-gen-input=github.com/jetstack/cert-manager/pkg/apis/config/webhook/v1alpha1
 
 // +groupName=webhook.config.cert-manager.io
 package v1alpha1

internal/apis/meta/v1/doc.go

@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/meta
 // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/meta/v1
 // +k8s:defaulter-gen=TypeMeta
-// +k8s:defaulter-gen-input=../../../../pkg/apis/meta/v1
+// +k8s:defaulter-gen-input=github.com/jetstack/cert-manager/pkg/apis/meta/v1
 
 // +groupName=meta.cert-manager.io
 package v1