This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch kube in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8bebfa0c3e9218a1bb7ca33a15e75dbef2b75f4e Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Feb 8 18:21:13 2024 +0100 CAMEL-20398: camel-kubernetes - Add local as masterURL so you can run easily with a client without having to create it as a bean first. --- .../kubernetes/config_maps/kubernetes-config-maps.json | 2 +- .../camel/component/kubernetes/cronjob/kubernetes-cronjob.json | 2 +- .../customresources/kubernetes-custom-resources.json | 2 +- .../kubernetes/deployments/kubernetes-deployments.json | 2 +- .../camel/component/kubernetes/events/kubernetes-events.json | 2 +- .../apache/camel/component/kubernetes/hpa/kubernetes-hpa.json | 2 +- .../apache/camel/component/kubernetes/job/kubernetes-job.json | 2 +- .../component/kubernetes/namespaces/kubernetes-namespaces.json | 2 +- .../camel/component/kubernetes/nodes/kubernetes-nodes.json | 2 +- .../persistent_volumes/kubernetes-persistent-volumes.json | 2 +- .../kubernetes-persistent-volumes-claims.json | 2 +- .../camel/component/kubernetes/pods/kubernetes-pods.json | 2 +- .../kubernetes-replication-controllers.json | 2 +- .../kubernetes/resources_quota/kubernetes-resources-quota.json | 2 +- .../camel/component/kubernetes/secrets/kubernetes-secrets.json | 2 +- .../service_accounts/kubernetes-service-accounts.json | 2 +- .../component/kubernetes/services/kubernetes-services.json | 2 +- .../openshift/build_configs/openshift-build-configs.json | 2 +- .../camel/component/openshift/builds/openshift-builds.json | 2 +- .../deploymentconfigs/openshift-deploymentconfigs.json | 2 +- .../camel/component/kubernetes/KubernetesConfiguration.java | 8 +++++++- .../apache/camel/component/kubernetes/KubernetesHelper.java | 10 ++++++---- 22 files changed, 33 insertions(+), 25 deletions(-) diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json index fef0dfbc025..5f67e38cc07 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json @@ -38,7 +38,7 @@ "CamelKubernetesEventTimestamp": { "index": 6, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/cronjob/kubernetes-cronjob.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/cronjob/kubernetes-cronjob.json index 990d2a5ae35..0a9e6b089cb 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/cronjob/kubernetes-cronjob.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/cronjob/kubernetes-cronjob.json @@ -34,7 +34,7 @@ "CamelKubernetesCronJobSpec": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The spec for a Job.", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_CRON_JOB_SPEC" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json index 3d9d1d0a30f..6d0a95b81a0 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json @@ -44,7 +44,7 @@ "CamelKubernetesDeleteResult": { "index": 12, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The result of the delete operation", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_DELETE_RESULT" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json index adb5ed27d33..f671ff88ccb 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json @@ -39,7 +39,7 @@ "CamelKubernetesEventTimestamp": { "index": 7, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json index a33a3482352..0012cb6a3cc 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json @@ -45,7 +45,7 @@ "CamelKubernetesEventTimestamp": { "index": 14, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json index 82d0d363d89..297f7cb9658 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json @@ -38,7 +38,7 @@ "CamelKubernetesEventTimestamp": { "index": 6, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json index 1843608f3c5..6a06557db18 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json @@ -35,7 +35,7 @@ "CamelKubernetesJobLabels": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Map<String, String>", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Job labels.", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_JOB_LABELS" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json index 10a5ae52ea4..1b538828458 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json @@ -36,7 +36,7 @@ "CamelKubernetesEventTimestamp": { "index": 4, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json index 7375a2f9745..f683619fb51 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json @@ -37,7 +37,7 @@ "CamelKubernetesEventTimestamp": { "index": 5, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json index 402b8293d59..cd625e20da0 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json @@ -33,7 +33,7 @@ "CamelKubernetesPersistentVolumeName": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The persistent volume name", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_PERSISTENT_VOLUME_NAME" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json index 8d82f206ffe..bed420c44f2 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json @@ -35,7 +35,7 @@ "CamelKubernetesPersistentVolumeClaimSpec": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The spec for a persistent volume claim", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_PERSISTENT_VOLUME_CLAIM_SPEC" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json index 0f394b71a54..ae3e718b145 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json @@ -38,7 +38,7 @@ "CamelKubernetesEventTimestamp": { "index": 6, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json index 839b0495ee5..b32c587854c 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json @@ -39,7 +39,7 @@ "CamelKubernetesEventTimestamp": { "index": 7, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json index b33c5850d09..f34a180aa09 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json @@ -35,7 +35,7 @@ "CamelKubernetesResourceQuotaSpec": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "io.fabric8.kubernetes.api.model.ResourceQuotaSpec", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The spec for a resource quota", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_RESOURCE_QUOTA_SPEC" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json index 5a33470d6ca..1c1e94ab48e 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json @@ -35,7 +35,7 @@ "CamelKubernetesSecret": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "io.fabric8.kubernetes.api.model.Secret", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "A secret object", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_SECRET" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json index 537840eeaef..2720d5244b1 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json @@ -35,7 +35,7 @@ "CamelKubernetesServiceAccount": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "io.fabric8.kubernetes.api.model.ServiceAccount", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "A service account object", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_SERVICE_ACCOUNT" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json index 3dbbc87e184..2591ec15f05 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json @@ -38,7 +38,7 @@ "CamelKubernetesEventTimestamp": { "index": 6, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json index d9bf2f833eb..622ec95540b 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json @@ -34,7 +34,7 @@ "CamelKubernetesBuildConfigName": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Openshift Config Build name", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_BUILD_CONFIG_NAME" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json index 37488d9fb2e..6f63cbaaba5 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json @@ -34,7 +34,7 @@ "CamelKubernetesBuildName": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Openshift build name", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_BUILD_NAME" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json index ca6de013dbe..738600ebc5a 100644 --- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json +++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json @@ -39,7 +39,7 @@ "CamelKubernetesEventTimestamp": { "index": 7, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Timestamp of the action watched by the consumer", "constantName": "org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP" } }, "properties": { - "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Kubernetes Master url" }, + "masterUrl": { "index": 0, "kind": "path", "displayName": "Master Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "URL to a remote Kubernetes API server. This should only be used when your Camel application i [...] "apiVersion": { "index": 1, "kind": "parameter", "displayName": "Api Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The Kubernetes API Version to use" }, "dnsDomain": { "index": 2, "kind": "parameter", "displayName": "Dns Domain", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "The dns domain, used for ServiceCall EIP" }, "kubernetesClient": { "index": 3, "kind": "parameter", "displayName": "Kubernetes Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kubernetes.KubernetesConfiguration", "configurationField": "configuration", "description": "Default KubernetesClient to use if provided" }, diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java index 024bf2c2977..2d56bd886e8 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesConfiguration.java @@ -121,7 +121,13 @@ public class KubernetesConfiguration implements Cloneable { private String crdPlural; /** - * Kubernetes Master url + * URL to a remote Kubernetes API server. + * + * This should only be used when your Camel application is connecting from outside Kubernetes. If you run your Camel + * application inside Kubernetes, then you can use local or client as the URL to tell Camel to run in local mode. + * + * If you connect remotely to Kubernetes, then you may also need some of the many other configuration options for + * secured connection with certificates, etc. */ public String getMasterUrl() { return masterUrl; diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java index 10fc54863d0..558e3706c64 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java @@ -42,11 +42,13 @@ public final class KubernetesHelper { public static KubernetesClient getKubernetesClient(KubernetesConfiguration configuration) { if (configuration.getKubernetesClient() != null) { return configuration.getKubernetesClient(); - } else if (configuration.getMasterUrl() != null) { - return createKubernetesClient(configuration); - } else { - LOG.info("Creating default kubernetes client without applying configuration"); + } + String master = configuration.getMasterUrl(); + if (master == null || "local".equals(master) || "client".equals(master)) { + LOG.info("Creating default local Kubernetes client without applying configuration"); return new KubernetesClientBuilder().build(); + } else { + return createKubernetesClient(configuration); } }