From 607398b27205c88c8854691ee56d4f62c34d18fe Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Tue, 28 Mar 2023 00:21:12 +0200 Subject: [PATCH] fix #4167 : Default integrationPlatform created at operator startup dose not honor OPERATOR_ID config --- pkg/cmd/operator/operator.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go index e4fd8e4c6a..03a89001d9 100644 --- a/pkg/cmd/operator/operator.go +++ b/pkg/cmd/operator/operator.go @@ -247,20 +247,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 }