Fix extra metrics handler (#135)

Co-authored-by: aalexand <[email protected]>
adobe · Apr 9, 2024 · afdc94d · afdc94d
1 parent 484d54f
commit afdc94d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/client/client.go b/cmd/client/client.go
@@ -112,7 +112,7 @@ func main() {
 	}
 
 	if configFile != "" {
-		options, clientConfig, err = apply(configFile, &clientConfigDefaults)
+		options, clientConfig, err = apply(options, configFile, &clientConfigDefaults)
 		if err != nil {
 			setupLog.Error(err, "unable to load the config file")
 			os.Exit(1)
@@ -219,8 +219,8 @@ func loadWatchedGVKs(cfg configv1.ClientConfig) []schema.GroupVersionKind {
 	return GVKs
 }
 
-func apply(configFile string, clientConfigDefaults *configv1.ClientConfig) (ctrl.Options, configv1.ClientConfig, error) {
-	options, cfg, err := configv1.Load(scheme, configFile, clientConfigDefaults)
+func apply(defaultOptions ctrl.Options, configFile string, clientConfigDefaults *configv1.ClientConfig) (ctrl.Options, configv1.ClientConfig, error) {
+	options, cfg, err := configv1.Load(defaultOptions, scheme, configFile, clientConfigDefaults)
 	if err != nil {
 		return options, cfg, err
 	}

diff --git a/config/crd/bases/registry.ethos.adobe.com_clusters.yaml b/config/crd/bases/registry.ethos.adobe.com_clusters.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/pkg/api/config/v1/clientconfig.go b/pkg/api/config/v1/clientconfig.go
@@ -133,11 +133,12 @@ func Encode(scheme *runtime.Scheme, cfg *ClientConfig) (string, error) {
 
 // Load returns a set of controller options and ClientConfig from the given file, if the config file path is empty
 // it uses the default values.
-func Load(scheme *runtime.Scheme, configFile string, defaults *ClientConfig) (ctrl.Options, ClientConfig, error) {
+func Load(defaultOptions ctrl.Options, scheme *runtime.Scheme, configFile string, defaults *ClientConfig) (ctrl.Options, ClientConfig, error) {
 	var err error
-	options := ctrl.Options{
-		Scheme: scheme,
-	}
+
+	options := defaultOptions
+	options.Scheme = scheme
+
 	cfg := &ClientConfig{}
 	if defaults != nil {
 		cfg = defaults.DeepCopy()