diff --git a/pkg/config/config.go b/pkg/config/config.go index 2bff3f523..54b113f46 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -138,7 +138,7 @@ func IsDockerDesktop(ctx context.Context, getter kclient.Reader) (bool, error) { return false, nil } -func Merge(oldConfig, newConfig *apiv1.Config) *apiv1.Config { +func merge(oldConfig, newConfig *apiv1.Config) *apiv1.Config { var ( mergedConfig apiv1.Config ) @@ -235,7 +235,7 @@ func AsConfigMap(cfg *apiv1.Config) (*corev1.ConfigMap, error) { } func asConfigMap(existing, cfg *apiv1.Config) (*corev1.ConfigMap, error) { - newConfig := Merge(existing, cfg) + newConfig := merge(existing, cfg) configBytes, err := json.Marshal(newConfig) if err != nil { diff --git a/pkg/install/install.go b/pkg/install/install.go index c92a34736..b45dd5f99 100644 --- a/pkg/install/install.go +++ b/pkg/install/install.go @@ -110,18 +110,6 @@ func Install(ctx context.Context, image string, opts *Options) error { klogv2.SetOutput(io.Discard) utilruntime.ErrorHandlers = nil - kclient, err := k8sclient.Default() - if err != nil { - return err - } - - serverConf, err := config.Get(ctx, kclient) - if err != nil { - return err - } - - opts.Config = *config.Merge(serverConf, &opts.Config) - // Require E-Mail address when using Let's Encrypt production if opts.Config.LetsEncrypt != nil && *opts.Config.LetsEncrypt == "enabled" { if opts.Config.LetsEncryptTOSAgree == nil || !*opts.Config.LetsEncryptTOSAgree { @@ -175,6 +163,11 @@ func Install(ctx context.Context, image string, opts *Options) error { } } + kclient, err := k8sclient.Default() + if err != nil { + return err + } + var installIngressController bool if ok, err := config.IsDockerDesktop(ctx, kclient); err != nil { return err