fix(helm): force IntegrationPlatform override

apache · Jul 2, 2024 · e3a7df2 · e3a7df2
1 parent bc094e8
commit e3a7df2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/docs/modules/ROOT/pages/installation/installation.adoc b/docs/modules/ROOT/pages/installation/installation.adoc
@@ -15,9 +15,11 @@ Camel K is also available in Helm Hub:
 
 ```
 $ helm repo add camel-k https://apache.github.io/camel-k/charts/
-$ helm install camel-k [--set platform.build.registry.address=<my-registry>] camel-k/camel-k
+$ helm install camel-k [--set platform.build.registry.address=<my-registry>] camel-k/camel-k --force
 ```
 
+NOTE: the `--force` option may be required to override the platform configuration with the registry values provided.
+
 More instructions on the https://hub.helm.sh/charts/camel-k/camel-k[Camel K Helm] page.
 
 [[olm]]

diff --git a/e2e/install/helm/setup_test.go b/e2e/install/helm/setup_test.go
@@ -62,6 +62,7 @@ func TestHelmInstallation(t *testing.T) {
 				fmt.Sprintf("operator.operatorId=%s", operatorID),
 				"-n",
 				ns,
+				"--force",
 			),
 		)
 

diff --git a/helm/camel-k/README.md b/helm/camel-k/README.md
@@ -29,7 +29,7 @@ $ helm install camel-k \
   camel-k/camel-k
 ```
 
-You may install Camel K and specify a container registry later.
+You may install Camel K and specify a container registry later. You may need to provide the `--force` option if the installation complains about an existing `IntegrationPlatform`.
 
 ### Openshift
 

diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
@@ -256,6 +256,7 @@ func findOrCreateIntegrationPlatform(ctx context.Context, c client.Client, opera
 	}
 
 	if pl, err := kubernetes.GetIntegrationPlatform(ctx, c, platformName, operatorNamespace); pl == nil || k8serrors.IsNotFound(err) {
+		log.Info("No IntegrationPlatform provided. Creating one with default values.")
 		defaultPlatform := v1.NewIntegrationPlatform(operatorNamespace, platformName)
 
 		if defaultPlatform.Labels == nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ func TestHelmInstallation(t *testing.T) { @@
     				fmt.Sprintf("operator.operatorId=%s", operatorID),
     				"-n",
     				ns,
+    				"--force",
     			),
     		)
@@ Expand Down @@