Update dependencies and logger for webhook

.prow/verify.yaml

@@ -95,7 +95,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: golangci/golangci-lint:v1.55.0
+        - image: golangci/golangci-lint:v1.55.2
           command:
             - make
           args:

Dockerfile

@@ -18,7 +18,7 @@ WORKDIR /go/src/k8c.io/operating-system-manager
 COPY . .
 RUN make all
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 RUN apk add --no-cache ca-certificates cdrkit
 

cmd/osm-controller/main.go

@@ -46,12 +46,14 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 type options struct {
@@ -239,8 +241,7 @@ func main() {
 			// We use hard-coded namespace kube-system here since manager uses worker cluster config
 			LeaderElectionNamespace: "kube-system",
 			HealthProbeBindAddress:  opt.workerHealthProbeAddress,
-			MetricsBindAddress:      opt.workerMetricsAddress,
-			Port:                    9444,
+			Metrics:                 metricsserver.Options{BindAddress: opt.workerMetricsAddress},
 		})
 		if err != nil {
 			klog.Fatal(err)
@@ -314,12 +315,15 @@ func createManager(opt *options) (manager.Manager, error) {
 		LeaderElectionID:        "operating-system-manager",
 		LeaderElectionNamespace: opt.namespace,
 		HealthProbeBindAddress:  opt.healthProbeAddress,
-		MetricsBindAddress:      opt.metricsAddress,
-		Port:                    9443,
+		Metrics:                 metricsserver.Options{BindAddress: opt.metricsAddress},
 	}
 
 	if opt.workerClusterKubeconfig != "" {
-		options.Namespace = opt.namespace
+		options.Cache = cache.Options{
+			DefaultNamespaces: map[string]cache.Config{
+				opt.namespace: {},
+			},
+		}
 	}
 
 	mgr, err := manager.New(config.GetConfigOrDie(), options)

cmd/webhook/main.go

@@ -18,23 +18,29 @@ package main
 
 import (
 	"flag"
+	"log"
 
+	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 
 	clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1"
 	mdmutation "k8c.io/operating-system-manager/pkg/admission/machinedeployment/mutation"
 	oscvalidation "k8c.io/operating-system-manager/pkg/admission/operatingsystemconfig/validation"
 	ospvalidation "k8c.io/operating-system-manager/pkg/admission/operatingsystemprofile/validation"
 	"k8c.io/operating-system-manager/pkg/crd/osm/v1alpha1"
+	osmlog "k8c.io/operating-system-manager/pkg/log"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	ctrlruntimelog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 type options struct {
@@ -58,10 +64,10 @@ func init() {
 }
 
 func main() {
-	klog.InitFlags(nil)
+	logFlags := osmlog.NewDefaultOptions()
+	logFlags.AddFlags(flag.CommandLine)
 
 	opt := &options{}
-
 	flag.StringVar(&opt.metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&opt.probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&opt.enableLeaderElection, "leader-elect", false,
@@ -72,39 +78,49 @@ func main() {
 		"Directory that contains the server key(tls.key) and certificate(tls.crt).")
 	flag.Parse()
 
-	if len(opt.namespace) == 0 {
-		klog.Fatal("-namespace is required")
+	if err := logFlags.Validate(); err != nil {
+		log.Fatalf("Invalid options: %v", err)
 	}
 
+	rawLog := osmlog.New(logFlags.Debug, logFlags.Format)
+	log := rawLog.Sugar()
+	// set the logger used by controller-runtime
+	ctrlruntimelog.SetLogger(zapr.NewLogger(rawLog.WithOptions(zap.AddCallerSkip(1))))
+
+	if len(opt.namespace) == 0 {
+		log.Fatal("-namespace is required")
+	}
 	mgr, err := manager.New(config.GetConfigOrDie(), manager.Options{
-		CertDir:                 opt.certDir,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			CertDir: opt.certDir,
+			Port:    9443,
+		}),
 		HealthProbeBindAddress:  opt.probeAddr,
 		LeaderElection:          opt.enableLeaderElection,
 		LeaderElectionNamespace: opt.namespace,
 		LeaderElectionID:        "operating-system-manager-leader-lock",
-		MetricsBindAddress:      opt.metricsAddr,
-		Port:                    9443,
+		Metrics:                 metricsserver.Options{BindAddress: opt.metricsAddr},
 		Scheme:                  scheme,
 	})
 	if err != nil {
-		klog.Fatal("failed to create the manager", zap.Error(err))
+		log.Fatal("failed to create the manager", zap.Error(err))
 	}
 
 	// Register webhooks
-	oscvalidation.NewAdmissionHandler().SetupWebhookWithManager(mgr)
-	ospvalidation.NewAdmissionHandler().SetupWebhookWithManager(mgr)
-	mdmutation.NewAdmissionHandler().SetupWebhookWithManager(mgr)
+	oscvalidation.NewAdmissionHandler(log, scheme).SetupWebhookWithManager(mgr)
+	ospvalidation.NewAdmissionHandler(log, scheme).SetupWebhookWithManager(mgr)
+	mdmutation.NewAdmissionHandler(log, scheme).SetupWebhookWithManager(mgr)
 
 	// Add health endpoints
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
-		klog.Fatalf("failed to add health check: %v", zap.Error(err))
+		log.Fatalf("failed to add health check: %v", zap.Error(err))
 	}
 	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
-		klog.Fatalf("failed to add readiness check: %v", zap.Error(err))
+		log.Fatalf("failed to add readiness check: %v", zap.Error(err))
 	}
 
 	klog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
-		klog.Fatalf("failed to start OSC controller: %v", zap.Error(err))
+		log.Fatalf("failed to start OSC controller: %v", zap.Error(err))
 	}
 }

