[camel-k] branch main updated: fix #4167 : Default integrationPlatform created at operator startup dose not honor OPERATOR_ID config

[pcongiusti]

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new f726675e6 fix #4167 : Default integrationPlatform created at operator 
startup dose not honor OPERATOR_ID config
f726675e6 is described below

commit f726675e6312b51a39cb23045133efa3023d7a99
Author: Andrea Tarocchi <andrea.taroc...@gmail.com>
AuthorDate: Tue Mar 28 00:21:12 2023 +0200

    fix #4167 : Default integrationPlatform created at operator startup dose 
not honor OPERATOR_ID config
---
 pkg/cmd/operator/operator.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
index 3ae18d967..8e0028020 100644
--- a/pkg/cmd/operator/operator.go
+++ b/pkg/cmd/operator/operator.go
@@ -30,6 +30,7 @@ import (
        "time"
 
        "github.com/pkg/errors"
+       "k8s.io/klog/v2"
 
        "go.uber.org/automaxprocs/maxprocs"
        "go.uber.org/zap"
@@ -46,8 +47,6 @@ import (
        "k8s.io/apimachinery/pkg/selection"
        "k8s.io/client-go/tools/leaderelection/resourcelock"
        "k8s.io/client-go/tools/record"
-       "k8s.io/klog/v2"
-
        "sigs.k8s.io/controller-runtime/pkg/cache"
        ctrl "sigs.k8s.io/controller-runtime/pkg/client"
        "sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -243,20 +242,26 @@ func Run(healthPort, monitoringPort int32, leaderElection 
bool, leaderElectionID
 
 // findOrCreateIntegrationPlatform create default integration platform in 
operator namespace if not already exists.
 func findOrCreateIntegrationPlatform(ctx context.Context, c client.Client, 
operatorNamespace string) error {
+       operatorID := defaults.OperatorID()
        var platformName string
-       if defaults.OperatorID() != "" {
-               platformName = defaults.OperatorID()
+       if operatorID != "" {
+               platformName = operatorID
        } else {
                platformName = platform.DefaultPlatformName
        }
 
        if pl, err := kubernetes.GetIntegrationPlatform(ctx, c, platformName, 
operatorNamespace); pl == nil || k8serrors.IsNotFound(err) {
                defaultPlatform := v1.NewIntegrationPlatform(operatorNamespace, 
platformName)
+
                if defaultPlatform.Labels == nil {
                        defaultPlatform.Labels = make(map[string]string)
                }
                defaultPlatform.Labels["camel.apache.org/platform.generated"] = 
"true"
 
+               if operatorID != "" {
+                       defaultPlatform.SetOperatorID(operatorID)
+               }
+
                if _, err := 
c.CamelV1().IntegrationPlatforms(operatorNamespace).Create(ctx, 
&defaultPlatform, metav1.CreateOptions{}); err != nil {
                        return err
                }