This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit bcdf7731f9b83bf33e0d199e553db7bfe4d297e6
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Fri Nov 4 16:46:24 2022 -0400
Upgrade to quarkus-operator-sdk 4.0.5. Fix #516
---
karavan-operator/pom.xml | 2 +-
.../operator/spec/KaravanOperatorCSVMetadata.java | 150 +++++----------------
2 files changed, 37 insertions(+), 115 deletions(-)
diff --git a/karavan-operator/pom.xml b/karavan-operator/pom.xml
index 7f606e6..b78960e 100644
--- a/karavan-operator/pom.xml
+++ b/karavan-operator/pom.xml
@@ -15,7 +15,7 @@
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <quarkus-sdk.version>4.0.3</quarkus-sdk.version>
+ <quarkus-sdk.version>4.0.5</quarkus-sdk.version>
<quarkus.version>2.13.0.Final</quarkus.version>
</properties>
diff --git
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
index 465366d..47b862c 100644
---
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
+++
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
@@ -16,11 +16,35 @@
*/
package org.apache.camel.karavan.operator.spec;
-import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
-import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
+ import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
+ import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
@CSVMetadata(
- name = "camel-karavan-operator",
+ name = "camel-karavan-operator.v3.18.6",
+ annotations = @CSVMetadata.Annotations(
+ containerImage =
"ghcr.io/apache/camel-karavan-operator:3.18.6",
+ repository = "https://github.com/apache/camel-karavan";,
+ capabilities = "Basic Install",
+ categories = "Developer Tools, Integration & Delivery",
+ certified = false,
+ almExamples = "[\n" +
+ " {\n" +
+ " \"apiVersion\": \"camel.apache.org/v1\",\n" +
+ " \"kind\": \"Karavan\",\n" +
+ " \"metadata\": {\n" +
+ " \"labels\": {\n" +
+ " \"app\": \"karavan\"\n" +
+ " },\n" +
+ " \"name\": \"karavan\"\n" +
+ " },\n" +
+ " \"spec\": {\n" +
+ " \"instances\": 1,\n" +
+ " \"auth\": \"public\",\n" +
+ " \"type\": \"dev\"\n" +
+ " }\n" +
+ " }\n" +
+ "]"
+ ),
displayName = "Camel Karavan Operator",
description = "Apache Camel Karavan\n" +
"====================\n" +
@@ -83,119 +107,17 @@ import
io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
maintainers = @CSVMetadata.Maintainer(name = "The Apache Software
Foundation", email = "us...@camel.apache.org"),
provider = @CSVMetadata.Provider(name = "The Apache Software
Foundation"),
maturity = "alpha",
- requiredCRDs = {
- @CSVMetadata.RequiredCRD(name = "pipelines.tekton.dev",
version = "apiextensions.k8s.io/v1", kind = "CustomResourceDefinition"),
- @CSVMetadata.RequiredCRD(name = "tasks.tekton.dev", version =
"apiextensions.k8s.io/v1", kind = "CustomResourceDefinition")
+ minKubeVersion = "1.11.0",
+ icon = @CSVMetadata.Icon(
+ fileName = ""
+ ),
+ installModes = {
+ @CSVMetadata.InstallMode(type = "AllNamespaces")
+ },
+ links = {
+ @CSVMetadata.Link(name = "Apache Camel Karavan source code
repository", url = "https://github.com/apache/camel-karavan";)
}
)
public class KaravanOperatorCSVMetadata implements SharedCSVMetadata {
}
-// TODO: Prepared for quarkus-operator-sdk 4.0.4+
-//package org.apache.camel.karavan.operator.spec;
-//
-// import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
-// import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
-//
-//@CSVMetadata(
-// name = "camel-karavan-operator.v3.18.6",
-// annotations = @CSVMetadata.Annotations(
-// containerImage =
"ghcr.io/apache/camel-karavan-operator:3.18.6",
-// repository = "https://github.com/apache/camel-karavan";,
-// capabilities = "Basic Install",
-// categories = "Developer Tools, Integration & Delivery",
-// certified = false,
-// almExamples = "[\n" +
-// " {\n" +
-// " \"apiVersion\": \"camel.apache.org/v1\",\n" +
-// " \"kind\": \"Karavan\",\n" +
-// " \"metadata\": {\n" +
-// " \"labels\": {\n" +
-// " \"app\": \"karavan\"\n" +
-// " },\n" +
-// " \"name\": \"karavan\"\n" +
-// " },\n" +
-// " \"spec\": {\n" +
-// " \"instances\": 1,\n" +
-// " \"auth\": \"public\",\n" +
-// " \"type\": \"dev\"\n" +
-// " }\n" +
-// " }\n" +
-// "]"
-// ),
-// displayName = "Camel Karavan Operator",
-// description = "Apache Camel Karavan\n" +
-// "====================\n" +
-// "Karavan is an Integration Toolkit for Apache Camel, which
makes integration easy and fun through the visualization of pipelines,\n" +
-// "integration with runtimes and package, image build and
deploy to kubernetes out-of-the-box.\n" +
-// "\n" +
-// "## Installation\n" +
-// "\n" +
-// "1. Install Apache Camel Karavan Operator\n" +
-// "2. Install Tekton operator\n" +
-// "3. Create namespace, ex: `karavan`\n" +
-// "4. Create `Secret` in the namespace, ex:\n" +
-// "```\n" +
-// "kind: Secret\n" +
-// "apiVersion: v1\n" +
-// "metadata:\n" +
-// " name: karavan\n" +
-// " namespace: karavan\n" +
-// "type: Opaque\n" +
-// "stringData:\n" +
-// " master-password: karavan\n" +
-// " oidc-secret: secret\n" +
-// " oidc-server-url: https://hostname/auth/realms/karavan\n"; +
-// " oidc-frontend-url: https://hostname/auth\n"; +
-// " projects-git-repository:
https://github.com/repository/projects.git\n"; +
-// " projects-git-password: password\n" +
-// " projects-git-username: username\n" +
-// " projects-git-branch: main\n" +
-// " kamelets-git-repository:
https://github.com/repository/kamelets.git\n"; +
-// " kamelets-git-password: password\n" +
-// " kamelets-git-username: username\n" +
-// " kamelets-git-branch: main\n" +
-// " image-registry:
image-registry.openshift-image-registry.svc:5000\n" +
-// "```\n" +
-// "5. Create `Karavan` instance in the namespace, ex:\n" +
-// "```\n" +
-// "apiVersion: camel.apache.org/v1\n" +
-// "kind: Karavan\n" +
-// "metadata:\n" +
-// " name: karavan\n" +
-// " namespace: karavan\n" +
-// "spec:\n" +
-// " instances: 1\n" +
-// " auth: public\n" +
-// "```\n",
-// permissionRules = {
-// @CSVMetadata.PermissionRule(apiGroups = "camel.apache.org",
resources = {"karavans", "karavans/status", "karavans/finalizers"}),
-// @CSVMetadata.PermissionRule(apiGroups =
"rbac.authorization.k8s.io", resources = {"roles", "rolebindings",
"clusterroles", "clusterrolebindings"}),
-// @CSVMetadata.PermissionRule(apiGroups =
{"image.openshift.io"}, resources = {"imagestreams", "imagestreams/layers"}),
-// @CSVMetadata.PermissionRule(apiGroups =
{"route.openshift.io"}, resources = {"routes"}),
-// @CSVMetadata.PermissionRule(apiGroups =
{"networking.k8s.io"}, resources = {"ingresses"}),
-// @CSVMetadata.PermissionRule(apiGroups = {"apps"}, resources
= {"deployments"}),
-// @CSVMetadata.PermissionRule(apiGroups = {""}, resources =
{"serviceaccounts", "secrets", "configmaps", "services", "persistentvolumes",
"persistentvolumeclaims"}),
-// @CSVMetadata.PermissionRule(apiGroups =
{"operators.coreos.com"}, resources = {"subscriptions"}, verbs = {"get",
"list", "watch"}),
-// @CSVMetadata.PermissionRule(apiGroups = {"tekton.dev"},
resources = {"tasks", "pipelines"}),
-// @CSVMetadata.PermissionRule(apiGroups =
{"apiextensions.k8s.io"}, resources = {"customresourcedefinitions"}, verbs =
{"get", "list", "watch"}),
-// },
-// keywords = {"apache", "camel", "karavan", "integration",
"microservices", "low-code"},
-// version = "3.18.6",
-// maintainers = @CSVMetadata.Maintainer(name = "The Apache Software
Foundation", email = "us...@camel.apache.org"),
-// provider = @CSVMetadata.Provider(name = "The Apache Software
Foundation"),
-// maturity = "alpha",
-// minKubeVersion = "1.11.0",
-// icon = @CSVMetadata.Icon(
-// base64data =
"PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBpZD0ic3ZnNTAiIHdpZHRoPSIyNTYiIGhlaWdodD0iMjU2IiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiIgY2xhc3M9ImxvZ28iPjxkZWZzIGlkPSJkZWZzMzEiPjxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyR3JhZGllbnQxMzUxIj48c3RvcCBpZD0ic3RvcDEzNDciIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2RjZmZmZiIgc3RvcC1vcGFjaXR5PSIxIj48L3N0b3A+PHN0b3AgaWQ9InN0
[...]
-// ),
-// installModes = {
-// @CSVMetadata.InstallMode(type = "AllNamespaces")
-// },
-// links = {
-// @CSVMetadata.Link(name = "Apache Camel Karavan source code
repository", url = "https://github.com/apache/camel-karavan";)
-// }
-//)
-//public class KaravanOperatorCSVMetadata implements SharedCSVMetadata {
-//}
-