deploy/crd/operatingsystemmanager.k8c.io_operatingsystemconfigs.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: operatingsystemconfigs.operatingsystemmanager.k8c.io
 spec:
   group: operatingsystemmanager.k8c.io

deploy/crd/operatingsystemmanager.k8c.io_operatingsystemprofiles.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: operatingsystemprofiles.operatingsystemmanager.k8c.io
 spec:
   group: operatingsystemmanager.k8c.io

deploy/operating-system-manager-webhook.yaml

@@ -50,8 +50,8 @@ spec:
           name: webhook
           command:
             - /usr/local/bin/webhook
-            - -logtostderr
-            - -v=6
+            - -log-debug=false
+            - -log-format=json # json or console
             - -namespace=kube-system
           volumeMounts:
             - name: operating-system-manager-admission-cert

deploy/operating-system-manager.yaml

@@ -39,8 +39,8 @@ spec:
           name: operating-system-manager
           command:
             - /usr/local/bin/osm-controller
-            - -logtostderr
-            - -v=3
+            - -log-debug=false
+            - -log-format=json # json or console
             - -worker-count=5
             - -cluster-dns=10.10.10.10
             - -metrics-address=0.0.0.0:8080

go.mod

@@ -1,114 +1,111 @@
 module k8c.io/operating-system-manager
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/flatcar-linux/container-linux-config-transpiler v0.9.3
-	github.com/go-logr/logr v1.2.4
+	github.com/flatcar/container-linux-config-transpiler v0.9.4
+	github.com/go-logr/zapr v1.3.0
 	github.com/go-test/deep v1.1.0
-	github.com/kubermatic/machine-controller v1.57.0
-	github.com/onsi/ginkgo v1.16.5
+	github.com/kubermatic/machine-controller v1.58.0
+	github.com/onsi/ginkgo/v2 v2.13.1
 	github.com/pmezard/go-difflib v1.0.0
-	go.uber.org/zap v1.24.0
+	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
+	go.uber.org/zap v1.26.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8c.io/reconciler v0.3.1
-	k8s.io/api v0.26.4
-	k8s.io/apimachinery v0.26.4
-	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.26.4
-	k8s.io/klog v1.0.0
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.14.6
-	sigs.k8s.io/controller-tools v0.9.2
-	sigs.k8s.io/yaml v1.3.0
+	k8c.io/reconciler v0.5.0
+	k8s.io/api v0.28.4
+	k8s.io/apimachinery v0.28.4
+	k8s.io/client-go v0.28.4
+	k8s.io/code-generator v0.28.4
+	k8s.io/klog/v2 v2.110.1
+	k8s.io/utils v0.0.0-20231127182322-b307cd553661
+	sigs.k8s.io/controller-runtime v0.16.3
+	sigs.k8s.io/controller-tools v0.13.0
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/ajeddeloh/go-json v0.0.0-20230327231231-3d460e132080 // indirect
+	github.com/ajeddeloh/go-json v0.0.0-20231102161613-e49c8866685a // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/flatcar-linux/ignition v0.36.1 // indirect
-	github.com/flatcar/container-linux-config-transpiler v0.9.4 // indirect
+	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/flatcar/ignition v0.36.2 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/zapr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/gobuffalo/flect v0.2.5 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/gobuffalo/flect v1.0.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/google/uuid v1.4.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.15.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/apiextensions-apiserver v0.26.4 // indirect
-	k8s.io/component-base v0.26.4 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/kubelet v0.26.4 // indirect
+	k8s.io/apiextensions-apiserver v0.28.4 // indirect
+	k8s.io/component-base v0.28.4 // indirect
+	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
+	k8s.io/kubelet v0.28.4 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-replace k8s.io/client-go => k8s.io/client-go v0.26.4
-
-replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-20220810161552-7cce03887f34
+replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb