From f8c437bcf40e50979a9e891f03bbace91a243dd3 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Wed, 4 Sep 2024 10:01:46 +0300 Subject: [PATCH 01/11] merge cmd subpackage into main Signed-off-by: Alexandr Stefurishin --- .../src/cmd/{cmd => }/access_log.go | 2 +- .../src/cmd/{cmd => }/access_log_test.go | 2 +- .../src/cmd/cmd/root.go | 233 ------------------ .../src/cmd/main.go | 211 +++++++++++++++- 4 files changed, 211 insertions(+), 237 deletions(-) rename images/sds-local-volume-scheduler-extender/src/cmd/{cmd => }/access_log.go (99%) rename images/sds-local-volume-scheduler-extender/src/cmd/{cmd => }/access_log_test.go (99%) delete mode 100644 images/sds-local-volume-scheduler-extender/src/cmd/cmd/root.go diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log.go b/images/sds-local-volume-scheduler-extender/src/cmd/access_log.go similarity index 99% rename from images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log.go rename to images/sds-local-volume-scheduler-extender/src/cmd/access_log.go index 061f721b..efbe27ea 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/access_log.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package main import ( "context" diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log_test.go b/images/sds-local-volume-scheduler-extender/src/cmd/access_log_test.go similarity index 99% rename from images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log_test.go rename to images/sds-local-volume-scheduler-extender/src/cmd/access_log_test.go index c4f64a95..00cdd8a5 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/access_log_test.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/access_log_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cmd +package main import ( "context" diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/root.go b/images/sds-local-volume-scheduler-extender/src/cmd/cmd/root.go deleted file mode 100644 index ed696954..00000000 --- a/images/sds-local-volume-scheduler-extender/src/cmd/cmd/root.go +++ /dev/null @@ -1,233 +0,0 @@ -/* -Copyright 2024 Flant JSC - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package cmd - -import ( - "context" - "errors" - "fmt" - "net/http" - "os" - "os/signal" - "sync" - "syscall" - "time" - - slv "github.com/deckhouse/sds-local-volume/api/v1alpha1" - snc "github.com/deckhouse/sds-node-configurator/api/v1alpha1" - "github.com/spf13/cobra" - v1 "k8s.io/api/core/v1" - sv1 "k8s.io/api/storage/v1" - "k8s.io/apimachinery/pkg/runtime" - apiruntime "k8s.io/apimachinery/pkg/runtime" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/yaml" - - "sds-local-volume-scheduler-extender/pkg/cache" - "sds-local-volume-scheduler-extender/pkg/controller" - "sds-local-volume-scheduler-extender/pkg/kubutils" - "sds-local-volume-scheduler-extender/pkg/logger" - "sds-local-volume-scheduler-extender/pkg/scheduler" -) - -var cfgFilePath string - -var resourcesSchemeFuncs = []func(*apiruntime.Scheme) error{ - slv.AddToScheme, - snc.AddToScheme, - v1.AddToScheme, - sv1.AddToScheme, -} - -const ( - defaultDivisor = 1 - defaultListenAddr = ":8000" - defaultCacheSize = 10 - defaultcertFile = "/etc/sds-local-volume-scheduler-extender/certs/tls.crt" - defaultkeyFile = "/etc/sds-local-volume-scheduler-extender/certs/tls.key" -) - -type Config struct { - ListenAddr string `json:"listen"` - DefaultDivisor float64 `json:"default-divisor"` - LogLevel string `json:"log-level"` - CacheSize int `json:"cache-size"` - HealthProbeBindAddress string `json:"health-probe-bind-address"` - CertFile string `json:"cert-file"` - KeyFile string `json:"key-file"` -} - -var config = &Config{ - ListenAddr: defaultListenAddr, - DefaultDivisor: defaultDivisor, - LogLevel: "2", - CacheSize: defaultCacheSize, - CertFile: defaultcertFile, - KeyFile: defaultkeyFile, -} - -var rootCmd = &cobra.Command{ - Use: "sds-local-volume-scheduler", - Version: "development", - Short: "a scheduler-extender for sds-local-volume", - Long: `A scheduler-extender for sds-local-volume. -The extender implements filter and prioritize verbs. -The filter verb is "filter" and served at "/filter" via HTTP. -It filters out nodes that have less storage capacity than requested. -The prioritize verb is "prioritize" and served at "/prioritize" via HTTP. -It scores nodes with this formula: - min(10, max(0, log2(capacity >> 30 / divisor))) -The default divisor is 1. It can be changed with a command-line option. -`, - RunE: func(cmd *cobra.Command, _ []string) error { - cmd.SilenceUsage = true - return subMain(cmd.Context()) - }, -} - -func subMain(parentCtx context.Context) error { - if len(cfgFilePath) != 0 { - b, err := os.ReadFile(cfgFilePath) - if err != nil { - return err - } - err = yaml.Unmarshal(b, config) - if err != nil { - return err - } - } - - ctx := context.Background() - log, err := logger.NewLogger(logger.Verbosity(config.LogLevel)) - if err != nil { - fmt.Printf("[subMain] unable to initialize logger, err: %s\n", err.Error()) - } - log.Info(fmt.Sprintf("[subMain] logger has been initialized, log level: %s", config.LogLevel)) - ctrl.SetLogger(log.GetLogger()) - - kConfig, err := kubutils.KubernetesDefaultConfigCreate() - if err != nil { - log.Error(err, "[subMain] unable to KubernetesDefaultConfigCreate") - } - log.Info("[subMain] kubernetes config has been successfully created.") - - scheme := runtime.NewScheme() - for _, f := range resourcesSchemeFuncs { - err := f(scheme) - if err != nil { - log.Error(err, "[subMain] unable to add scheme to func") - os.Exit(1) - } - } - log.Info("[subMain] successfully read scheme CR") - - managerOpts := manager.Options{ - Scheme: scheme, - Logger: log.GetLogger(), - HealthProbeBindAddress: config.HealthProbeBindAddress, - } - - mgr, err := manager.New(kConfig, managerOpts) - if err != nil { - return err - } - - schedulerCache := cache.NewCache(*log) - log.Info("[subMain] scheduler cache was initialized") - - h, err := scheduler.NewHandler(ctx, mgr.GetClient(), *log, schedulerCache, config.DefaultDivisor) - if err != nil { - return err - } - log.Info("[subMain] scheduler handler initialized") - - _, err = controller.RunLVGWatcherCacheController(mgr, *log, schedulerCache) - if err != nil { - log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.LVGWatcherCacheCtrlName)) - } - log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) - - err = controller.RunPVCWatcherCacheController(mgr, *log, schedulerCache) - if err != nil { - log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.PVCWatcherCacheCtrlName)) - } - log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) - - if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { - log.Error(err, "[subMain] unable to mgr.AddHealthzCheck") - os.Exit(1) - } - log.Info("[subMain] successfully AddHealthzCheck") - - if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil { - log.Error(err, "[subMain] unable to mgr.AddReadyzCheck") - os.Exit(1) - } - log.Info("[subMain] successfully AddReadyzCheck") - - serv := &http.Server{ - Addr: config.ListenAddr, - Handler: accessLogHandler(parentCtx, h), - ReadTimeout: 30 * time.Second, - } - log.Info("[subMain] server was initialized") - - var wg sync.WaitGroup - defer wg.Wait() - ctx, stop := signal.NotifyContext(parentCtx, os.Interrupt, syscall.SIGTERM) - defer stop() // stop() should be called before wg.Wait() to stop the goroutine correctly. - wg.Add(1) - go func() { - defer wg.Done() - <-ctx.Done() - if err := serv.Shutdown(parentCtx); err != nil { - log.Error(err, "failed to shutdown gracefully") - } - }() - - go func() { - log.Info("[subMain] kube manager will start now") - err = mgr.Start(ctx) - if err != nil { - log.Error(err, "[subMain] unable to mgr.Start") - os.Exit(1) - } - }() - - log.Info(fmt.Sprintf("[subMain] starts serving on: %s", config.ListenAddr)) - err = serv.ListenAndServeTLS(config.CertFile, config.KeyFile) - if !errors.Is(err, http.ErrServerClosed) { - log.Error(err, "[subMain] unable to run the server") - return err - } - - return nil -} - -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. -func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -} -func init() { - rootCmd.PersistentFlags().StringVar(&cfgFilePath, "config", "", "config file") -} diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index cd9cb8db..29433138 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -16,8 +16,215 @@ limitations under the License. package main -import "sds-local-volume-scheduler-extender/cmd/cmd" +import ( + "context" + "errors" + "fmt" + "net/http" + "os" + "os/signal" + "sds-local-volume-scheduler-extender/pkg/cache" + "sds-local-volume-scheduler-extender/pkg/controller" + "sds-local-volume-scheduler-extender/pkg/kubutils" + "sds-local-volume-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/scheduler" + "sync" + "syscall" + "time" + + slv "github.com/deckhouse/sds-local-volume/api/v1alpha1" + snc "github.com/deckhouse/sds-node-configurator/api/v1alpha1" + "github.com/spf13/cobra" + v1 "k8s.io/api/core/v1" + sv1 "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/healthz" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/yaml" +) + +const ( + defaultDivisor = 1 + defaultListenAddr = ":8000" + defaultCacheSize = 10 + defaultcertFile = "/etc/sds-local-volume-scheduler-extender/certs/tls.crt" + defaultkeyFile = "/etc/sds-local-volume-scheduler-extender/certs/tls.key" +) + +type Config struct { + ListenAddr string `json:"listen"` + DefaultDivisor float64 `json:"default-divisor"` + LogLevel string `json:"log-level"` + CacheSize int `json:"cache-size"` + HealthProbeBindAddress string `json:"health-probe-bind-address"` + CertFile string `json:"cert-file"` + KeyFile string `json:"key-file"` +} + +var cfgFilePath string + +var resourcesSchemeFuncs = []func(*runtime.Scheme) error{ + slv.AddToScheme, + snc.AddToScheme, + v1.AddToScheme, + sv1.AddToScheme, +} + +var config = &Config{ + ListenAddr: defaultListenAddr, + DefaultDivisor: defaultDivisor, + LogLevel: "2", + CacheSize: defaultCacheSize, + CertFile: defaultcertFile, + KeyFile: defaultkeyFile, +} + +var rootCmd = &cobra.Command{ + Use: "sds-local-volume-scheduler", + Version: "development", + Short: "a scheduler-extender for sds-local-volume", + Long: `A scheduler-extender for sds-local-volume. +The extender implements filter and prioritize verbs. +The filter verb is "filter" and served at "/filter" via HTTP. +It filters out nodes that have less storage capacity than requested. +The prioritize verb is "prioritize" and served at "/prioritize" via HTTP. +It scores nodes with this formula: + min(10, max(0, log2(capacity >> 30 / divisor))) +The default divisor is 1. It can be changed with a command-line option. +`, + RunE: func(cmd *cobra.Command, _ []string) error { + cmd.SilenceUsage = true + return subMain(cmd.Context()) + }, +} + +func init() { + rootCmd.PersistentFlags().StringVar(&cfgFilePath, "config", "", "config file") +} func main() { - cmd.Execute() + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} + +func subMain(parentCtx context.Context) error { + if len(cfgFilePath) != 0 { + b, err := os.ReadFile(cfgFilePath) + if err != nil { + return err + } + err = yaml.Unmarshal(b, config) + if err != nil { + return err + } + } + + ctx := context.Background() + log, err := logger.NewLogger(logger.Verbosity(config.LogLevel)) + if err != nil { + fmt.Printf("[subMain] unable to initialize logger, err: %s\n", err.Error()) + } + log.Info(fmt.Sprintf("[subMain] logger has been initialized, log level: %s", config.LogLevel)) + ctrl.SetLogger(log.GetLogger()) + + kConfig, err := kubutils.KubernetesDefaultConfigCreate() + if err != nil { + log.Error(err, "[subMain] unable to KubernetesDefaultConfigCreate") + } + log.Info("[subMain] kubernetes config has been successfully created.") + + scheme := runtime.NewScheme() + for _, f := range resourcesSchemeFuncs { + err := f(scheme) + if err != nil { + log.Error(err, "[subMain] unable to add scheme to func") + os.Exit(1) + } + } + log.Info("[subMain] successfully read scheme CR") + + managerOpts := manager.Options{ + Scheme: scheme, + Logger: log.GetLogger(), + HealthProbeBindAddress: config.HealthProbeBindAddress, + } + + mgr, err := manager.New(kConfig, managerOpts) + if err != nil { + return err + } + + schedulerCache := cache.NewCache(*log) + log.Info("[subMain] scheduler cache was initialized") + + h, err := scheduler.NewHandler(ctx, mgr.GetClient(), *log, schedulerCache, config.DefaultDivisor) + if err != nil { + return err + } + log.Info("[subMain] scheduler handler initialized") + + _, err = controller.RunLVGWatcherCacheController(mgr, *log, schedulerCache) + if err != nil { + log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.LVGWatcherCacheCtrlName)) + } + log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) + + err = controller.RunPVCWatcherCacheController(mgr, *log, schedulerCache) + if err != nil { + log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.PVCWatcherCacheCtrlName)) + } + log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) + + if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { + log.Error(err, "[subMain] unable to mgr.AddHealthzCheck") + os.Exit(1) + } + log.Info("[subMain] successfully AddHealthzCheck") + + if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil { + log.Error(err, "[subMain] unable to mgr.AddReadyzCheck") + os.Exit(1) + } + log.Info("[subMain] successfully AddReadyzCheck") + + serv := &http.Server{ + Addr: config.ListenAddr, + Handler: accessLogHandler(parentCtx, h), + ReadTimeout: 30 * time.Second, + } + log.Info("[subMain] server was initialized") + + var wg sync.WaitGroup + defer wg.Wait() + ctx, stop := signal.NotifyContext(parentCtx, os.Interrupt, syscall.SIGTERM) + defer stop() // stop() should be called before wg.Wait() to stop the goroutine correctly. + wg.Add(1) + go func() { + defer wg.Done() + <-ctx.Done() + if err := serv.Shutdown(parentCtx); err != nil { + log.Error(err, "failed to shutdown gracefully") + } + }() + + go func() { + log.Info("[subMain] kube manager will start now") + err = mgr.Start(ctx) + if err != nil { + log.Error(err, "[subMain] unable to mgr.Start") + os.Exit(1) + } + }() + + log.Info(fmt.Sprintf("[subMain] starts serving on: %s", config.ListenAddr)) + err = serv.ListenAndServeTLS(config.CertFile, config.KeyFile) + if !errors.Is(err, http.ErrServerClosed) { + log.Error(err, "[subMain] unable to run the server") + return err + } + + return nil } From 5202432e38ddc270852b345910c18b0a108583dd Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 09:58:27 +0300 Subject: [PATCH 02/11] refactor Signed-off-by: Alexandr Stefurishin --- .../src/cmd/main.go | 108 ++++++++++-------- .../src/pkg/logger/logger.go | 33 ++++-- 2 files changed, 85 insertions(+), 56 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index 29433138..f9e9c2db 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -94,7 +94,10 @@ It scores nodes with this formula: The default divisor is 1. It can be changed with a command-line option. `, RunE: func(cmd *cobra.Command, _ []string) error { + // to avoid printing usage information when error is returned cmd.SilenceUsage = true + // to avoid printing errors (we log it closer to the place where it has happened) + cmd.SilenceErrors = true return subMain(cmd.Context()) }, } @@ -104,47 +107,51 @@ func init() { } func main() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) + ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGKILL, syscall.SIGINT, syscall.SIGTERM) + + if err := rootCmd.ExecuteContext(ctx); err != nil { + // we expect err to be logged already os.Exit(1) } } -func subMain(parentCtx context.Context) error { +func subMain(ctx context.Context) error { if len(cfgFilePath) != 0 { b, err := os.ReadFile(cfgFilePath) if err != nil { + print(err) return err } - err = yaml.Unmarshal(b, config) - if err != nil { + + if err = yaml.Unmarshal(b, config); err != nil { + print(err) return err } } - ctx := context.Background() - log, err := logger.NewLogger(logger.Verbosity(config.LogLevel)) + log, err := logger.NewLoggerFromConfig(logger.LoggerConfig{Name: "[subMain]", Level: logger.Verbosity(config.LogLevel)}) if err != nil { - fmt.Printf("[subMain] unable to initialize logger, err: %s\n", err.Error()) + print(fmt.Sprintf("unable to initialize logger, err: %s", err)) + return err } - log.Info(fmt.Sprintf("[subMain] logger has been initialized, log level: %s", config.LogLevel)) + log.Info(fmt.Sprintf("logger has been initialized, log level: %s", config.LogLevel)) ctrl.SetLogger(log.GetLogger()) kConfig, err := kubutils.KubernetesDefaultConfigCreate() if err != nil { - log.Error(err, "[subMain] unable to KubernetesDefaultConfigCreate") + log.Error(err, "unable to KubernetesDefaultConfigCreate") + return err } - log.Info("[subMain] kubernetes config has been successfully created.") + log.Info("kubernetes config has been successfully created.") scheme := runtime.NewScheme() for _, f := range resourcesSchemeFuncs { - err := f(scheme) - if err != nil { - log.Error(err, "[subMain] unable to add scheme to func") - os.Exit(1) + if err := f(scheme); err != nil { + log.Error(err, "unable to add scheme to func") + return err } } - log.Info("[subMain] successfully read scheme CR") + log.Info("successfully read scheme CR") managerOpts := manager.Options{ Scheme: scheme, @@ -154,75 +161,82 @@ func subMain(parentCtx context.Context) error { mgr, err := manager.New(kConfig, managerOpts) if err != nil { + log.Error(err, "unable to create manager for creating controllers") return err } schedulerCache := cache.NewCache(*log) - log.Info("[subMain] scheduler cache was initialized") + log.Info("scheduler cache was initialized") h, err := scheduler.NewHandler(ctx, mgr.GetClient(), *log, schedulerCache, config.DefaultDivisor) if err != nil { + log.Error(err, "unable to create http.Handler of the scheduler extender") return err } - log.Info("[subMain] scheduler handler initialized") + log.Info("scheduler handler initialized") - _, err = controller.RunLVGWatcherCacheController(mgr, *log, schedulerCache) - if err != nil { - log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.LVGWatcherCacheCtrlName)) + if _, err = controller.RunLVGWatcherCacheController(mgr, *log, schedulerCache); err != nil { + log.Error(err, fmt.Sprintf("unable to run %s controller", controller.LVGWatcherCacheCtrlName)) + return err } - log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) + log.Info(fmt.Sprintf("successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) - err = controller.RunPVCWatcherCacheController(mgr, *log, schedulerCache) - if err != nil { - log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.PVCWatcherCacheCtrlName)) + if err = controller.RunPVCWatcherCacheController(mgr, *log, schedulerCache); err != nil { + log.Error(err, fmt.Sprintf("unable to run %s controller", controller.PVCWatcherCacheCtrlName)) + return err } - log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) + log.Info(fmt.Sprintf("successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { - log.Error(err, "[subMain] unable to mgr.AddHealthzCheck") - os.Exit(1) + log.Error(err, "unable to mgr.AddHealthzCheck") + return err } - log.Info("[subMain] successfully AddHealthzCheck") + log.Info("successfully AddHealthzCheck") if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil { - log.Error(err, "[subMain] unable to mgr.AddReadyzCheck") - os.Exit(1) + log.Error(err, "unable to mgr.AddReadyzCheck") + return err } - log.Info("[subMain] successfully AddReadyzCheck") + log.Info("successfully AddReadyzCheck") serv := &http.Server{ - Addr: config.ListenAddr, - Handler: accessLogHandler(parentCtx, h), - ReadTimeout: 30 * time.Second, + Addr: config.ListenAddr, + Handler: accessLogHandler(ctx, h), + ReadTimeout: 30 * time.Second, + WriteTimeout: 30 * time.Second, } - log.Info("[subMain] server was initialized") + log.Info("server was initialized") + + return runServer(ctx, serv, mgr, log) +} + +func runServer(ctx context.Context, serv *http.Server, mgr manager.Manager, log *logger.Logger) error { + ctx, stop := context.WithCancel(ctx) var wg sync.WaitGroup defer wg.Wait() - ctx, stop := signal.NotifyContext(parentCtx, os.Interrupt, syscall.SIGTERM) defer stop() // stop() should be called before wg.Wait() to stop the goroutine correctly. wg.Add(1) + go func() { defer wg.Done() <-ctx.Done() - if err := serv.Shutdown(parentCtx); err != nil { + if err := serv.Shutdown(ctx); err != nil { log.Error(err, "failed to shutdown gracefully") } }() go func() { - log.Info("[subMain] kube manager will start now") - err = mgr.Start(ctx) - if err != nil { - log.Error(err, "[subMain] unable to mgr.Start") - os.Exit(1) + log.Info("kube manager will start now") + if err := mgr.Start(ctx); err != nil { + log.Error(err, "unable to mgr.Start") } }() - log.Info(fmt.Sprintf("[subMain] starts serving on: %s", config.ListenAddr)) - err = serv.ListenAndServeTLS(config.CertFile, config.KeyFile) - if !errors.Is(err, http.ErrServerClosed) { - log.Error(err, "[subMain] unable to run the server") + log.Info(fmt.Sprintf("starts serving on: %s", config.ListenAddr)) + + if err := serv.ListenAndServeTLS(config.CertFile, config.KeyFile); !errors.Is(err, http.ErrServerClosed) { + log.Error(err, "unable to run the server") return err } diff --git a/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go b/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go index 6bd12c5e..41d7a76b 100644 --- a/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go +++ b/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go @@ -43,18 +43,33 @@ type ( ) type Logger struct { - log logr.Logger + log logr.Logger + prefix string +} + +type LoggerConfig struct { + Name string + Level Verbosity } func NewLogger(level Verbosity) (*Logger, error) { - v, err := strconv.Atoi(string(level)) + return NewLoggerFromConfig(LoggerConfig{Level: level}) +} + +func NewLoggerFromConfig(cfg LoggerConfig) (*Logger, error) { + v, err := strconv.Atoi(string(cfg.Level)) if err != nil { return nil, err } log := textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(v))).WithCallDepth(1) - return &Logger{log: log}, nil + var prefix string + if cfg.Name != "" { + prefix = cfg.Name + " " + } + + return &Logger{log: log, prefix: prefix}, nil } func (l Logger) GetLogger() logr.Logger { @@ -62,25 +77,25 @@ func (l Logger) GetLogger() logr.Logger { } func (l Logger) Error(err error, message string, keysAndValues ...interface{}) { - l.log.Error(err, fmt.Sprintf("ERROR %s", message), keysAndValues...) + l.log.Error(err, fmt.Sprintf("ERROR %s%s", l.prefix, message), keysAndValues...) } func (l Logger) Warning(message string, keysAndValues ...interface{}) { - l.log.V(warnLvl).Info(fmt.Sprintf("WARNING %s", message), keysAndValues...) + l.log.V(warnLvl).Info(fmt.Sprintf("WARNING %s%s", l.prefix, message), keysAndValues...) } func (l Logger) Info(message string, keysAndValues ...interface{}) { - l.log.V(infoLvl).Info(fmt.Sprintf("INFO %s", message), keysAndValues...) + l.log.V(infoLvl).Info(fmt.Sprintf("INFO %s%s", l.prefix, message), keysAndValues...) } func (l Logger) Debug(message string, keysAndValues ...interface{}) { - l.log.V(debugLvl).Info(fmt.Sprintf("DEBUG %s", message), keysAndValues...) + l.log.V(debugLvl).Info(fmt.Sprintf("DEBUG %s%s", l.prefix, message), keysAndValues...) } func (l Logger) Trace(message string, keysAndValues ...interface{}) { - l.log.V(traceLvl).Info(fmt.Sprintf("TRACE %s", message), keysAndValues...) + l.log.V(traceLvl).Info(fmt.Sprintf("TRACE %s%s", l.prefix, message), keysAndValues...) } func (l Logger) Cache(message string, keysAndValues ...interface{}) { - l.log.V(cacheLvl).Info(fmt.Sprintf("CACHE %s", message), keysAndValues...) + l.log.V(cacheLvl).Info(fmt.Sprintf("CACHE %s%s", l.prefix, message), keysAndValues...) } From 7a6f6d3df801b82dec09856ae7716a9343e33271 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 10:07:56 +0300 Subject: [PATCH 03/11] pass context to manager Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-scheduler-extender/src/cmd/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index f9e9c2db..b5a28914 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -157,6 +157,7 @@ func subMain(ctx context.Context) error { Scheme: scheme, Logger: log.GetLogger(), HealthProbeBindAddress: config.HealthProbeBindAddress, + BaseContext: func() context.Context { return ctx }, } mgr, err := manager.New(kConfig, managerOpts) From db4359ac99de19af509b300014f526770ce48424 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 11:23:42 +0300 Subject: [PATCH 04/11] fix linter issues Signed-off-by: Alexandr Stefurishin --- .../src/cmd/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index b5a28914..42d47021 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -23,11 +23,6 @@ import ( "net/http" "os" "os/signal" - "sds-local-volume-scheduler-extender/pkg/cache" - "sds-local-volume-scheduler-extender/pkg/controller" - "sds-local-volume-scheduler-extender/pkg/kubutils" - "sds-local-volume-scheduler-extender/pkg/logger" - "sds-local-volume-scheduler-extender/pkg/scheduler" "sync" "syscall" "time" @@ -42,6 +37,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/yaml" + + "sds-local-volume-scheduler-extender/pkg/cache" + "sds-local-volume-scheduler-extender/pkg/controller" + "sds-local-volume-scheduler-extender/pkg/kubutils" + "sds-local-volume-scheduler-extender/pkg/logger" + "sds-local-volume-scheduler-extender/pkg/scheduler" ) const ( From 7a681b57e48f1bb7fc552d262007dfd665efd0c8 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 11:30:34 +0300 Subject: [PATCH 05/11] upgrade deps Signed-off-by: Alexandr Stefurishin --- .../src/go.mod | 26 ++++----- .../src/go.sum | 56 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/src/go.mod b/images/sds-local-volume-scheduler-extender/src/go.mod index 25612cba..8837b7e1 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.mod +++ b/images/sds-local-volume-scheduler-extender/src/go.mod @@ -3,18 +3,18 @@ module sds-local-volume-scheduler-extender go 1.22.2 require ( - github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337 + github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b + github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa github.com/go-logr/logr v1.4.2 github.com/go-logr/zapr v1.3.0 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - go.uber.org/zap v1.26.0 + go.uber.org/zap v1.27.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 k8s.io/client-go v0.31.0 k8s.io/klog/v2 v2.130.1 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 sigs.k8s.io/controller-runtime v0.19.0 sigs.k8s.io/yaml v1.4.0 ) @@ -37,7 +37,7 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/imdario/mergo v1.0.0 // indirect + github.com/imdario/mergo v1.0.1 // 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 @@ -48,19 +48,19 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.20.0 // indirect + github.com/prometheus/client_golang v1.20.2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.58.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.34.2 // indirect @@ -69,7 +69,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.31.0 // indirect - k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect + k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/images/sds-local-volume-scheduler-extender/src/go.sum b/images/sds-local-volume-scheduler-extender/src/go.sum index 66d0bf86..9934acdd 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.sum +++ b/images/sds-local-volume-scheduler-extender/src/go.sum @@ -7,10 +7,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889 h1:Cowwhgj3lhWGOIdZEyWmsWRqwp1Hfc6G6SpmYBTs8JM= -github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337 h1:v4HuZxGfTAfqV2Mec/yUXRDO9aVP1+Uhht0+1qZeMsg= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0= +github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b h1:i6OaT6V6+ZgSpxrehwzI6wu4o62ul1Z3Y8BifkL/1Wk= +github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa h1:VaqIf8flnAgl+MY59EYq5zUwRwaSfoLvxTZ4NfXxtgE= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k= @@ -78,21 +78,21 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= -github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= -github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= +github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= @@ -114,13 +114,13 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -129,22 +129,22 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -183,10 +183,10 @@ k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f h1:bnWtxXWdAl5bVOCEPoNdvMkyj6cTW3zxHuwKIakuV9w= -k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f/go.mod h1:G0W3eI9gG219NHRq3h5uQaRBl4pj4ZpwzRP5ti8y770= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= +k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= From 2235b7043603ce579cf34c463eb44d58e614c9af Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 11:52:13 +0300 Subject: [PATCH 06/11] upgrade deps (to pass trivy checks) Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-csi/go.mod | 26 +++++++------- images/sds-local-volume-csi/go.sum | 56 +++++++++++++++--------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/images/sds-local-volume-csi/go.mod b/images/sds-local-volume-csi/go.mod index 3b2ea546..e9e1ea2a 100644 --- a/images/sds-local-volume-csi/go.mod +++ b/images/sds-local-volume-csi/go.mod @@ -4,13 +4,14 @@ go 1.22.3 require ( github.com/container-storage-interface/spec v1.10.0 - github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889 - github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337 + github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b + github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa github.com/go-logr/logr v1.4.2 github.com/golang/protobuf v1.5.4 + github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 golang.org/x/sync v0.8.0 - google.golang.org/grpc v1.65.0 + google.golang.org/grpc v1.66.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 k8s.io/apiextensions-apiserver v0.31.0 @@ -18,7 +19,7 @@ require ( k8s.io/client-go v0.31.0 k8s.io/klog/v2 v2.130.1 k8s.io/mount-utils v0.31.0 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 sigs.k8s.io/controller-runtime v0.19.0 ) @@ -36,8 +37,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/imdario/mergo v1.0.0 // indirect + github.com/imdario/mergo v1.0.1 // 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 @@ -45,7 +45,7 @@ require ( 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/opencontainers/runc v1.1.13 // indirect + github.com/opencontainers/runc v1.1.14 // indirect github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -53,16 +53,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect + k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/images/sds-local-volume-csi/go.sum b/images/sds-local-volume-csi/go.sum index 3fdbe138..ccf8a73a 100644 --- a/images/sds-local-volume-csi/go.sum +++ b/images/sds-local-volume-csi/go.sum @@ -6,10 +6,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889 h1:Cowwhgj3lhWGOIdZEyWmsWRqwp1Hfc6G6SpmYBTs8JM= -github.com/deckhouse/sds-local-volume/api v0.0.0-20240816081122-3de604d3d889/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337 h1:v4HuZxGfTAfqV2Mec/yUXRDO9aVP1+Uhht0+1qZeMsg= -github.com/deckhouse/sds-node-configurator/api v0.0.0-20240816031400-b001b5ab8337/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0= +github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b h1:i6OaT6V6+ZgSpxrehwzI6wu4o62ul1Z3Y8BifkL/1Wk= +github.com/deckhouse/sds-local-volume/api v0.0.0-20240903071950-ed9d3bba999b/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa h1:VaqIf8flnAgl+MY59EYq5zUwRwaSfoLvxTZ4NfXxtgE= +github.com/deckhouse/sds-node-configurator/api v0.0.0-20240902155711-f525d7d805fa/go.mod h1:H71+9G0Jr46Qs0BA3z3/xt0h9lbnJnCEYcaCJCWFBf0= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= @@ -70,12 +70,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= -github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= +github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -105,8 +105,8 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -115,8 +115,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -126,14 +126,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -146,10 +146,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= +google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -175,12 +175,12 @@ k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f h1:bnWtxXWdAl5bVOCEPoNdvMkyj6cTW3zxHuwKIakuV9w= -k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f/go.mod h1:G0W3eI9gG219NHRq3h5uQaRBl4pj4ZpwzRP5ti8y770= +k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= +k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= k8s.io/mount-utils v0.31.0 h1:o+a+n6gyZ7MGc6bIERU3LeFTHbLDBiVReaDpWlJotUE= k8s.io/mount-utils v0.31.0/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= From 58146f8043a49522c1b50122dfd472f97f3620ff Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Thu, 5 Sep 2024 18:32:23 +0300 Subject: [PATCH 07/11] revert logger refactoring Signed-off-by: Alexandr Stefurishin --- .../src/cmd/main.go | 50 +++++++++---------- .../src/pkg/logger/logger.go | 33 ++++-------- 2 files changed, 34 insertions(+), 49 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index 42d47021..2822b56c 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -130,29 +130,29 @@ func subMain(ctx context.Context) error { } } - log, err := logger.NewLoggerFromConfig(logger.LoggerConfig{Name: "[subMain]", Level: logger.Verbosity(config.LogLevel)}) + log, err := logger.NewLogger(logger.Verbosity(config.LogLevel)) if err != nil { - print(fmt.Sprintf("unable to initialize logger, err: %s", err)) + print(fmt.Sprintf("[subMain] unable to initialize logger, err: %s", err)) return err } - log.Info(fmt.Sprintf("logger has been initialized, log level: %s", config.LogLevel)) + log.Info(fmt.Sprintf("[subMain] logger has been initialized, log level: %s", config.LogLevel)) ctrl.SetLogger(log.GetLogger()) kConfig, err := kubutils.KubernetesDefaultConfigCreate() if err != nil { - log.Error(err, "unable to KubernetesDefaultConfigCreate") + log.Error(err, "[subMain] unable to KubernetesDefaultConfigCreate") return err } - log.Info("kubernetes config has been successfully created.") + log.Info("[subMain] kubernetes config has been successfully created.") scheme := runtime.NewScheme() for _, f := range resourcesSchemeFuncs { if err := f(scheme); err != nil { - log.Error(err, "unable to add scheme to func") + log.Error(err, "[subMain] unable to add scheme to func") return err } } - log.Info("successfully read scheme CR") + log.Info("[subMain] successfully read scheme CR") managerOpts := manager.Options{ Scheme: scheme, @@ -163,43 +163,43 @@ func subMain(ctx context.Context) error { mgr, err := manager.New(kConfig, managerOpts) if err != nil { - log.Error(err, "unable to create manager for creating controllers") + log.Error(err, "[subMain] unable to create manager for creating controllers") return err } schedulerCache := cache.NewCache(*log) - log.Info("scheduler cache was initialized") + log.Info("[subMain] scheduler cache was initialized") h, err := scheduler.NewHandler(ctx, mgr.GetClient(), *log, schedulerCache, config.DefaultDivisor) if err != nil { - log.Error(err, "unable to create http.Handler of the scheduler extender") + log.Error(err, "[subMain] unable to create http.Handler of the scheduler extender") return err } - log.Info("scheduler handler initialized") + log.Info("[subMain] scheduler handler initialized") if _, err = controller.RunLVGWatcherCacheController(mgr, *log, schedulerCache); err != nil { - log.Error(err, fmt.Sprintf("unable to run %s controller", controller.LVGWatcherCacheCtrlName)) + log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.LVGWatcherCacheCtrlName)) return err } - log.Info(fmt.Sprintf("successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) + log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.LVGWatcherCacheCtrlName)) if err = controller.RunPVCWatcherCacheController(mgr, *log, schedulerCache); err != nil { - log.Error(err, fmt.Sprintf("unable to run %s controller", controller.PVCWatcherCacheCtrlName)) + log.Error(err, fmt.Sprintf("[subMain] unable to run %s controller", controller.PVCWatcherCacheCtrlName)) return err } - log.Info(fmt.Sprintf("successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) + log.Info(fmt.Sprintf("[subMain] successfully ran %s controller", controller.PVCWatcherCacheCtrlName)) if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { - log.Error(err, "unable to mgr.AddHealthzCheck") + log.Error(err, "[subMain] unable to mgr.AddHealthzCheck") return err } - log.Info("successfully AddHealthzCheck") + log.Info("[subMain] successfully AddHealthzCheck") if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil { - log.Error(err, "unable to mgr.AddReadyzCheck") + log.Error(err, "[subMain] unable to mgr.AddReadyzCheck") return err } - log.Info("successfully AddReadyzCheck") + log.Info("[subMain] successfully AddReadyzCheck") serv := &http.Server{ Addr: config.ListenAddr, @@ -207,7 +207,7 @@ func subMain(ctx context.Context) error { ReadTimeout: 30 * time.Second, WriteTimeout: 30 * time.Second, } - log.Info("server was initialized") + log.Info("[subMain] server was initialized") return runServer(ctx, serv, mgr, log) } @@ -224,21 +224,21 @@ func runServer(ctx context.Context, serv *http.Server, mgr manager.Manager, log defer wg.Done() <-ctx.Done() if err := serv.Shutdown(ctx); err != nil { - log.Error(err, "failed to shutdown gracefully") + log.Error(err, "[runServer] failed to shutdown gracefully") } }() go func() { - log.Info("kube manager will start now") + log.Info("[runServer] kube manager will start now") if err := mgr.Start(ctx); err != nil { - log.Error(err, "unable to mgr.Start") + log.Error(err, "[runServer] unable to mgr.Start") } }() - log.Info(fmt.Sprintf("starts serving on: %s", config.ListenAddr)) + log.Info(fmt.Sprintf("[runServer] starts serving on: %s", config.ListenAddr)) if err := serv.ListenAndServeTLS(config.CertFile, config.KeyFile); !errors.Is(err, http.ErrServerClosed) { - log.Error(err, "unable to run the server") + log.Error(err, "[runServer] unable to run the server") return err } diff --git a/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go b/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go index 41d7a76b..6bd12c5e 100644 --- a/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go +++ b/images/sds-local-volume-scheduler-extender/src/pkg/logger/logger.go @@ -43,33 +43,18 @@ type ( ) type Logger struct { - log logr.Logger - prefix string -} - -type LoggerConfig struct { - Name string - Level Verbosity + log logr.Logger } func NewLogger(level Verbosity) (*Logger, error) { - return NewLoggerFromConfig(LoggerConfig{Level: level}) -} - -func NewLoggerFromConfig(cfg LoggerConfig) (*Logger, error) { - v, err := strconv.Atoi(string(cfg.Level)) + v, err := strconv.Atoi(string(level)) if err != nil { return nil, err } log := textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(v))).WithCallDepth(1) - var prefix string - if cfg.Name != "" { - prefix = cfg.Name + " " - } - - return &Logger{log: log, prefix: prefix}, nil + return &Logger{log: log}, nil } func (l Logger) GetLogger() logr.Logger { @@ -77,25 +62,25 @@ func (l Logger) GetLogger() logr.Logger { } func (l Logger) Error(err error, message string, keysAndValues ...interface{}) { - l.log.Error(err, fmt.Sprintf("ERROR %s%s", l.prefix, message), keysAndValues...) + l.log.Error(err, fmt.Sprintf("ERROR %s", message), keysAndValues...) } func (l Logger) Warning(message string, keysAndValues ...interface{}) { - l.log.V(warnLvl).Info(fmt.Sprintf("WARNING %s%s", l.prefix, message), keysAndValues...) + l.log.V(warnLvl).Info(fmt.Sprintf("WARNING %s", message), keysAndValues...) } func (l Logger) Info(message string, keysAndValues ...interface{}) { - l.log.V(infoLvl).Info(fmt.Sprintf("INFO %s%s", l.prefix, message), keysAndValues...) + l.log.V(infoLvl).Info(fmt.Sprintf("INFO %s", message), keysAndValues...) } func (l Logger) Debug(message string, keysAndValues ...interface{}) { - l.log.V(debugLvl).Info(fmt.Sprintf("DEBUG %s%s", l.prefix, message), keysAndValues...) + l.log.V(debugLvl).Info(fmt.Sprintf("DEBUG %s", message), keysAndValues...) } func (l Logger) Trace(message string, keysAndValues ...interface{}) { - l.log.V(traceLvl).Info(fmt.Sprintf("TRACE %s%s", l.prefix, message), keysAndValues...) + l.log.V(traceLvl).Info(fmt.Sprintf("TRACE %s", message), keysAndValues...) } func (l Logger) Cache(message string, keysAndValues ...interface{}) { - l.log.V(cacheLvl).Info(fmt.Sprintf("CACHE %s%s", l.prefix, message), keysAndValues...) + l.log.V(cacheLvl).Info(fmt.Sprintf("CACHE %s", message), keysAndValues...) } From e289a270f9412f50624deea7dc46fa8b02a96a00 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Tue, 10 Sep 2024 11:34:43 +0300 Subject: [PATCH 08/11] remove sigkill signal handling Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-scheduler-extender/src/cmd/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/sds-local-volume-scheduler-extender/src/cmd/main.go b/images/sds-local-volume-scheduler-extender/src/cmd/main.go index 2822b56c..68ced09d 100644 --- a/images/sds-local-volume-scheduler-extender/src/cmd/main.go +++ b/images/sds-local-volume-scheduler-extender/src/cmd/main.go @@ -108,7 +108,7 @@ func init() { } func main() { - ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGKILL, syscall.SIGINT, syscall.SIGTERM) + ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) if err := rootCmd.ExecuteContext(ctx); err != nil { // we expect err to be logged already From 5a4ece3da4e949dc9ac09205761daba5742f5043 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Tue, 10 Sep 2024 11:50:46 +0300 Subject: [PATCH 09/11] fix trivy Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 4861f294..f2ba61f8 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -2,7 +2,7 @@ {{- $_ := set . "BASE_ALT_DEV" "registry.deckhouse.io/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} {{- $_ := set . "BASE_ALPINE_DEV" "registry.deckhouse.io/base_images/dev-alpine:3.16.3@sha256:c706fa83cc129079e430480369a3f062b8178cac9ec89266ebab753a574aca8e" }} - {{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} + {{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} --- image: {{ $.ImageName }}-golang-artifact from: {{ $.BASE_GOLANG }} From 6967d2ac9546218f33f4ab2c6d825f3a60117fe7 Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Tue, 10 Sep 2024 12:13:49 +0300 Subject: [PATCH 10/11] fix trivy for other projects Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-controller/werf.inc.yaml | 2 +- images/sds-local-volume-csi/Dockerfile | 2 +- images/webhooks/werf.inc.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index c64bf34a..df6cf218 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -1,4 +1,4 @@ -{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} +{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} --- diff --git a/images/sds-local-volume-csi/Dockerfile b/images/sds-local-volume-csi/Dockerfile index 4d11077f..2d95bea9 100644 --- a/images/sds-local-volume-csi/Dockerfile +++ b/images/sds-local-volume-csi/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_ALPINE=registry.deckhouse.io/base_images/alpine:3.16.9-1@sha256:d459393e3090e2f82a97ffb59f1ab5a515af077b6650260e79c9ec4546ab6645 -ARG BASE_GOLANG_ALPINE_BUILDER=registry.deckhouse.io/base_images/golang:1.22.6-alpine@sha256:41ad3e6d91b2e10a15e871672578b11a51c7f2eb126c82e193e38b647da0bbb2 +ARG BASE_GOLANG_ALPINE_BUILDER=registry.deckhouse.io/base_images/golang:1.22.7-alpine@sha256:41ad3e6d91b2e10a15e871672578b11a51c7f2eb126c82e193e38b647da0bbb2 FROM $BASE_GOLANG_ALPINE_BUILDER as builder diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index a8d03c04..9a34283f 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -1,4 +1,4 @@ -{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} +{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} --- From 066541b8e742a18c2b724f0a1dc8ae402f092ebd Mon Sep 17 00:00:00 2001 From: Alexandr Stefurishin Date: Tue, 10 Sep 2024 16:03:32 +0300 Subject: [PATCH 11/11] Revert "fix trivy for other projects" This reverts commit 6967d2ac9546218f33f4ab2c6d825f3a60117fe7. Revert "fix trivy" This reverts commit 5a4ece3da4e949dc9ac09205761daba5742f5043. Signed-off-by: Alexandr Stefurishin --- images/sds-local-volume-controller/werf.inc.yaml | 2 +- images/sds-local-volume-csi/Dockerfile | 2 +- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- images/webhooks/werf.inc.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index df6cf218..c64bf34a 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -1,4 +1,4 @@ -{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} +{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} --- diff --git a/images/sds-local-volume-csi/Dockerfile b/images/sds-local-volume-csi/Dockerfile index 2d95bea9..4d11077f 100644 --- a/images/sds-local-volume-csi/Dockerfile +++ b/images/sds-local-volume-csi/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_ALPINE=registry.deckhouse.io/base_images/alpine:3.16.9-1@sha256:d459393e3090e2f82a97ffb59f1ab5a515af077b6650260e79c9ec4546ab6645 -ARG BASE_GOLANG_ALPINE_BUILDER=registry.deckhouse.io/base_images/golang:1.22.7-alpine@sha256:41ad3e6d91b2e10a15e871672578b11a51c7f2eb126c82e193e38b647da0bbb2 +ARG BASE_GOLANG_ALPINE_BUILDER=registry.deckhouse.io/base_images/golang:1.22.6-alpine@sha256:41ad3e6d91b2e10a15e871672578b11a51c7f2eb126c82e193e38b647da0bbb2 FROM $BASE_GOLANG_ALPINE_BUILDER as builder diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index f2ba61f8..4861f294 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -2,7 +2,7 @@ {{- $_ := set . "BASE_ALT_DEV" "registry.deckhouse.io/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} {{- $_ := set . "BASE_ALPINE_DEV" "registry.deckhouse.io/base_images/dev-alpine:3.16.3@sha256:c706fa83cc129079e430480369a3f062b8178cac9ec89266ebab753a574aca8e" }} - {{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} + {{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} --- image: {{ $.ImageName }}-golang-artifact from: {{ $.BASE_GOLANG }} diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index 9a34283f..a8d03c04 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -1,4 +1,4 @@ -{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.7-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} +{{- $_ := set . "BASE_GOLANG" "registry.deckhouse.io/base_images/golang:1.22.6-bullseye@sha256:260918a3795372a6d33225d361fe5349723be9667de865a23411b50fbcc76c5a" }} {{- $_ := set . "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc" }} ---