Bump sigs.k8s.io/controller-runtime from 0.14.2 to 0.14.4 (#72)

* Bump sigs.k8s.io/controller-runtime from 0.14.2 to 0.14.4

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.14.2 to 0.14.4.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.14.2...v0.14.4)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Implement changes

* Remove useless make generate

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Oliver Borchert <[email protected]>

Author: dependabot[bot]

Makefile

@@ -20,10 +20,6 @@ help: ## Display this help.
 #--------------------------------------------------------------------------------------------------
 ##@ Development
 
-.PHONY: generate
-generate: controller-gen ## Generate code for custom resources
-	$(CONTROLLER_GEN) object paths="./..."
-
 .PHONY: docs
 docs: ## Generate helm docs in chart/README.md
 	cd $(CURDIR)/chart
@@ -48,11 +44,11 @@ e2e-tests: create-cluster ## Run end-to-end tests
 ##@ Build
 
 .PHONY: build
-build: generate ## Build manager binary.
+build: ## Build manager binary.
 	go build -o bin/manager cmd/main.go
 
 .PHONY: run
-run: generate ## Run a controller from your host.
+run: ## Run a controller from your host.
 	go run cmd/main.go --config dev/config.yaml
 
 #--------------------------------------------------------------------------------------------------
@@ -79,28 +75,3 @@ setup-cluster: create-cluster ## Set up the currently connected Kubernetes clust
 .PHONY: teardown-cluster
 teardown-cluster: ## Tear down a locally running Kubernetes cluster
 	kind delete cluster --name ${KIND_CLUSTER_NAME} || :
-
-#--------------------------------------------------------------------------------------------------
-##@ Tool Installation
-
-CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
-.PHONY: controller-gen
-controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
-
-#--------------------------------------------------------------------------------------------------
-# HELPERS
-#--------------------------------------------------------------------------------------------------
-# go-get-tool will 'go get' any package $2 and install it to $1.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-get-tool
-@[ -f $(1) ] || { \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-go mod init tmp ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef

cmd/main.go

@@ -3,13 +3,15 @@ package main
 import (
 	"context"
 	"flag"
+	"os"
 
 	configv1 "github.com/borchero/switchboard/internal/config/v1"
 	"github.com/borchero/switchboard/internal/controllers"
 	"github.com/borchero/zeus/pkg/zeus"
 	certmanager "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
 	traefik "github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1"
 	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,16 +33,26 @@ func main() {
 	logger := zeus.Logger(ctx)
 	defer zeus.Sync()
 
-	// Load the options and initialize the schema
-	var err error
-	options := ctrl.Options{Scheme: runtime.NewScheme()}
+	// Load the config file if available
 	var config configv1.Config
 	if cfgFile != "" {
-		// Load the config file if present
-		options, err = options.AndFrom(ctrl.ConfigFile().AtPath(cfgFile).OfKind(&config))
+		file, err := os.Open(cfgFile)
 		if err != nil {
-			logger.Fatal("failed to load config file", zap.Error(err))
+			logger.Fatal("failed to open config file", zap.Error(err))
 		}
+		if err := yaml.NewDecoder(file).Decode(config); err != nil {
+			logger.Fatal("failed to parse config file", zap.Error(err))
+		}
+	}
+
+	// Initialize the options and the schema
+	options := ctrl.Options{
+		Scheme:                  runtime.NewScheme(),
+		LeaderElection:          config.LeaderElection.LeaderElect,
+		LeaderElectionID:        config.LeaderElection.ResourceName,
+		LeaderElectionNamespace: config.LeaderElection.ResourceNamespace,
+		MetricsBindAddress:      config.Metrics.BindAddress,
+		HealthProbeBindAddress:  config.Health.HealthProbeBindAddress,
 	}
 	initScheme(config, options.Scheme)
 

go.mod

@@ -11,10 +11,11 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/traefik/traefik/v2 v2.9.8
 	go.uber.org/zap v1.24.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
 	k8s.io/client-go v0.26.1
-	sigs.k8s.io/controller-runtime v0.14.2
+	sigs.k8s.io/controller-runtime v0.14.4
 	sigs.k8s.io/external-dns v0.13.2
 )
 
@@ -81,7 +82,6 @@ require (
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect

go.sum

@@ -697,8 +697,8 @@ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/controller-runtime v0.14.2 h1:P6IwDhbsRWsBClt/8/h8Zy36bCuGuW5Op7MHpFrN/60=
-sigs.k8s.io/controller-runtime v0.14.2/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
+sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M=
+sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
 sigs.k8s.io/external-dns v0.13.2 h1:TGxbjrKSB7ogJQSIOggOayel5zn+d3+fj7x6Ct/o2r0=
 sigs.k8s.io/external-dns v0.13.2/go.mod h1:On+311+3G04hcnKZBSAw0giggmUvRaqmXX1OAxAPYV0=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

internal/config/v1/config_types.go internal/config/v1/config.go

@@ -2,25 +2,43 @@ package v1
 
 import (
 	v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	cfg "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
 )
 
-func init() {
-	SchemeBuilder.Register(&Config{})
+// Config is the Schema for the configs API
+type Config struct {
+	ControllerConfig `json:",inline"`
+	Selector         IngressSelector    `json:"selector"`
+	Integrations     IntegrationConfigs `json:"integrations"`
 }
 
-//+kubebuilder:object:root=true
+//-------------------------------------------------------------------------------------------------
 
-// Config is the Schema for the configs API
-type Config struct {
-	metav1.TypeMeta                        `json:",inline"`
-	cfg.ControllerManagerConfigurationSpec `json:",inline"`
+// ControllerConfig provides configuration for the controller.
+type ControllerConfig struct {
+	Health         HealthConfig         `json:"health,omitempty"`
+	LeaderElection LeaderElectionConfig `json:"leaderElection,omitempty"`
+	Metrics        MetricsConfig        `json:"metrics,omitempty"`
+}
 
-	Selector     IngressSelector    `json:"selector"`
-	Integrations IntegrationConfigs `json:"integrations"`
+// HealthConfig provides configuration for the controller health checks.
+type HealthConfig struct {
+	HealthProbeBindAddress string `json:"healthProbeBindAddress,omitempty"`
 }
 
+// LeaderElectionConfig provides configuration for the leader election.
+type LeaderElectionConfig struct {
+	LeaderElect       bool   `json:"leaderElect,omitempty"`
+	ResourceName      string `json:"resourceName,omitempty"`
+	ResourceNamespace string `json:"resourceNamespace,omitempty"`
+}
+
+// MetricsConfig provides configuration for the controller metrics.
+type MetricsConfig struct {
+	BindAddress string `json:"bindAddress,omitempty"`
+}
+
+//-------------------------------------------------------------------------------------------------
+
 // IngressSelector can be used to limit operations to ingresses with a specific class.
 type IngressSelector struct {
 	IngressClass *string `json:"ingressClass,omitempty"`