Merge pull request #651 from jetstack/upgrade_klone

Run 'make upgrade-klone' and 'make generate'

Author: inteon

klone.yaml

@@ -10,55 +10,55 @@ targets:
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: 64ae59dc5eefce752ff785f648ac8a8ed0222cbd
       repo_path: modules/tools

make/_shared/kind/kind.mk

@@ -80,7 +80,7 @@ kind-cluster-clean: $(NEEDS_KIND)
 .PHONY: kind-logs
 ## Get the Kind cluster
 ## @category [shared] Kind cluster
-kind-logs: | kind-cluster $(NEEDS_KIND) $(bin_dir)/artifacts
-	rm -rf $(bin_dir)/artifacts/e2e-logs
-	mkdir -p $(bin_dir)/artifacts/e2e-logs
-	$(KIND) export logs $(bin_dir)/artifacts/e2e-logs --name=$(kind_cluster_name)
+kind-logs: | kind-cluster $(NEEDS_KIND) $(ARTIFACTS)
+	rm -rf $(ARTIFACTS)/e2e-logs
+	mkdir -p $(ARTIFACTS)/e2e-logs
+	$(KIND) export logs $(ARTIFACTS)/e2e-logs --name=$(kind_cluster_name)

make/_shared/tools/00_mod.mk

@@ -93,7 +93,7 @@ tools += controller-gen=v0.17.3
 # https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
 tools += goimports=v0.31.0
 # https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
-tools += go-licenses=v2.0.0-alpha.1
+tools += go-licenses=9c778fc0cb52740485f53cc439b1f3c9578a1830
 # https://pkg.go.dev/gotest.tools/gotestsum?tab=versions
 tools += gotestsum=v1.12.1
 # https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v4?tab=versions
@@ -325,7 +325,9 @@ go_dependencies :=
 go_dependencies += ginkgo=github.com/onsi/ginkgo/v2/ginkgo
 go_dependencies += controller-gen=sigs.k8s.io/controller-tools/cmd/controller-gen
 go_dependencies += goimports=golang.org/x/tools/cmd/goimports
-go_dependencies += go-licenses=github.com/google/go-licenses/v2
+# switch back to github.com/google/go-licenses once
+# https://github.com/google/go-licenses/pull/327 is merged.
+go_dependencies += go-licenses=github.com/inteon/go-licenses/v2
 go_dependencies += gotestsum=gotest.tools/gotestsum
 go_dependencies += kustomize=sigs.k8s.io/kustomize/kustomize/v4
 go_dependencies += gojq=github.com/itchyny/gojq/cmd/gojq

pkg/internal/cyberark/servicediscovery/discovery_test.go

@@ -3,7 +3,6 @@ package servicediscovery
 import (
 	"context"
 	"crypto/rand"
-	_ "embed"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -13,6 +12,8 @@ import (
 	"testing"
 
 	"github.com/jetstack/preflight/pkg/version"
+
+	_ "embed"
 )
 
 //go:embed testdata/discovery_success.json