From 89f625682755ae412d37d3f720ab293e2ffbb98f Mon Sep 17 00:00:00 2001 From: Sergio Rua Date: Fri, 22 Sep 2023 08:36:28 +0100 Subject: [PATCH] Upgrade backend libraries - new lib params --- Dockerfile | 2 +- main.go | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6488603..f9b7c6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 as builder ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/main.go b/main.go index 8a4a751..130b0f8 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,7 @@ import ( dmetrics "digitalis.io/vals-operator/metrics" "digitalis.io/vals-operator/vault" "sigs.k8s.io/controller-runtime/pkg/metrics" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" //+kubebuilder:scaffold:imports ) @@ -128,9 +129,11 @@ func main() { } mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ - Scheme: scheme, - MetricsBindAddress: metricsAddr, - Port: 9443, + Scheme: scheme, + Metrics: metricsserver.Options{ + BindAddress: metricsAddr, + SecureServing: false, + }, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaderElectionID: "6d6f94cf.digitalis.io",