Fix #1379: make download link available also when installing from operator hub

deploy/olm-catalog/camel-k/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml

@@ -154,6 +154,22 @@ spec:
     mediatype: image/svg+xml
   install:
     spec:
+      clusterPermissions:
+      - rules:
+        - apiGroups:
+          - console.openshift.io
+          resources:
+          - consoleclidownloads
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        serviceAccountName: camel-k-operator
       deployments:
       - name: camel-k-operator
         spec:
@@ -385,6 +401,14 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - rbac.authorization.k8s.io
+          resourceNames:
+          - system:image-builder
+          resources:
+          - clusterroles
+          verbs:
+          - bind
         serviceAccountName: camel-k-operator
     strategy: deployment
   installModes:

deploy/olm-catalog/csv-config.yaml

@@ -24,3 +24,4 @@ crd-cr-paths:
   - deploy/crd-integration-platform.yaml
 role-paths:
   - deploy/operator-role-olm.yaml
+  - deploy/operator-role-olm-cluster.yaml

deploy/operator-role-olm-cluster.yaml

@@ -0,0 +1,37 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: camel-k-operator
+  labels:
+    app: "camel-k"
+rules:
+- apiGroups:
+  - console.openshift.io
+  resources:
+  - consoleclidownloads
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch

pkg/cmd/operator/operator.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/apache/camel-k/pkg/client"
+	"github.com/apache/camel-k/pkg/install"
 	"github.com/apache/camel-k/pkg/util/kubernetes"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
@@ -59,6 +60,7 @@ func printVersion() {
 	log.Info(fmt.Sprintf("Buildah Version: %v", defaults.BuildahVersion))
 	log.Info(fmt.Sprintf("Kaniko Version: %v", defaults.KanikoVersion))
 	log.Info(fmt.Sprintf("Camel K Operator Version: %v", defaults.Version))
+	log.Info(fmt.Sprintf("Camel K Default Runtime Version: %v", defaults.DefaultRuntimeVersion))
 	log.Info(fmt.Sprintf("Camel K Git Commit: %v", GitCommit))
 }
 
@@ -144,6 +146,14 @@ func Run() {
 		os.Exit(1)
 	}
 
+	// Try to register the OpenShift CLI Download link if possible
+	installCtx, installCancel := context.WithTimeout(context.TODO(), 30*time.Second)
+	defer installCancel()
+	if err := install.OpenShiftConsoleDownloadLink(installCtx, c); err != nil {
+		log.Info("Cannot install OpenShift CLI download link: skipping.")
+		log.V(8).Info("Error while installing OpenShift CLI download link", "error", err)
+	}
+
 	// Setup all Controllers
 	if err := controller.AddToManager(mgr); err != nil {
 		log.Error(err, "")

pkg/install/cluster.go

@@ -82,7 +82,7 @@ func SetupClusterWideResourcesOrCollect(ctx context.Context, clientProvider clie
 	}
 
 	// Install OpenShift Console download links if possible
-	err = installOpenShiftConsoleDownloadLink(ctx, c)
+	err = OpenShiftConsoleDownloadLink(ctx, c)
 	if err != nil {
 		return err
 	}

pkg/install/openshift.go

@@ -36,11 +36,27 @@ import (
 )
 
 const (
-	kamelCliDownloadName   = "kamel-cli"
 	kamelVersionAnnotation = "camel.apache.org/version"
 )
 
-func installOpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) error {
+// The following variables may be overridden at build time
+var (
+	// KamelCLIDownloadName --
+	KamelCLIDownloadName = "kamel-cli"
+	// KamelCLIDownloadDisplayName is the name as seen in the download page
+	KamelCLIDownloadDisplayName = "kamel - Apache Camel K Command Line Interface"
+	// KamelCLIDownloadDescription is the description as seen in the download page
+	KamelCLIDownloadDescription = "Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers.\n\n" +
+		"The `kamel` binary can be used to both configure the cluster and run integrations. " +
+		"Once you've downloaded the `kamel` binary, log into the cluster using the `oc` client tool and start using the `kamel` CLI.\n\n" +
+		"You can run `kamel help` to list the available commands or go to the [Camel K Website](https://camel.apache.org/projects/camel-k/) for more information."
+
+	// KamelCLIDownloadURLTemplate is the download template with 3 missing parameters (version, version, os)
+	KamelCLIDownloadURLTemplate = "https://github.com/apache/camel-k/releases/download/%s/camel-k-client-%s-%s-64bit.tar.gz"
+)
+
+// OpenShiftConsoleDownloadLink installs the download link for the OpenShift console
+func OpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) error {
 	// Check the ConsoleCLIDownload CRD is present, which should be starting OpenShift version 4.2.
 	// That check is also enough to exclude Kubernetes clusters.
 	ok, err := isAPIResourceInstalled(c, "console.openshift.io/v1", reflect.TypeOf(console.ConsoleCLIDownload{}).Name())
@@ -56,7 +72,7 @@ func installOpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) e
 			ResourceAttributes: &authorization.ResourceAttributes{
 				Group:    "console.openshift.io",
 				Resource: "consoleclidownloads",
-				Name:     kamelCliDownloadName,
+				Name:     KamelCLIDownloadName,
 				Verb:     "create",
 			},
 		},
