This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a1f6fc77b45e8aa039d278c5804246b22e6e96a2
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Fri Jul 1 09:27:35 2022 +0200
fix(#2177): Add `-x` shorthand to `--operator-id` kamel CLI option
---
docs/modules/ROOT/pages/architecture/operator.adoc | 4 ++--
pkg/cmd/bind.go | 2 +-
pkg/cmd/install.go | 2 +-
pkg/cmd/run.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/modules/ROOT/pages/architecture/operator.adoc
b/docs/modules/ROOT/pages/architecture/operator.adoc
index 252487f21..2a3570705 100644
--- a/docs/modules/ROOT/pages/architecture/operator.adoc
+++ b/docs/modules/ROOT/pages/architecture/operator.adoc
@@ -50,7 +50,7 @@ Since the go language does not yet support generics, there is
an `Action` defini
== Operator resource mapping
-By default the Camel K operator (global mode) will manage all Camel K
resources on the cluster doing the reconciliation loops for the resources in
order to apply the mentioned state machine.
+By default, the Camel K operator (global mode) will manage all Camel K
resources on the cluster doing the reconciliation loops for the resources in
order to apply the mentioned state machine.
For clusters with multiple Camel K tenants this approach is not going to work
as user groups may want to separate the workloads with respective
authentication and authorization schemes. For multi tenancy the Camel K
operator uses an operator id that can be applied to resources in the form of
@@ -59,7 +59,7 @@ an annotation. The annotation selects the operator that
should handle the resour
This approach allows multiple Camel K installations and operators on the same
cluster with each operator handling an explicit set of Camel K resources
identified
by the operator id.
-By default the Camel K operator has the id `camel-k` and users with only one
single installation on the cluster will not even notice the existence of this
identifier. When an administrator wants to add more Camel K operator
installations to the cluster the
+By default, the Camel K operator has the id `camel-k` and users with only one
single installation on the cluster will not even notice the existence of this
identifier. When an administrator wants to add more Camel K operator
installations to the cluster the
operator id needs to be unique and resources should be annotated with the
respective annotation `camel.apache.org/operator.id={operator-id}`. With this
approach we make sure that only one single operator installation manages
a resource at a time.
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 1effdf1e8..d92128cb6 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -60,7 +60,7 @@ func newCmdBind(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *bindCmdOptions
cmd.Flags().Bool("skip-checks", false, "Do not verify the binding for
compliance with Kamelets and other Kubernetes resources")
cmd.Flags().StringArray("step", nil, `Add binding steps as Kubernetes
resources. Endpoints are expected in the format
"[[apigroup/]version:]kind:[namespace/]name", plain Camel URIs or Kamelet
name.`)
cmd.Flags().StringArrayP("trait", "t", nil, `Add a trait to the
corresponding Integration.`)
- cmd.Flags().String("operator-id", "camel-k", "Operator id selected to
manage this Kamelet binding.")
+ cmd.Flags().StringP("operator-id", "x", "camel-k", "Operator id
selected to manage this Kamelet binding.")
cmd.Flags().StringArray("annotation", nil, "Add an annotation to the
Kamelet binding. E.g. \"--annotation my.company=hello\"")
cmd.Flags().Bool("force", false, "Force creation of Kamelet binding
regardless of potential misconfiguration.")
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 42e76c557..fe39cbbfb 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -103,7 +103,7 @@ func newCmdInstall(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *installCmdO
cmd.Flags().StringArrayP("property", "p", nil, "Add a camel property")
cmd.Flags().String("runtime-version", "", "Set the camel-k runtime
version")
cmd.Flags().String("base-image", "", "Set the base Image used to run
integrations")
- cmd.Flags().String("operator-id", "camel-k", "Set the operator id that
is used to select the resources this operator should manage")
+ cmd.Flags().StringP("operator-id", "x", "camel-k", "Set the operator id
that is used to select the resources this operator should manage")
cmd.Flags().String("operator-image", "", "Set the operator Image used
for the operator deployment")
cmd.Flags().String("operator-image-pull-policy", "", "Set the operator
ImagePullPolicy used for the operator deployment")
cmd.Flags().String("build-strategy", "", "Set the build strategy")
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 5298680f7..27df5e167 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -106,7 +106,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.")
+ cmd.Flags().StringP("operator-id", "x", "camel-k", "Operator id
selected to manage this integration.")
cmd.Flags().String("profile", "", "Trait profile used for deployment")
cmd.Flags().StringArrayP("trait", "t", nil, "Configure a trait. E.g.
\"-t service.enabled=false\"")
cmd.Flags().StringP("output", "o", "", "Output format. One of:
json|yaml")
