You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2022/06/14 10:18:06 UTC
[GitHub] [camel-k] christophd opened a new pull request, #3358: Improve multi operator handling and multi tenancy model
christophd opened a new pull request, #3358:
URL: https://github.com/apache/camel-k/pull/3358
<!-- Description -->
Fixes #2177
Fixes #3164
This PR improves/enables the handling of multiple Camel K operators (global and local) on a single cluster in order to provide a more powerful and easy multi tenancy model for Camel K.
The changes leverage the existing concept of operator id annotations as described in https://camel.apache.org/camel-k/1.9.x/installation/advanced/multi.html. The approach introduces the `camel.apache.org/operator.id` annotation on resources to select the operator that should managed the resource.
The PR fixes some issues related to this approach and makes sure that one single cluster is able to handle multiple Camel K operators at the same time where each resource is only reconciled by a single operator instance.
The PR introduces following changes:
## Use operator id by default
* Set operator id with every Camel K installation (id provided as KAMEL_OPERATOR_ID EnvVar setting on the operator deployment) The default operator id is "camel-k"
* Align integration platform name with given operator id
* Align namespace lease name with the given operator id (so only operator instances with the same id elect a leader)
* Make sure to use unique operator ids on a cluster
* add checks on kamel CLI install command to use proper unique operator id
* Introduce operator-id setting on kamel CLI when installing Camel K
* Introduce operator-id setting on kamel CLI when running integrations
* Enforce to use an operator-id when installing Camel K and running integrations (default="camel-k")
* Add operator id as environment variable to integration pods (CAMEL_OPERATOR_ID EnvVar)
* Use operator id in OLM deployment (default="camel-k")
* Add more comfortable way to set operator id annotation on resources
## Make sure to properly reinitialize/reconcile integration resources
* Reinitialize integration when operator id annotation has changed (allows to move a resource from one operator to another by changing the annotation)
* Remove IntegrationKit reference for integration that has a new operator id annotation (makes sure to reinitialize the integration with a new integration kit for the new operator)
* Add operator id annotation to relevant fields that determine the integration digest hash (to determine operator id changes on the integration resource)
* Add common utility method to get the operator id annotation from a resource
* Backward compatibility
* Allow default operator (id="camel-k") to handle all resources that are missing proper operator id annotations
* Allow operators that use a proper id to reconcile resources on any namespace (regardless of operator mode global vs. local and regardless of existing namespace locking)
* Update the integration deployment ready logic. Integration pod specs are compared based on integration digest and container image only (makes sure to determine running pods for integration properly)
## Use operator id in KameletBindings
* Introduce operator-id option to kamel CLI bind command
* Make sure to use proper operator id when creating the binding
* Propagate operator id to dependent resources (e.g. integration)
* Rebuild Kamelet binding when operator id annotation changes
## Create proper integration platform as part of the operator
* Make sure that each operator instance adds its integration platform (name=operator id) if not already exists (also include OLM installations)
* Automatically adds an integration platform during the operator start-up
* Add integration platform viewer role so authenticated users can see the platform instances (used in kamel CLI to verify operator id usage)
## Improve operator version lookup
* Fix kamel CLI version command
* Find local integration platform or try to search for default operator in any namespace instead of just looking for the "camel-k" integration platform in local namespace
* Eliminate nasty "No Integration platform available in current namespace" warnings when using the kamel CLI
## Fix e2e tests
* Handle forbidden error when user lacks privileges to list all integration platforms on cluster during install command
* Use unique operator id when installing operators in e2e test namespaces
* Make sure to run integrations with respective operator id for selected reconciling
* Automatically uninstall operators after the test
* Introduce new GitHub action to install Camel K in global mode
With all these changes the user should be able to introduce multiple operators (global and local mode) in a single cluster. This is the base for proper multi tenancy capabilities in Camel K. Before the multi tenancy model worked with namespaces where the operator was able to exclusively handle resources in a single namespace. The new approach (that has already been there for quite some time but needed some attention and fixes) with operator ids selecting the resources to manage is much more powerful and overcomes the limitations in terms of rolling upgrades and selective upgrades through canary release strategies that the old approach was facing.
Existing Camel K users with the usual single Camel K operator installation will not even notice the changes as the default operator id "camel-k" has already been used as integration platform name and namespace lease locking. The default operator with id "camel-k" is allowed to also handle resources with missing operator id annotations. This makes sure that existing Camel K workload is reconciled as before.
New Camel K users and especially users that want to leverage multi tenancy capabilities on a cluster will have to properly handle the operator ids used on the cluster.
Yet there are some follow-up issues to this PR that need to be taken care of in order to make multi tenancy clusters as comfortable as possible. Here is a list of future tasks to consider:
* Allow multiple operators in a single namespace (align operator deployment name and other resources to given operator-id)
* Allow to rename/change the operator id via kamel CLI command and cascade changes to dependent resources (integration platform, integrations, kamelet-bindings, builds, integration-kits, etc.)
* Deprecate/remove global vs. local operator distinction (namespace local operators are obsolete)
* Remove secondary integration platform logic (default integration platforms will be linked to the operator by its id, custom integration platforms will have to make use to use a unique name. Resources should select the platform to use via annotations or use the default platform attached to the current operator)
* Kamel CLI: Add operation to list integrations that are missing a proper operator id annotation (=legacy integrations)
* Kamel CLI: Add operation to list all available integration platform instances (= operators) on the cluster
* Remove duplicate state for integration platform
* IntegrationPlatform as the driver for every operator installation. User adds new platform CR and a new operator is started accordingly)
<!--
Enter your extended release note in the below block. If the PR requires
additional action from users switching to the new release, include the string
"action required". If no release note is required, write "NONE".
You can (optionally) mark this PR with labels "kind/bug" or "kind/feature" to make sure
the text is added to the right section of the release notes.
-->
**Release Note**
```release-note
feat(operator): Improve multi operator handling and multi tenancy model
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r906303096
##########
pkg/cmd/run.go:
##########
@@ -108,6 +108,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions) (*cobra.Command, *runCmdOptions)
cmd.Flags().Bool("sync", false, "Synchronize the local source file with the cluster, republishing at each change")
cmd.Flags().Bool("dev", false, "Enable Dev mode (equivalent to \"-w --logs --sync\")")
cmd.Flags().Bool("use-flows", true, "Write yaml sources as Flow objects in the integration custom resource")
+ cmd.Flags().String("operator-id", "camel-k", "Operator id selected to manage this integration.")
Review Comment:
not sure what the best shortcut would look like. `-o` is already taken `-id` will be a bit misleading. Any ideas?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#issuecomment-1174097988
regarding the operator ids: the kamel CLI install command will check for existing ids and throw errors in case of duplications. But this only works when the user that installs the operator has the permissions to see the other namespaces and its integration platforms. In OLM installation the bundle needs to make sure to use unique operator ids.
I do not see any other option to ensure unique ids across the whole cluster other than super admins receiving the errors when using duplicate ids.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
astefanutti commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r913136518
##########
pkg/cmd/operator/operator.go:
##########
@@ -245,11 +247,43 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID
installCtx, installCancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer installCancel()
install.OperatorStartupOptionalTools(installCtx, c, watchNamespace, operatorNamespace, log)
+ exitOnError(findOrCreateIntegrationPlatform(installCtx, c, operatorNamespace), "failed to create integration platform")
log.Info("Starting the manager")
exitOnError(mgr.Start(signals.SetupSignalHandler()), "manager exited non-zero")
}
+// findOrCreateIntegrationPlatform create default integration platform in operator namespace if not already exists.
+func findOrCreateIntegrationPlatform(ctx context.Context, c client.Client, operatorNamespace string) error {
Review Comment:
Does the logic that creates the default IntegrationPlatform in the _platform_ trait become redundant?
##########
pkg/trait/platform.go:
##########
@@ -122,14 +130,17 @@ func (t *platformTrait) getOrCreatePlatform(e *Environment) (*v1.IntegrationPlat
}
defaultPlatform.Labels["camel.apache.org/platform.generated"] = True
// Cascade the operator id in charge to reconcile the Integration
- if e.Integration.Annotations != nil && e.Integration.Annotations[v1.OperatorIDAnnotation] != "" {
- if defaultPlatform.Annotations == nil {
- defaultPlatform.Annotations = make(map[string]string)
- }
- defaultPlatform.Annotations[v1.OperatorIDAnnotation] = e.Integration.Annotations[v1.OperatorIDAnnotation]
+ if v1.GetOperatorIDAnnotation(e.Integration) != "" {
+ defaultPlatform.SetOperatorID(v1.GetOperatorIDAnnotation(e.Integration))
}
pl = &defaultPlatform
e.Resources.Add(pl)
+
+ // Make sure that IntegrationPlatform installed in operator namespace can be seen by others
+ if err := install.IntegrationPlatformViewerRole(e.Ctx, t.Client, namespace); err != nil && !k8serrors.IsAlreadyExists(err) {
Review Comment:
Should that be done in `pkg/install/optional.go` where other viewer roles are installed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r913231243
##########
pkg/trait/platform.go:
##########
@@ -122,14 +130,17 @@ func (t *platformTrait) getOrCreatePlatform(e *Environment) (*v1.IntegrationPlat
}
defaultPlatform.Labels["camel.apache.org/platform.generated"] = True
// Cascade the operator id in charge to reconcile the Integration
- if e.Integration.Annotations != nil && e.Integration.Annotations[v1.OperatorIDAnnotation] != "" {
- if defaultPlatform.Annotations == nil {
- defaultPlatform.Annotations = make(map[string]string)
- }
- defaultPlatform.Annotations[v1.OperatorIDAnnotation] = e.Integration.Annotations[v1.OperatorIDAnnotation]
+ if v1.GetOperatorIDAnnotation(e.Integration) != "" {
+ defaultPlatform.SetOperatorID(v1.GetOperatorIDAnnotation(e.Integration))
}
pl = &defaultPlatform
e.Resources.Add(pl)
+
+ // Make sure that IntegrationPlatform installed in operator namespace can be seen by others
+ if err := install.IntegrationPlatformViewerRole(e.Ctx, t.Client, namespace); err != nil && !k8serrors.IsAlreadyExists(err) {
Review Comment:
The viewer role is bound to the namespace where the integration platform is living. so I think it makes sense to do this right after the integration platform has been created. following from that I see this in both the integration platform trait and the operator optional tools install mechanism.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti merged pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
astefanutti merged PR #3358:
URL: https://github.com/apache/camel-k/pull/3358
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] squakez commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
squakez commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r907054585
##########
pkg/cmd/run.go:
##########
@@ -108,6 +108,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions) (*cobra.Command, *runCmdOptions)
cmd.Flags().Bool("sync", false, "Synchronize the local source file with the cluster, republishing at each change")
cmd.Flags().Bool("dev", false, "Enable Dev mode (equivalent to \"-w --logs --sync\")")
cmd.Flags().Bool("use-flows", true, "Write yaml sources as Flow objects in the integration custom resource")
+ cmd.Flags().String("operator-id", "camel-k", "Operator id selected to manage this integration.")
Review Comment:
Literally `-x` :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#issuecomment-1156065109
@lburgazzoli @astefanutti FYI
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r906302072
##########
pkg/apis/camel/v1/integration_types_support.go:
##########
@@ -255,6 +255,15 @@ func (in *SourceSpec) InferLanguage() Language {
return ""
}
+// SetOperatorID sets the given operator id as an annotation
+func (in *Integration) SetOperatorID(operatorID string) {
+ if in.Annotations == nil {
+ in.Annotations = make(map[string]string)
+ }
+
+ in.Annotations[OperatorIDAnnotation] = operatorID
+}
+
Review Comment:
👍
##########
pkg/cmd/bind.go:
##########
@@ -217,6 +235,36 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
binding.Spec.Integration.Traits = traits
}
+ if binding.Annotations == nil {
+ binding.Annotations = make(map[string]string)
+ }
+
+ if o.OperatorID != "" {
+ if pl, err := platformutil.LookupForPlatformName(o.Context, client, o.OperatorID); err != nil {
+ if k8serrors.IsForbidden(err) {
+ o.PrintfVerboseOutf(cmd, "Unable to verify existence of operator id [%s] due to lack of user privileges\n", o.OperatorID)
+ } else {
+ return err
+ }
+ } else if pl == nil {
+ if o.Force {
+ o.PrintfVerboseOutf(cmd, "Unable to find operator with given id [%s] - Kamelet binding may not be reconciled and get stuck in waiting state\n", o.OperatorID)
+ } else {
+ return fmt.Errorf("unable to find integration platform for given operator id '%s', use --force option or make sure to use a proper operator id", o.OperatorID)
+ }
+ }
+ }
Review Comment:
👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
astefanutti commented on PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#issuecomment-1180555735
Let's merge this and follow up on the open issues.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r913225625
##########
pkg/cmd/operator/operator.go:
##########
@@ -245,11 +247,43 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID
installCtx, installCancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer installCancel()
install.OperatorStartupOptionalTools(installCtx, c, watchNamespace, operatorNamespace, log)
+ exitOnError(findOrCreateIntegrationPlatform(installCtx, c, operatorNamespace), "failed to create integration platform")
log.Info("Starting the manager")
exitOnError(mgr.Start(signals.SetupSignalHandler()), "manager exited non-zero")
}
+// findOrCreateIntegrationPlatform create default integration platform in operator namespace if not already exists.
+func findOrCreateIntegrationPlatform(ctx context.Context, c client.Client, operatorNamespace string) error {
Review Comment:
In rare cases the IntegrationPlatform that has been automatically installed with the operator may have been removed for some reason. In this case the trait will install a fresh IntegrationPlatform at integration runtime.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
astefanutti commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r914525886
##########
pkg/cmd/operator/operator.go:
##########
@@ -245,11 +247,43 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID
installCtx, installCancel := context.WithTimeout(context.Background(), 1*time.Minute)
defer installCancel()
install.OperatorStartupOptionalTools(installCtx, c, watchNamespace, operatorNamespace, log)
+ exitOnError(findOrCreateIntegrationPlatform(installCtx, c, operatorNamespace), "failed to create integration platform")
log.Info("Starting the manager")
exitOnError(mgr.Start(signals.SetupSignalHandler()), "manager exited non-zero")
}
+// findOrCreateIntegrationPlatform create default integration platform in operator namespace if not already exists.
+func findOrCreateIntegrationPlatform(ctx context.Context, c client.Client, operatorNamespace string) error {
Review Comment:
That'd be interesting to understand what these rare cases are, so that it justifies the logic duplication.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#issuecomment-1166951723
@squakez Thank you for having a look. I have reduced the code duplications. Not sure about the shortcut for the `--operator-id` option though.
@astefanutti @lburgazzoli can you please also have a look. I want to get this merged soonish 😄
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
astefanutti commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r914523932
##########
pkg/trait/platform.go:
##########
@@ -122,14 +130,17 @@ func (t *platformTrait) getOrCreatePlatform(e *Environment) (*v1.IntegrationPlat
}
defaultPlatform.Labels["camel.apache.org/platform.generated"] = True
// Cascade the operator id in charge to reconcile the Integration
- if e.Integration.Annotations != nil && e.Integration.Annotations[v1.OperatorIDAnnotation] != "" {
- if defaultPlatform.Annotations == nil {
- defaultPlatform.Annotations = make(map[string]string)
- }
- defaultPlatform.Annotations[v1.OperatorIDAnnotation] = e.Integration.Annotations[v1.OperatorIDAnnotation]
+ if v1.GetOperatorIDAnnotation(e.Integration) != "" {
+ defaultPlatform.SetOperatorID(v1.GetOperatorIDAnnotation(e.Integration))
}
pl = &defaultPlatform
e.Resources.Add(pl)
+
+ // Make sure that IntegrationPlatform installed in operator namespace can be seen by others
+ if err := install.IntegrationPlatformViewerRole(e.Ctx, t.Client, namespace); err != nil && !k8serrors.IsAlreadyExists(err) {
Review Comment:
Have you considered an aggregating to viewer role instead with `rbac.authorization.k8s.io/aggregate-to-view`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] squakez commented on a diff in pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
squakez commented on code in PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#discussion_r897678895
##########
pkg/apis/camel/v1/integration_types_support.go:
##########
@@ -255,6 +255,15 @@ func (in *SourceSpec) InferLanguage() Language {
return ""
}
+// SetOperatorID sets the given operator id as an annotation
+func (in *Integration) SetOperatorID(operatorID string) {
+ if in.Annotations == nil {
+ in.Annotations = make(map[string]string)
+ }
+
+ in.Annotations[OperatorIDAnnotation] = operatorID
+}
+
Review Comment:
Duplicated code. We may have a single method with that logic, and call it from the various entities
##########
pkg/cmd/bind.go:
##########
@@ -217,6 +235,36 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
binding.Spec.Integration.Traits = traits
}
+ if binding.Annotations == nil {
+ binding.Annotations = make(map[string]string)
+ }
+
+ if o.OperatorID != "" {
+ if pl, err := platformutil.LookupForPlatformName(o.Context, client, o.OperatorID); err != nil {
+ if k8serrors.IsForbidden(err) {
+ o.PrintfVerboseOutf(cmd, "Unable to verify existence of operator id [%s] due to lack of user privileges\n", o.OperatorID)
+ } else {
+ return err
+ }
+ } else if pl == nil {
+ if o.Force {
+ o.PrintfVerboseOutf(cmd, "Unable to find operator with given id [%s] - Kamelet binding may not be reconciled and get stuck in waiting state\n", o.OperatorID)
+ } else {
+ return fmt.Errorf("unable to find integration platform for given operator id '%s', use --force option or make sure to use a proper operator id", o.OperatorID)
+ }
+ }
+ }
Review Comment:
Duplicated code: we better make it an util function to be used from all the other parts
##########
pkg/cmd/run.go:
##########
@@ -108,6 +108,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions) (*cobra.Command, *runCmdOptions)
cmd.Flags().Bool("sync", false, "Synchronize the local source file with the cluster, republishing at each change")
cmd.Flags().Bool("dev", false, "Enable Dev mode (equivalent to \"-w --logs --sync\")")
cmd.Flags().Bool("use-flows", true, "Write yaml sources as Flow objects in the integration custom resource")
+ cmd.Flags().String("operator-id", "camel-k", "Operator id selected to manage this integration.")
Review Comment:
I'd add a "x" short param as well, so we can use "-x" instead the longer "--operator-id".
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #3358: Improve multi operator handling and multi tenancy model
Posted by GitBox <gi...@apache.org>.
christophd commented on PR #3358:
URL: https://github.com/apache/camel-k/pull/3358#issuecomment-1180104450
Thanks @astefanutti for the findings! I agree with the two remaining points you have mentioned.
I would appreciate to get this PR merged now and tackle the remaining points in subsequent PRs because this PR is quite big already and I need to resolve many merge conflicts with main branch evolving.
I have created some follow-up issues to track the remaining points:
- #3433
- #3434
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org