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
The following commit(s) were added to refs/heads/main by this push:
new 4df1f0b Cleanup
4df1f0b is described below
commit 4df1f0ba19a089c0bd821e199af732ce41f565ed
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Sun Oct 16 18:22:35 2022 -0400
Cleanup
---
karavan-operator/resources/karavan.yaml | 4 +-
.../karavan/operator/gitea/GiteaCatalogSource.java | 66 ----------------------
.../operator/spec/KaravanOperatorCSVMetadata.java | 1 +
karavan-vscode/CHANGELOG.md | 4 ++
4 files changed, 7 insertions(+), 68 deletions(-)
diff --git a/karavan-operator/resources/karavan.yaml
b/karavan-operator/resources/karavan.yaml
index 0a7a070..724f626 100644
--- a/karavan-operator/resources/karavan.yaml
+++ b/karavan-operator/resources/karavan.yaml
@@ -6,5 +6,5 @@ metadata:
spec:
instances: 1
auth: public
- nodePort: 30666
- type: dev
+ nodePort: 30668
+ type: demo
diff --git
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/gitea/GiteaCatalogSource.java
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/gitea/GiteaCatalogSource.java
deleted file mode 100644
index ddb7dc8..0000000
---
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/gitea/GiteaCatalogSource.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-package org.apache.camel.karavan.operator.resource;
-
-import io.fabric8.kubernetes.api.model.rbac.PolicyRuleBuilder;
-import io.fabric8.kubernetes.api.model.rbac.Role;
-import io.fabric8.kubernetes.api.model.rbac.RoleBuilder;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
-import
io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
-import org.apache.camel.karavan.operator.Constants;
-import org.apache.camel.karavan.operator.spec.Karavan;
-import org.apache.camel.karavan.operator.Utils;
-
-import java.util.Map;
-
-public class KaravanRole extends CRUDKubernetesDependentResource<Role,
Karavan> {
-
- public KaravanRole() {
- super(Role.class);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Role desired(Karavan karavan, Context<Karavan> context) {
- return new RoleBuilder()
- .withNewMetadata()
- .withName(Constants.ROLE_KARAVAN)
- .withNamespace(karavan.getMetadata().getNamespace())
- .withLabels(Utils.getLabels(Constants.ROLE_KARAVAN, Map.of()))
- .endMetadata()
- .withRules(
- new
PolicyRuleBuilder().withApiGroups("").withResources("secrets",
"configmaps").withVerbs("get", "list").build(),
- new
PolicyRuleBuilder().withApiGroups("").withResources("persistentvolumes",
"persistentvolumeclaims").withVerbs("get", "list", "watch").build(),
- new
PolicyRuleBuilder().withApiGroups("tekton.dev").withResources("pipelineruns").withVerbs("*").build(),
- new PolicyRuleBuilder().withApiGroups("",
"apps").withResources("deployments", "services", "routes",
"replicationcontrollers").withVerbs("*").build()
- )
- .build();
- }
-
- @Override
- public ReconcileResult<Role> reconcile(Karavan karavan, Context<Karavan>
context) {
- Role role =
getKubernetesClient().rbac().roles().inNamespace(karavan.getMetadata().getNamespace()).withName(Constants.ROLE_KARAVAN).get();
- if (role == null) {
- var desired = desired(karavan, context);
- var createdResource = handleCreate(desired, karavan, context);
- return ReconcileResult.resourceCreated(createdResource);
- } else {
- return ReconcileResult.noOperation(role);
- }
- }
-}
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 47fd9c2..0def9ce 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
@@ -73,6 +73,7 @@ import
io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
@CSVMetadata.PermissionRule(apiGroups = {""}, resources =
{"serviceaccounts", "secrets", "configmaps"}),
@CSVMetadata.PermissionRule(apiGroups = {"tekton.dev"},
resources = {"pipelinetasks", "pipelines"}),
@CSVMetadata.PermissionRule(apiGroups = {"networking.k8s.io"},
resources = {"ingresses"}),
+ @CSVMetadata.PermissionRule(apiGroups =
{"operators.coreos.com/v1alpha1"}, resources = {"catalogsources"}),
},
keywords = {"apache", "camel", "karavan", "integration",
"microservices", "low-code"},
version = "3.18.5",
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index e1c25ad..76a693c 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## 3.18.5
+1. Karavan Operator
+2. Kamelets 0.9.1
+
## 3.18.4
1. Support minikube for cloud app
2. OpenAPI YAML import in cloud app