@@ -75,7 +91,7 @@ func installOpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) e
 
 	// Check for an existing ConsoleCLIDownload resource
 	existing := &console.ConsoleCLIDownload{}
-	err = c.Get(ctx, types.NamespacedName{Name: kamelCliDownloadName}, existing)
+	err = c.Get(ctx, types.NamespacedName{Name: KamelCLIDownloadName}, existing)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			existing = nil
@@ -116,26 +132,23 @@ func installOpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) e
 			Annotations: map[string]string{
 				kamelVersionAnnotation: defaults.Version,
 			},
-			Name: kamelCliDownloadName,
+			Name: KamelCLIDownloadName,
 		},
 		Spec: console.ConsoleCLIDownloadSpec{
-			DisplayName: "kamel - Apache Camel K Command Line Interface",
-			Description: "Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers.\n\n" +
-				"The `kamel` binary can be used to both configure the cluster and run integrations. " +
-				"Once you've downloaded the `kamel` binary, log into the cluster using the `oc` client tool and start using the `kamel` CLI.\n\n" +
-				"You can run `kamel help` to list the available commands or go to the [Camel K Website](https://camel.apache.org/projects/camel-k/) for more information.",
+			DisplayName: KamelCLIDownloadDisplayName,
+			Description: KamelCLIDownloadDescription,
 			Links: []console.Link{
 				{
 					Text: "Download the kamel binary for Linux",
-					Href: fmt.Sprintf("https://github.com/apache/camel-k/releases/download/%s/camel-k-client-%s-linux-64bit.tar.gz", defaults.Version, defaults.Version),
+					Href: fmt.Sprintf(KamelCLIDownloadURLTemplate, defaults.Version, defaults.Version, "linux"),
 				},
 				{
 					Text: "Download the kamel binary for Mac",
-					Href: fmt.Sprintf("https://github.com/apache/camel-k/releases/download/%s/camel-k-client-%s-mac-64bit.tar.gz", defaults.Version, defaults.Version),
+					Href: fmt.Sprintf(KamelCLIDownloadURLTemplate, defaults.Version, defaults.Version, "mac"),
 				},
 				{
 					Text: "Download the kamel binary for Windows",
-					Href: fmt.Sprintf("https://github.com/apache/camel-k/releases/download/%s/camel-k-client-%s-windows-64bit.tar.gz", defaults.Version, defaults.Version),
+					Href: fmt.Sprintf(KamelCLIDownloadURLTemplate, defaults.Version, defaults.Version, "windows"),
 				},
 			},
 		},