From 2a91be7712a9ff25a8d00ea090604fef7eb8fe01 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 1 Feb 2024 17:09:50 +0100 Subject: [PATCH 1/2] Enable the profiling endpoint Signed-off-by: Stephen Kitt --- main.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index a75022890..54e5ae654 100644 --- a/main.go +++ b/main.go @@ -83,7 +83,9 @@ func init() { func main() { var enableLeaderElection bool var probeAddr string + var pprofAddr string flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") + flag.StringVar(&pprofAddr, "pprof-bind-address", ":8082", "The address the profiling endpoint binds to.") flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") @@ -173,7 +175,8 @@ func main() { Cache: cache.Options{ DefaultNamespaces: map[string]cache.Config{namespace: {}}, }, - MapperProvider: apiutil.NewDynamicRESTMapper, + MapperProvider: apiutil.NewDynamicRESTMapper, + PprofBindAddress: pprofAddr, }) if err != nil { log.Error(err, "unable to start manager") From ff1a6ee341d6e4a0c4569036a1bff5ed065b2db4 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Thu, 8 Feb 2024 08:51:09 -0500 Subject: [PATCH 2/2] Bump github.com/opencontainers/runc to v1.1.12 ...to fix CVE. Signed-off-by: Tom Pantelis --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index a2fab3809..8e6c3e631 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -143,7 +143,7 @@ require ( github.com/onsi/gomega v1.30.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc5 // indirect - github.com/opencontainers/runc v1.1.9 // indirect + github.com/opencontainers/runc v1.1.12 // indirect github.com/opencontainers/runtime-spec v1.1.0 // indirect github.com/operator-framework/ansible-operator-plugins v1.33.0 // indirect github.com/operator-framework/api v0.20.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 22d0df0c1..07161ba3e 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -771,8 +771,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM= -github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= +github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss= +github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/operator-framework/ansible-operator-plugins v1.33.0 h1:cN5jYyNjVmDu2o0Q/xSRTgOWP5PkcnttE7IotgjHKKg=