Add "--version" flag

Makefile

@@ -21,7 +21,7 @@ KUBECONFIG                  := dev/kubeconfig.yaml
 MANAGER_CONFIG_FILE         := example/00-componentconfig.yaml
 PROJECT_NAME                := 23technologies
 VERSION                     := $(shell cat "${REPO_ROOT}/VERSION")
-LD_FLAGS                    := "-w -X github.com/${PROJECT_NAME}/${EXTENSION_PREFIX}-${NAME}/pkg/version.Version=${VERSION}"
+LD_FLAGS                    := "-w $(shell $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/get-build-ld-flags.sh k8s.io/component-base $(REPO_ROOT)/VERSION $(EXTENSION_PREFIX)-$(NAME))"
 LEADER_ELECTION             := false
 IGNORE_OPERATION_ANNOTATION := true
 GARDENER_VERSION            := $(grep "gardener/gardener v" go.mod | tr "[:blank:]" "\\n" | tail -1)
@@ -150,11 +150,3 @@ install-requirements:
 
 .PHONY: verify-extended
 verify-extended: install-requirements check-generate check format test-clean
-
-#########################################
-# Rules for infra-cli
-#########################################
-
-.PHONY: install-infra-cli
-install-infra-cli:
-	@go install -mod=vendor ./cmd/infra-cli

pkg/cmd/admission/cmd.go

@@ -30,6 +30,7 @@ import (
 	gardenerhealthz "github.com/gardener/gardener/pkg/healthz"
 	"github.com/spf13/cobra"
 	"k8s.io/component-base/config"
+	"k8s.io/component-base/version/verflag"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -59,6 +60,10 @@ func NewAdmissionCommand(ctx context.Context) *cobra.Command {
 	cmdDefinition := &cobra.Command{
 		Use: fmt.Sprintf("admission-%s", ionos.Type),
 
+		PreRun: func(cmdDefinition *cobra.Command, args []string) {
+			verflag.PrintAndExitIfRequested()
+		},
+
 		RunE: func(cmdDefinition *cobra.Command, args []string) error {
 			if err := aggOption.Complete(); err != nil {
 				return fmt.Errorf("Error completing options: %w", err)
@@ -102,7 +107,9 @@ func NewAdmissionCommand(ctx context.Context) *cobra.Command {
 		},
 	}
 
-	aggOption.AddFlags(cmdDefinition.Flags())
+	cmdFlags := cmdDefinition.Flags()
+	aggOption.AddFlags(cmdFlags)
+	verflag.AddFlags(cmdFlags)
 
 	return cmdDefinition
 }

pkg/cmd/controller/cmd.go

@@ -39,6 +39,7 @@ import (
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	autoscalingv1beta2 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2"
+	"k8s.io/component-base/version/verflag"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -111,6 +112,10 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 	cmdDefinition := &cobra.Command{
 		Use: fmt.Sprintf("%s-controller-manager", ionos.Name),
 
+		PreRun: func(cmdDefinition *cobra.Command, args []string) {
+			verflag.PrintAndExitIfRequested()
+		},
+
 		RunE: func(cmdDefinition *cobra.Command, args []string) error {
 			if err := aggOption.Complete(); err != nil {
 				return fmt.Errorf("Error completing options: %w", err)
@@ -208,7 +213,9 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 		},
 	}
 
-	aggOption.AddFlags(cmdDefinition.Flags())
+	cmdFlags := cmdDefinition.Flags()
+	aggOption.AddFlags(cmdFlags)
+	verflag.AddFlags(cmdFlags)
 
 	return cmdDefinition
 }

vendor/modules.txt

@@ -860,6 +860,7 @@ k8s.io/code-generator/third_party/forked/golang/reflect
 k8s.io/component-base/config
 k8s.io/component-base/config/v1alpha1
 k8s.io/component-base/version
+k8s.io/component-base/version/verflag
 # k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c
 ## explicit; go 1.13
 k8s.io/gengo/args