Skip to content

Commit 6334a46

Browse files
committed
chore(cmd): cleaning and deprecations
Closes #6338, #6342, #6298
1 parent b3afe09 commit 6334a46

File tree

18 files changed

+78
-804
lines changed

18 files changed

+78
-804
lines changed

e2e/advanced/operator_id_filtering_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ func TestOperatorIDFiltering(t *testing.T) {
5050
g.Eventually(PlatformPhase(t, ctx, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
5151

5252
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
53-
g.Expect(KamelRunWithID(t, ctx, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
53+
g.Expect(KamelRunWithID(t, ctx, "operator-x", ns, "files/yaml.yaml", "--name", "untouched").Execute()).To(Succeed())
5454
g.Consistently(IntegrationPhase(t, ctx, ns, "untouched"), 10*time.Second).Should(BeEmpty())
5555
})
5656

5757
t.Run("Operators run scoped integrations", func(t *testing.T) {
58-
g.Expect(KamelRunWithID(t, ctx, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
58+
g.Expect(KamelRunWithID(t, ctx, "operator-x", ns, "files/yaml.yaml", "--name", "moving").Execute()).To(Succeed())
5959
g.Expect(AssignIntegrationToOperator(t, ctx, ns, "moving", operator1)).To(Succeed())
6060
g.Eventually(IntegrationPhase(t, ctx, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
6161
g.Eventually(IntegrationPodPhase(t, ctx, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -101,7 +101,7 @@ func TestOperatorIDFiltering(t *testing.T) {
101101
},
102102
}
103103
g.Expect(TestClient(t).Create(ctx, &externalKit)).Should(BeNil())
104-
g.Expect(KamelRunWithID(t, ctx, operator2, ns, "files/yaml.yaml", "--name", "pre-built", "--kit", "external", "--force").Execute()).To(Succeed())
104+
g.Expect(KamelRunWithID(t, ctx, operator2, ns, "files/yaml.yaml", "--name", "pre-built", "--kit", "external").Execute()).To(Succeed())
105105
g.Consistently(IntegrationPhase(t, ctx, ns, "pre-built"), 10*time.Second).ShouldNot(Equal(v1.IntegrationPhaseBuildingKit))
106106
g.Eventually(IntegrationPhase(t, ctx, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
107107
g.Eventually(IntegrationStatusImage(t, ctx, ns, "pre-built"), TestTimeoutShort).Should(Equal(kitImage))
@@ -111,7 +111,7 @@ func TestOperatorIDFiltering(t *testing.T) {
111111
})
112112

113113
t.Run("Operators can run scoped Pipes", func(t *testing.T) {
114-
g.Expect(KamelBindWithID(t, ctx, "operator-x", ns, "timer-source?message=Hello", "log-sink", "--name", "klb", "--force").Execute()).To(Succeed())
114+
g.Expect(KamelBindWithID(t, ctx, "operator-x", ns, "timer-source?message=Hello", "log-sink", "--name", "klb").Execute()).To(Succeed())
115115
g.Consistently(Integration(t, ctx, ns, "klb"), 10*time.Second).Should(BeNil())
116116
g.Expect(AssignPipeToOperator(t, ctx, ns, "klb", operator1)).To(Succeed())
117117
g.Eventually(Integration(t, ctx, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())

e2e/common/cli/get_test.go

Lines changed: 0 additions & 77 deletions
This file was deleted.

e2e/common/cli/offline_commands_test.go

Lines changed: 0 additions & 58 deletions
This file was deleted.

pkg/cmd/bind.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func newCmdBind(rootCmdOptions *RootCmdOptions) (*cobra.Command, *bindCmdOptions
6262
cmd.Flags().StringArrayP("trait", "t", nil, `Add a trait to the corresponding Integration.`)
6363
cmd.Flags().StringP("operator-id", "x", "camel-k", "Operator id selected to manage this Pipe.")
6464
cmd.Flags().StringArray("annotation", nil, "Add an annotation to the Pipe. E.g. \"--annotation my.company=hello\"")
65-
cmd.Flags().Bool("force", false, "Force creation of Pipe regardless of potential misconfiguration.")
6665
cmd.Flags().String("service-account", "", "The SA to use to run this binding")
6766
cmd.Flags().StringArrayP("dependency", "d", nil, `A dependency that should be included, e.g., "camel:mail" for a Camel component, "mvn:org.my:app:1.0" for a Maven dependency`)
6867

@@ -88,7 +87,6 @@ type bindCmdOptions struct {
8887
Traits []string `mapstructure:"traits" yaml:",omitempty"`
8988
OperatorID string `mapstructure:"operator-id" yaml:",omitempty"`
9089
Annotations []string `mapstructure:"annotations" yaml:",omitempty"`
91-
Force bool `mapstructure:"force" yaml:",omitempty"`
9290
ServiceAccount string `mapstructure:"service-account" yaml:",omitempty"`
9391
Dependencies []string `mapstructure:"dependencies" yaml:",omitempty"`
9492
}

pkg/cmd/completion.go

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)