updated controller-manager-library dependency (#374)

.golangci.yaml

@@ -2,12 +2,6 @@ run:
   concurrency: 4
   deadline: 10m
 
-  skip-dirs:
-    - test/functional/config
-
-  skip-files:
-    - "zz_generated.*\\.go$"
-
 linters:
   enable:
     - revive
@@ -20,6 +14,12 @@ linters:
 
 issues:
   exclude-use-default: false
+
+  exclude-dirs:
+    - test/functional/config
+  exclude-files:
+    - "zz_generated.*\\.go$"
+
   exclude:
     # errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
     - Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked

cmd/compound/main.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller"
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller/mappings"
 	"github.com/gardener/controller-manager-library/pkg/resources"
+	"github.com/gardener/controller-manager-library/pkg/utils"
 	_ "go.uber.org/automaxprocs"
 	istionetworkingv1 "istio.io/client-go/pkg/apis/networking/v1"
 	istionetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
@@ -66,15 +67,15 @@ func init() {
 	mappings.ForControllerGroup(dnsprovider.CONTROLLER_GROUP_DNS_CONTROLLERS).
 		Map(controller.CLUSTER_MAIN, dnssource.TARGET_CLUSTER).MustRegister()
 
-	resources.Register(v1alpha1.SchemeBuilder)
-	resources.Register(coordinationv1.SchemeBuilder)
-	resources.Register(networkingv1.SchemeBuilder)
-	resources.Register(istionetworkingv1alpha3.SchemeBuilder)
-	resources.Register(istionetworkingv1beta1.SchemeBuilder)
-	resources.Register(istionetworkingv1.SchemeBuilder)
-	resources.Register(gatewayapisv1alpha2.SchemeBuilder)
-	resources.Register(gatewayapisv1beta1.SchemeBuilder)
-	resources.Register(gatewayapisv1.SchemeBuilder)
+	utils.Must(resources.Register(v1alpha1.SchemeBuilder))
+	utils.Must(resources.Register(coordinationv1.SchemeBuilder))
+	utils.Must(resources.Register(networkingv1.SchemeBuilder))
+	utils.Must(resources.Register(istionetworkingv1alpha3.SchemeBuilder))
+	utils.Must(resources.Register(istionetworkingv1beta1.SchemeBuilder))
+	utils.Must(resources.Register(istionetworkingv1.SchemeBuilder))
+	utils.Must(resources.Register(gatewayapisv1alpha2.SchemeBuilder))
+	utils.Must(resources.Register(gatewayapisv1beta1.SchemeBuilder))
+	utils.Must(resources.Register(gatewayapisv1.SchemeBuilder))
 
 	embed.RegisterCreateServerFunc(remote.CreateServer)
 }

cmd/dedicated/main.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller"
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller/mappings"
 	"github.com/gardener/controller-manager-library/pkg/resources"
+	"github.com/gardener/controller-manager-library/pkg/utils"
 	_ "go.uber.org/automaxprocs"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	networkingv1 "k8s.io/api/networking/v1"
@@ -57,9 +58,9 @@ func init() {
 	mappings.ForControllerGroup(dnsprovider.CONTROLLER_GROUP_DNS_CONTROLLERS).
 		Map(controller.CLUSTER_MAIN, dnssource.TARGET_CLUSTER).MustRegister()
 
-	resources.Register(v1alpha1.SchemeBuilder)
-	resources.Register(coordinationv1.SchemeBuilder)
-	resources.Register(networkingv1.SchemeBuilder)
+	utils.Must(resources.Register(v1alpha1.SchemeBuilder))
+	utils.Must(resources.Register(coordinationv1.SchemeBuilder))
+	utils.Must(resources.Register(networkingv1.SchemeBuilder))
 }
 
 func migrateExtensionsIngress(c controllermanager.Configuration) controllermanager.Configuration {

go.mod

@@ -10,35 +10,35 @@ require (
 	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190603021944-12ad9f921c0b
 	github.com/aws/aws-sdk-go v1.44.173
 	github.com/cloudflare/cloudflare-go v0.11.4
-	github.com/gardener/controller-manager-library v0.2.1-0.20240214101453-c2ba8556a43a
+	github.com/gardener/controller-manager-library v0.2.1-0.20240610092456-2d1cdc3e6f13
 	github.com/go-openapi/runtime v0.24.1
 	github.com/go-openapi/strfmt v0.21.2
 	github.com/gophercloud/gophercloud v0.24.0
 	github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16
 	github.com/infobloxopen/infoblox-go-client/v2 v2.1.0
 	github.com/miekg/dns v1.1.51
 	github.com/netlify/open-api v1.1.0
-	github.com/onsi/ginkgo/v2 v2.17.3
+	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_golang v1.18.0
 	go.uber.org/atomic v1.10.0
 	go.uber.org/automaxprocs v1.4.0
 	golang.org/x/oauth2 v0.16.0
 	golang.org/x/sync v0.7.0
-	golang.org/x/tools v0.20.0
+	golang.org/x/tools v0.22.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 	google.golang.org/api v0.149.0
 	google.golang.org/grpc v1.62.1
 	google.golang.org/protobuf v1.33.0
 	istio.io/api v1.22.0
 	istio.io/client-go v1.22.0
-	k8s.io/api v0.29.0
-	k8s.io/apiextensions-apiserver v0.28.3
-	k8s.io/apimachinery v0.29.0
-	k8s.io/client-go v0.29.0
-	k8s.io/code-generator v0.28.3
+	k8s.io/api v0.29.5
+	k8s.io/apiextensions-apiserver v0.29.5
+	k8s.io/apimachinery v0.29.5
+	k8s.io/client-go v0.29.5
+	k8s.io/code-generator v0.29.5
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/controller-runtime v0.16.3
+	sigs.k8s.io/controller-runtime v0.17.5
 	sigs.k8s.io/controller-tools v0.13.0
 	sigs.k8s.io/gateway-api v1.0.0
 	sigs.k8s.io/kind v0.18.0
@@ -64,7 +64,7 @@ require (
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/analysis v0.21.2 // indirect
@@ -93,7 +93,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/ironcore-dev/vgopath v0.1.3 // indirect
+	github.com/ironcore-dev/vgopath v0.1.4 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -114,18 +114,18 @@ require (
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/cobra v1.7.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.mongodb.org/mongo-driver v1.8.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
@@ -136,7 +136,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect