This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1aecbfdafb4 CAMEL-19134: Upgrade kubernetes-client to 6.5.1
1aecbfdafb4 is described below
commit 1aecbfdafb4a122d744162d0e7d0523864bb6522
Author: James Netherton <[email protected]>
AuthorDate: Thu Mar 30 13:10:19 2023 +0100
CAMEL-19134: Upgrade kubernetes-client to 6.5.1
---
camel-dependencies/pom.xml | 4 +--
.../client/ConfigFluentImplConfigurer.java | 12 --------
.../docs/kubernetes-config-maps-component.adoc | 2 +-
.../kubernetes-custom-resources-component.adoc | 2 +-
.../docs/kubernetes-deployments-component.adoc | 2 +-
.../src/main/docs/kubernetes-events-component.adoc | 4 +--
.../src/main/docs/kubernetes-hpa-component.adoc | 2 +-
.../src/main/docs/kubernetes-job-component.adoc | 2 +-
.../main/docs/kubernetes-namespaces-component.adoc | 2 +-
.../src/main/docs/kubernetes-nodes-component.adoc | 2 +-
...rnetes-persistent-volumes-claims-component.adoc | 2 +-
.../src/main/docs/kubernetes-pods-component.adoc | 2 +-
...bernetes-replication-controllers-component.adoc | 2 +-
.../docs/kubernetes-resources-quota-component.adoc | 2 +-
.../main/docs/kubernetes-secrets-component.adoc | 2 +-
.../kubernetes-service-accounts-component.adoc | 2 +-
.../openshift-deploymentconfigs-component.adoc | 2 +-
.../component/kubernetes/KubernetesOperations.java | 32 +++++++++++-----------
.../lock/impl/ConfigMapLeaseResourceManager.java | 4 +--
.../lock/impl/NativeLeaseResourceManager.java | 6 ++--
.../config_maps/KubernetesConfigMapsProducer.java | 8 +++---
.../KubernetesCustomResourcesProducer.java | 12 ++++----
.../deployments/KubernetesDeploymentsProducer.java | 8 +++---
.../events/KubernetesEventsProducer.java | 8 +++---
.../kubernetes/hpa/KubernetesHPAProducer.java | 8 +++---
.../kubernetes/job/KubernetesJobProducer.java | 8 +++---
.../namespaces/KubernetesNamespacesProducer.java | 8 +++---
.../kubernetes/nodes/KubernetesNodesProducer.java | 8 +++---
.../KubernetesPersistentVolumesClaimsProducer.java | 8 +++---
.../kubernetes/pods/KubernetesPodsProducer.java | 8 +++---
.../KubernetesReplicationControllersProducer.java | 8 +++---
.../KubernetesResourcesQuotaProducer.java | 8 +++---
.../secrets/KubernetesSecretsProducer.java | 8 +++---
.../KubernetesServiceAccountsProducer.java | 8 +++---
.../services/KubernetesServicesProducer.java | 8 +++---
.../OpenshiftDeploymentConfigsProducer.java | 8 +++---
.../kubernetes/cluster/utils/LockTestServer.java | 12 ++++++++
.../KubernetesConfigMapsConsumerIT.java | 8 +++---
.../KubernetesCustomResourcesConsumerIT.java | 2 +-
.../integration/KubernetesEventsConsumerIT.java | 3 +-
.../producer/KubernetesConfigMapsProducerTest.java | 8 +++---
.../KubernetesCustomResourcesProducerTest.java | 8 +++---
.../KubernetesDeploymentsProducerTest.java | 8 +++---
.../producer/KubernetesEventsProducerTest.java | 6 ++--
.../producer/KubernetesHPAProducerTest.java | 6 ++--
.../producer/KubernetesJobProducerTest.java | 6 ++--
.../producer/KubernetesNamespacesProducerTest.java | 8 +++---
.../producer/KubernetesNodesProducerTest.java | 6 ++--
...ernetesPersistentVolumesClaimsProducerTest.java | 8 +++---
.../producer/KubernetesPodsProducerTest.java | 6 ++--
...bernetesReplicationControllersProducerTest.java | 8 +++---
.../KubernetesResourcesQuotaProducerTest.java | 8 +++---
.../producer/KubernetesSecretsProducerTest.java | 6 ++--
.../KubernetesServiceAccountsProducerTest.java | 8 +++---
.../producer/KubernetesServicesProducerTest.java | 8 +++---
.../ConfigMapPropertiesFunctionRouteTest.java | 2 +-
.../ConfigMapPropertiesFunctionTest.java | 2 +-
.../SecretPropertiesFunctionRouteTest.java | 2 +-
.../properties/SecretPropertiesFunctionTest.java | 2 +-
.../OpenshiftDeploymentConfigsProducerTest.java | 8 +++---
.../ROOT/pages/camel-4-migration-guide.adoc | 7 +++++
parent/pom.xml | 4 +--
62 files changed, 195 insertions(+), 187 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dca055bd2c1..23f3428a42e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -324,8 +324,8 @@
<kafka-version>3.4.0</kafka-version>
<kafka-debezium-version>3.3.1</kafka-debezium-version>
<kotlin-version>1.8.0</kotlin-version>
- <kubernetes-client-version>6.4.1</kubernetes-client-version>
- <kubernetes-model-version>6.4.1</kubernetes-model-version>
+ <kubernetes-client-version>6.5.1</kubernetes-client-version>
+ <kubernetes-model-version>6.5.1</kubernetes-model-version>
<kudu-version>1.16.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>
diff --git
a/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
b/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
index f0991893c83..935ea0a0ace 100644
---
a/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
+++
b/components/camel-kubernetes/src/generated/java/io/fabric8/kubernetes/client/ConfigFluentImplConfigurer.java
@@ -103,8 +103,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "RequestRetryBackoffLimit":
target.withRequestRetryBackoffLimit(property(camelContext, int.class, value));
return true;
case "requesttimeout":
case "RequestTimeout":
target.withRequestTimeout(property(camelContext, int.class, value)); return
true;
- case "rollingtimeout":
- case "RollingTimeout":
target.withRollingTimeout(property(camelContext, long.class, value)); return
true;
case "scaletimeout":
case "ScaleTimeout": target.withScaleTimeout(property(camelContext,
long.class, value)); return true;
case "tlsversions":
@@ -115,8 +113,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "TrustStoreFile":
target.withTrustStoreFile(property(camelContext, java.lang.String.class,
value)); return true;
case "truststorepassphrase":
case "TrustStorePassphrase":
target.withTrustStorePassphrase(property(camelContext, java.lang.String.class,
value)); return true;
- case "uploadconnectiontimeout":
- case "UploadConnectionTimeout":
target.withUploadConnectionTimeout(property(camelContext, int.class, value));
return true;
case "uploadrequesttimeout":
case "UploadRequestTimeout":
target.withUploadRequestTimeout(property(camelContext, int.class, value));
return true;
case "useragent":
@@ -220,8 +216,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "RequestRetryBackoffLimit": return int.class;
case "requesttimeout":
case "RequestTimeout": return int.class;
- case "rollingtimeout":
- case "RollingTimeout": return long.class;
case "scaletimeout":
case "ScaleTimeout": return long.class;
case "tlsversions":
@@ -232,8 +226,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "TrustStoreFile": return java.lang.String.class;
case "truststorepassphrase":
case "TrustStorePassphrase": return java.lang.String.class;
- case "uploadconnectiontimeout":
- case "UploadConnectionTimeout": return int.class;
case "uploadrequesttimeout":
case "UploadRequestTimeout": return int.class;
case "useragent":
@@ -338,8 +330,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "RequestRetryBackoffLimit": return
target.getRequestRetryBackoffLimit();
case "requesttimeout":
case "RequestTimeout": return target.getRequestTimeout();
- case "rollingtimeout":
- case "RollingTimeout": return target.getRollingTimeout();
case "scaletimeout":
case "ScaleTimeout": return target.getScaleTimeout();
case "tlsversions":
@@ -350,8 +340,6 @@ public class ConfigFluentImplConfigurer extends
org.apache.camel.support.compone
case "TrustStoreFile": return target.getTrustStoreFile();
case "truststorepassphrase":
case "TrustStorePassphrase": return target.getTrustStorePassphrase();
- case "uploadconnectiontimeout":
- case "UploadConnectionTimeout": return
target.getUploadConnectionTimeout();
case "uploadrequesttimeout":
case "UploadRequestTimeout": return target.getUploadRequestTimeout();
case "useragent":
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index dfe5a6cd862..849cbfa9fe0 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
@@ -41,7 +41,7 @@ include::partial$component-endpoint-headers.adoc[]
- listConfigMapsByLabels
- getConfigMap
- createConfigMap
-- replaceConfigMap
+- updateConfigMap
- deleteConfigMap
== Kubernetes ConfigMaps Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-custom-resources-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-custom-resources-component.adoc
index 22b225168c4..6c2487b6814 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-custom-resources-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-custom-resources-component.adoc
@@ -42,7 +42,7 @@ include::partial$component-endpoint-headers.adoc[]
- getCustomResource
- deleteCustomResource
- createCustomResource
-- replaceCustomResource
+- updateCustomResource
include::spring-boot:partial$starter.adoc[]
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
index 9f14288262c..3e5c9457410 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listDeploymentsByLabels
- getDeployment
- createDeployment
-- replaceDeployment
+- updateDeployment
- deleteDeployment
- scaleDeployment
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-events-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-events-component.adoc
index b02b27020f6..4cd0e4278e6 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-events-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-events-component.adoc
@@ -41,7 +41,7 @@ include::partial$component-endpoint-headers.adoc[]
- listEventsByLabels
- getEvent
- createEvent
-- replaceEvent
+- updateEvent
- deleteEvent
== Kubernetes Events Producer Examples
@@ -138,7 +138,7 @@ The message headers that can be used to create an event are
`CamelKubernetesEven
In case the supported message headers are not enough for a specific use case,
it is still possible to set the message body with an object of type
`io.fabric8.kubernetes.api.model.events.v1.EventBuilder` representing a
prefilled builder to use when creating the event. Please note that the labels,
name of event and name of namespace are always set from the message headers,
even when the builder is provided.
-- replaceEvent: this operation replaces an existing event
+- updateEvent: this operation updates an existing event
The behavior is exactly the same as `createEvent`, only the name of the
operation is different.
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
index 7a72504ff96..5e52bb40099 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listHPAByLabels
- getHPA
- createHPA
-- replaceHPA
+- updateHPA
- deleteHPA
== Kubernetes HPA Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
index e1b5eb02303..f867ad52c1b 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
@@ -41,7 +41,7 @@ include::partial$component-endpoint-headers.adoc[]
- listJobByLabels
- getJob
- createJob
-- replaceJob
+- updateJob
- deleteJob
== Kubernetes Job Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
index be43674e7bb..a9ed162c45c 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
@@ -41,7 +41,7 @@ include::partial$component-endpoint-headers.adoc[]
- listNamespacesByLabels
- getNamespace
- createNamespace
-- replaceNamespace
+- updateNamespace
- deleteNamespace
== Kubernetes Namespaces Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
index 2f9088bab5d..0985d75ef7f 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listNodesByLabels
- getNode
- createNode
-- replaceNode
+- updateNode
- deleteNode
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
index 05436922d2c..ebb77dd23dc 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listPersistentVolumesClaimsByLabels
- getPersistentVolumeClaim
- createPersistentVolumeClaim
-- replacePersistentVolumeClaim
+- updatePersistentVolumeClaim
- deletePersistentVolumeClaim
== Kubernetes Persistent Volume Claims Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
index 4b02b7556a1..d0d66084192 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listPodsByLabels
- getPod
- createPod
-- replacePod
+- updatePod
- deletePod
== Kubernetes Pods Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
index 971aba653fe..2974e1558c6 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
@@ -41,7 +41,7 @@ include::partial$component-endpoint-headers.adoc[]
- listReplicationControllersByLabels
- getReplicationController
- createReplicationController
-- replaceReplicationController
+- updateReplicationController
- deleteReplicationController
- scaleReplicationController
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
index f51e999a22e..080577854a6 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listResourcesQuotaByLabels
- getResourcesQuota
- createResourcesQuota
-- replaceResourceQuota
+- updateResourceQuota
- deleteResourcesQuota
== Kubernetes Resource Quota Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
index d87ae2735d8..b01b56fc081 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listSecretsByLabels
- getSecret
- createSecret
-- replaceSecret
+- updateSecret
- deleteSecret
== Kubernetes Secrets Producer Examples
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
index e51998f05cc..fb23bf2fb85 100644
---
a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listServiceAccountsByLabels
- getServiceAccount
- createServiceAccount
-- replaceServiceAccount
+- updateServiceAccount
- deleteServiceAccount
== Kubernetes ServiceAccounts Produce Examples
diff --git
a/components/camel-kubernetes/src/main/docs/openshift-deploymentconfigs-component.adoc
b/components/camel-kubernetes/src/main/docs/openshift-deploymentconfigs-component.adoc
index a853b9f78c1..06be2d737f1 100644
---
a/components/camel-kubernetes/src/main/docs/openshift-deploymentconfigs-component.adoc
+++
b/components/camel-kubernetes/src/main/docs/openshift-deploymentconfigs-component.adoc
@@ -40,7 +40,7 @@ include::partial$component-endpoint-headers.adoc[]
- listDeploymentsConfigsByLabels
- getDeploymentConfig
- createDeploymentConfig
-- replaceDeploymentConfig
+- updateDeploymentConfig
- deleteDeploymentConfig
- scaleDeploymentConfig
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesOperations.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesOperations.java
index 06d6e1851ac..a6fdfbec2af 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesOperations.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesOperations.java
@@ -23,7 +23,7 @@ public final class KubernetesOperations {
public static final String LIST_NAMESPACE_BY_LABELS_OPERATION =
"listNamespacesByLabels";
public static final String GET_NAMESPACE_OPERATION = "getNamespace";
public static final String CREATE_NAMESPACE_OPERATION = "createNamespace";
- public static final String REPLACE_NAMESPACE_OPERATION =
"replaceNamespace";
+ public static final String UPDATE_NAMESPACE_OPERATION = "updateNamespace";
public static final String DELETE_NAMESPACE_OPERATION = "deleteNamespace";
// Services
@@ -31,7 +31,7 @@ public final class KubernetesOperations {
public static final String LIST_SERVICES_BY_LABELS_OPERATION =
"listServicesByLabels";
public static final String GET_SERVICE_OPERATION = "getService";
public static final String CREATE_SERVICE_OPERATION = "createService";
- public static final String REPLACE_SERVICE_OPERATION = "replaceService";
+ public static final String UPDATE_SERVICE_OPERATION = "updateService";
public static final String DELETE_SERVICE_OPERATION = "deleteService";
// Replication Controllers
@@ -39,7 +39,7 @@ public final class KubernetesOperations {
public static final String
LIST_REPLICATION_CONTROLLERS_BY_LABELS_OPERATION =
"listReplicationControllersByLabels";
public static final String GET_REPLICATION_CONTROLLER_OPERATION =
"getReplicationController";
public static final String CREATE_REPLICATION_CONTROLLER_OPERATION =
"createReplicationController";
- public static final String REPLACE_REPLICATION_CONTROLLER_OPERATION =
"replaceReplicationController";
+ public static final String UPDATE_REPLICATION_CONTROLLER_OPERATION =
"updateReplicationController";
public static final String DELETE_REPLICATION_CONTROLLER_OPERATION =
"deleteReplicationController";
public static final String SCALE_REPLICATION_CONTROLLER_OPERATION =
"scaleReplicationController";
@@ -48,7 +48,7 @@ public final class KubernetesOperations {
public static final String LIST_PODS_BY_LABELS_OPERATION =
"listPodsByLabels";
public static final String GET_POD_OPERATION = "getPod";
public static final String CREATE_POD_OPERATION = "createPod";
- public static final String REPLACE_POD_OPERATION = "replacePod";
+ public static final String UPDATE_POD_OPERATION = "updatePod";
public static final String DELETE_POD_OPERATION = "deletePod";
// Persistent Volumes
@@ -61,7 +61,7 @@ public final class KubernetesOperations {
public static final String
LIST_PERSISTENT_VOLUMES_CLAIMS_BY_LABELS_OPERATION =
"listPersistentVolumesClaimsByLabels";
public static final String GET_PERSISTENT_VOLUME_CLAIM_OPERATION =
"getPersistentVolumeClaim";
public static final String CREATE_PERSISTENT_VOLUME_CLAIM_OPERATION =
"createPersistentVolumeClaim";
- public static final String REPLACE_PERSISTENT_VOLUME_CLAIM_OPERATION =
"replacePersistentVolumeClaim";
+ public static final String UPDATE_PERSISTENT_VOLUME_CLAIM_OPERATION =
"updatePersistentVolumeClaim";
public static final String DELETE_PERSISTENT_VOLUME_CLAIM_OPERATION =
"deletePersistentVolumeClaim";
// Secrets
@@ -69,7 +69,7 @@ public final class KubernetesOperations {
public static final String LIST_SECRETS_BY_LABELS_OPERATION =
"listSecretsByLabels";
public static final String GET_SECRET_OPERATION = "getSecret";
public static final String CREATE_SECRET_OPERATION = "createSecret";
- public static final String REPLACE_SECRET_OPERATION = "replaceSecret";
+ public static final String UPDATE_SECRET_OPERATION = "updateSecret";
public static final String DELETE_SECRET_OPERATION = "deleteSecret";
// Resources quota
@@ -77,7 +77,7 @@ public final class KubernetesOperations {
public static final String LIST_RESOURCES_QUOTA_BY_LABELS_OPERATION =
"listResourcesQuotaByLabels";
public static final String GET_RESOURCE_QUOTA_OPERATION =
"getResourceQuota";
public static final String CREATE_RESOURCE_QUOTA_OPERATION =
"createResourceQuota";
- public static final String REPLACE_RESOURCE_QUOTA_OPERATION =
"replaceResourceQuota";
+ public static final String UPDATE_RESOURCE_QUOTA_OPERATION =
"updateResourceQuota";
public static final String DELETE_RESOURCE_QUOTA_OPERATION =
"deleteResourceQuota";
// Service Accounts
@@ -85,7 +85,7 @@ public final class KubernetesOperations {
public static final String LIST_SERVICE_ACCOUNTS_BY_LABELS_OPERATION =
"listServiceAccountsByLabels";
public static final String GET_SERVICE_ACCOUNT_OPERATION =
"getServiceAccount";
public static final String CREATE_SERVICE_ACCOUNT_OPERATION =
"createServiceAccount";
- public static final String REPLACE_SERVICE_ACCOUNT_OPERATION =
"replaceServiceAccount";
+ public static final String UPDATE_SERVICE_ACCOUNT_OPERATION =
"updateServiceAccount";
public static final String DELETE_SERVICE_ACCOUNT_OPERATION =
"deleteServiceAccount";
// Nodes
@@ -93,7 +93,7 @@ public final class KubernetesOperations {
public static final String LIST_NODES_BY_LABELS_OPERATION =
"listNodesByLabels";
public static final String GET_NODE_OPERATION = "getNode";
public static final String CREATE_NODE_OPERATION = "createNode";
- public static final String REPLACE_NODE_OPERATION = "replaceNode";
+ public static final String UPDATE_NODE_OPERATION = "updateNode";
public static final String DELETE_NODE_OPERATION = "deleteNode";
// HPA
@@ -101,7 +101,7 @@ public final class KubernetesOperations {
public static final String LIST_HPA_BY_LABELS_OPERATION =
"listHPAByLabels";
public static final String GET_HPA_OPERATION = "getHPA";
public static final String CREATE_HPA_OPERATION = "createHPA";
- public static final String REPLACE_HPA_OPERATION = "replaceHPA";
+ public static final String UPDATE_HPA_OPERATION = "updateHPA";
public static final String DELETE_HPA_OPERATION = "deleteHPA";
// Deployments
@@ -110,7 +110,7 @@ public final class KubernetesOperations {
public static final String GET_DEPLOYMENT = "getDeployment";
public static final String DELETE_DEPLOYMENT = "deleteDeployment";
public static final String CREATE_DEPLOYMENT = "createDeployment";
- public static final String REPLACE_DEPLOYMENT = "replaceDeployment";
+ public static final String UPDATE_DEPLOYMENT = "updateDeployment";
public static final String SCALE_DEPLOYMENT = "scaleDeployment";
// Config Maps
@@ -119,7 +119,7 @@ public final class KubernetesOperations {
public static final String GET_CONFIGMAP_OPERATION = "getConfigMap";
public static final String CREATE_CONFIGMAP_OPERATION = "createConfigMap";
public static final String DELETE_CONFIGMAP_OPERATION = "deleteConfigMap";
- public static final String REPLACE_CONFIGMAP_OPERATION =
"replaceConfigMap";
+ public static final String UPDATE_CONFIGMAP_OPERATION = "updateConfigMap";
// Events
public static final String LIST_EVENTS_OPERATION = "listEvents";
@@ -127,7 +127,7 @@ public final class KubernetesOperations {
public static final String GET_EVENT_OPERATION = "getEvent";
public static final String CREATE_EVENT_OPERATION = "createEvent";
public static final String DELETE_EVENT_OPERATION = "deleteEvent";
- public static final String REPLACE_EVENT_OPERATION = "replaceEvent";
+ public static final String UPDATE_EVENT_OPERATION = "updateEvent";
// Builds
public static final String LIST_BUILD = "listBuilds";
@@ -144,7 +144,7 @@ public final class KubernetesOperations {
public static final String LIST_JOB_BY_LABELS_OPERATION =
"listJobByLabels";
public static final String GET_JOB_OPERATION = "getJob";
public static final String CREATE_JOB_OPERATION = "createJob";
- public static final String REPLACE_JOB_OPERATION = "replaceJob";
+ public static final String UPDATE_JOB_OPERATION = "updateJob";
public static final String DELETE_JOB_OPERATION = "deleteJob";
// Custom Resources
@@ -153,7 +153,7 @@ public final class KubernetesOperations {
public static final String GET_CUSTOMRESOURCE = "getCustomResource";
public static final String DELETE_CUSTOMRESOURCE = "deleteCustomResource";
public static final String CREATE_CUSTOMRESOURCE = "createCustomResource";
- public static final String REPLACE_CUSTOMRESOURCE =
"replaceCustomResource";
+ public static final String UPDATE_CUSTOMRESOURCE = "updateCustomResource";
// Deployment Configs
public static final String LIST_DEPLOYMENT_CONFIGS =
"listDeploymentConfigs";
@@ -161,7 +161,7 @@ public final class KubernetesOperations {
public static final String GET_DEPLOYMENT_CONFIG = "getDeploymentConfig";
public static final String DELETE_DEPLOYMENT_CONFIG =
"deleteDeploymentConfig";
public static final String CREATE_DEPLOYMENT_CONFIG =
"createDeploymentConfig";
- public static final String REPLACE_DEPLOYMENT_CONFIG =
"replaceDeploymentConfig";
+ public static final String UPDATE_DEPLOYMENT_CONFIG =
"updateDeploymentConfig";
public static final String SCALE_DEPLOYMENT_CONFIG =
"scaleDeploymentConfig";
private KubernetesOperations() {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
index 0c8b8f5da1e..865158bf4c4 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/ConfigMapLeaseResourceManager.java
@@ -56,7 +56,7 @@ public class ConfigMapLeaseResourceManager implements
KubernetesLeaseResourceMan
return client.configMaps()
.inNamespace(leaseResource.getMetadata().getNamespace())
.resource(updatedConfigMap)
-
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
+
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).update();
}
@Override
@@ -65,7 +65,7 @@ public class ConfigMapLeaseResourceManager implements
KubernetesLeaseResourceMan
return client.configMaps()
.inNamespace(leaseResource.getMetadata().getNamespace())
.resource(updatedConfigMap)
-
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
+
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).update();
}
@Override
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
index 8d46d742a2d..2a553f81023 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/impl/NativeLeaseResourceManager.java
@@ -46,7 +46,7 @@ public class NativeLeaseResourceManager implements
KubernetesLeaseResourceManage
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
.resource(updatedLease)
-
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
+
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).update();
}
@Override
@@ -55,7 +55,7 @@ public class NativeLeaseResourceManager implements
KubernetesLeaseResourceManage
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
.resource(updatedLease)
-
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
+
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).update();
}
@Override
@@ -70,7 +70,7 @@ public class NativeLeaseResourceManager implements
KubernetesLeaseResourceManage
return client.leases()
.inNamespace(leaseResource.getMetadata().getNamespace())
.resource(updatedLease)
-
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).replace();
+
.lockResourceVersion(leaseResource.getMetadata().getResourceVersion()).update();
}
return leaseResource;
}
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
index 263fe6a1d4d..267d9c3fe91 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsProducer.java
@@ -73,8 +73,8 @@ public class KubernetesConfigMapsProducer extends
DefaultProducer {
doCreateConfigMap(exchange);
break;
- case KubernetesOperations.REPLACE_CONFIGMAP_OPERATION:
- doReplaceConfigMap(exchange);
+ case KubernetesOperations.UPDATE_CONFIGMAP_OPERATION:
+ doUpdateConfigMap(exchange);
break;
case KubernetesOperations.DELETE_CONFIGMAP_OPERATION:
@@ -120,8 +120,8 @@ public class KubernetesConfigMapsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, configMap);
}
- protected void doReplaceConfigMap(Exchange exchange) {
- doCreateOrUpdateConfigMap(exchange, "Replace", Resource::replace);
+ protected void doUpdateConfigMap(Exchange exchange) {
+ doCreateOrUpdateConfigMap(exchange, "Update", Resource::update);
}
protected void doCreateConfigMap(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
index cf0d35dbfe0..0016376846f 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesProducer.java
@@ -91,8 +91,8 @@ public class KubernetesCustomResourcesProducer extends
DefaultProducer {
doCreate(exchange, namespace);
break;
- case KubernetesOperations.REPLACE_CUSTOMRESOURCE:
- doReplace(exchange, namespace);
+ case KubernetesOperations.UPDATE_CUSTOMRESOURCE:
+ doUpdate(exchange, namespace);
break;
default:
@@ -187,15 +187,15 @@ public class KubernetesCustomResourcesProducer extends
DefaultProducer {
}
- protected void doReplace(Exchange exchange, String namespaceName) {
- doCreateOrReplace(exchange, namespaceName, Resource::replace);
+ protected void doUpdate(Exchange exchange, String namespaceName) {
+ doCreateOrUpdate(exchange, namespaceName, Resource::update);
}
protected void doCreate(Exchange exchange, String namespaceName) {
- doCreateOrReplace(exchange, namespaceName, Resource::create);
+ doCreateOrUpdate(exchange, namespaceName, Resource::create);
}
- private void doCreateOrReplace(
+ private void doCreateOrUpdate(
Exchange exchange, String namespaceName,
Function<Resource<GenericKubernetesResource>,
GenericKubernetesResource> operation) {
String customResourceInstance =
exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE,
String.class);
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
index f42792c91d5..7e6c36085b4 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
@@ -79,8 +79,8 @@ public class KubernetesDeploymentsProducer extends
DefaultProducer {
doCreateDeployment(exchange);
break;
- case KubernetesOperations.REPLACE_DEPLOYMENT:
- doReplaceDeployment(exchange);
+ case KubernetesOperations.UPDATE_DEPLOYMENT:
+ doUpdateDeployment(exchange);
break;
case KubernetesOperations.SCALE_DEPLOYMENT:
@@ -139,8 +139,8 @@ public class KubernetesDeploymentsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, deploymentDeleted);
}
- protected void doReplaceDeployment(Exchange exchange) {
- doCreateOrUpdateDeployment(exchange, "Replace", Resource::replace);
+ protected void doUpdateDeployment(Exchange exchange) {
+ doCreateOrUpdateDeployment(exchange, "Update", Resource::update);
}
protected void doCreateDeployment(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsProducer.java
index 3d21e33576c..08bf4c45ca0 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsProducer.java
@@ -76,8 +76,8 @@ public class KubernetesEventsProducer extends DefaultProducer
{
doCreateEvent(exchange);
break;
- case KubernetesOperations.REPLACE_EVENT_OPERATION:
- doReplaceEvent(exchange);
+ case KubernetesOperations.UPDATE_EVENT_OPERATION:
+ doUpdateEvent(exchange);
break;
case KubernetesOperations.DELETE_EVENT_OPERATION:
@@ -135,8 +135,8 @@ public class KubernetesEventsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, event);
}
- protected void doReplaceEvent(Exchange exchange) {
- doCreateOrUpdateEvent(exchange, "Replace", Resource::replace);
+ protected void doUpdateEvent(Exchange exchange) {
+ doCreateOrUpdateEvent(exchange, "Update", Resource::update);
}
protected void doCreateEvent(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
index 3b7dfbe69ff..10a9f707c89 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAProducer.java
@@ -73,8 +73,8 @@ public class KubernetesHPAProducer extends DefaultProducer {
doCreateHPA(exchange);
break;
- case KubernetesOperations.REPLACE_HPA_OPERATION:
- doReplaceHPA(exchange);
+ case KubernetesOperations.UPDATE_HPA_OPERATION:
+ doUpdateHPA(exchange);
break;
case KubernetesOperations.DELETE_HPA_OPERATION:
@@ -129,8 +129,8 @@ public class KubernetesHPAProducer extends DefaultProducer {
prepareOutboundMessage(exchange, hpa);
}
- protected void doReplaceHPA(Exchange exchange) {
- doCreateOrUpdateHPA(exchange, "Replace", Resource::replace);
+ protected void doUpdateHPA(Exchange exchange) {
+ doCreateOrUpdateHPA(exchange, "Update", Resource::update);
}
protected void doCreateHPA(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
index 611e3dc2567..4c2f6b37443 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobProducer.java
@@ -79,8 +79,8 @@ public class KubernetesJobProducer extends DefaultProducer {
doCreateJob(exchange);
break;
- case KubernetesOperations.REPLACE_JOB_OPERATION:
- doReplaceJob(exchange);
+ case KubernetesOperations.UPDATE_JOB_OPERATION:
+ doUpdateJob(exchange);
break;
case KubernetesOperations.DELETE_JOB_OPERATION:
@@ -128,8 +128,8 @@ public class KubernetesJobProducer extends DefaultProducer {
prepareOutboundMessage(exchange, job);
}
- protected void doReplaceJob(Exchange exchange) {
- doCreateOrUpdateJob(exchange, "Replace", Resource::replace);
+ protected void doUpdateJob(Exchange exchange) {
+ doCreateOrUpdateJob(exchange, "Update", Resource::update);
}
protected void doCreateJob(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
index 71c8ee2c270..b04eb669fd8 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesProducer.java
@@ -72,8 +72,8 @@ public class KubernetesNamespacesProducer extends
DefaultProducer {
doCreateNamespace(exchange);
break;
- case KubernetesOperations.REPLACE_NAMESPACE_OPERATION:
- doReplaceNamespace(exchange);
+ case KubernetesOperations.UPDATE_NAMESPACE_OPERATION:
+ doUpdateNamespace(exchange);
break;
case KubernetesOperations.DELETE_NAMESPACE_OPERATION:
@@ -114,8 +114,8 @@ public class KubernetesNamespacesProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, namespace);
}
- protected void doReplaceNamespace(Exchange exchange) {
- doCreateOrUpdateNamespace(exchange, "Replace", Resource::replace);
+ protected void doUpdateNamespace(Exchange exchange) {
+ doCreateOrUpdateNamespace(exchange, "Update", Resource::update);
}
protected void doCreateNamespace(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
index edf44ad6309..c54403d498c 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
@@ -73,8 +73,8 @@ public class KubernetesNodesProducer extends DefaultProducer {
doCreateNode(exchange);
break;
- case KubernetesOperations.REPLACE_NODE_OPERATION:
- doReplaceNode(exchange);
+ case KubernetesOperations.UPDATE_NODE_OPERATION:
+ doUpdateNode(exchange);
break;
case KubernetesOperations.DELETE_NODE_OPERATION:
@@ -113,8 +113,8 @@ public class KubernetesNodesProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, node);
}
- protected void doReplaceNode(Exchange exchange) {
- doCreateOrUpdateNode(exchange, "Replace", Resource::replace);
+ protected void doUpdateNode(Exchange exchange) {
+ doCreateOrUpdateNode(exchange, "Update", Resource::update);
}
protected void doCreateNode(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
index 52ee4f6ecd8..50a23a23b9a 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
@@ -73,8 +73,8 @@ public class KubernetesPersistentVolumesClaimsProducer
extends DefaultProducer {
doCreatePersistentVolumeClaim(exchange);
break;
- case
KubernetesOperations.REPLACE_PERSISTENT_VOLUME_CLAIM_OPERATION:
- doReplacePersistentVolumeClaim(exchange);
+ case KubernetesOperations.UPDATE_PERSISTENT_VOLUME_CLAIM_OPERATION:
+ doUpdatePersistentVolumeClaim(exchange);
break;
case KubernetesOperations.DELETE_PERSISTENT_VOLUME_CLAIM_OPERATION:
@@ -134,8 +134,8 @@ public class KubernetesPersistentVolumesClaimsProducer
extends DefaultProducer {
prepareOutboundMessage(exchange, pvc);
}
- protected void doReplacePersistentVolumeClaim(Exchange exchange) {
- doCreateOrUpdatePersistentVolumeClaim(exchange, "Replace",
Resource::replace);
+ protected void doUpdatePersistentVolumeClaim(Exchange exchange) {
+ doCreateOrUpdatePersistentVolumeClaim(exchange, "Update",
Resource::update);
}
protected void doCreatePersistentVolumeClaim(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
index f8cc95ae2a7..c6fef5f3b3a 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsProducer.java
@@ -73,8 +73,8 @@ public class KubernetesPodsProducer extends DefaultProducer {
doCreatePod(exchange);
break;
- case KubernetesOperations.REPLACE_POD_OPERATION:
- doReplacePod(exchange);
+ case KubernetesOperations.UPDATE_POD_OPERATION:
+ doUpdatePod(exchange);
break;
case KubernetesOperations.DELETE_POD_OPERATION:
@@ -129,8 +129,8 @@ public class KubernetesPodsProducer extends DefaultProducer
{
prepareOutboundMessage(exchange, pod);
}
- protected void doReplacePod(Exchange exchange) {
- doCreateOrUpdatePod(exchange, "Replace", Resource::replace);
+ protected void doUpdatePod(Exchange exchange) {
+ doCreateOrUpdatePod(exchange, "Update", Resource::update);
}
protected void doCreatePod(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
index f6f839f8522..063a8fde2a5 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersProducer.java
@@ -75,8 +75,8 @@ public class KubernetesReplicationControllersProducer extends
DefaultProducer {
doCreateReplicationController(exchange);
break;
- case KubernetesOperations.REPLACE_REPLICATION_CONTROLLER_OPERATION:
- doReplaceReplicationController(exchange);
+ case KubernetesOperations.UPDATE_REPLICATION_CONTROLLER_OPERATION:
+ doUpdateReplicationController(exchange);
break;
case KubernetesOperations.DELETE_REPLICATION_CONTROLLER_OPERATION:
@@ -146,8 +146,8 @@ public class KubernetesReplicationControllersProducer
extends DefaultProducer {
prepareOutboundMessage(exchange, rc);
}
- protected void doReplaceReplicationController(Exchange exchange) {
- doCreateOrUpdateReplicationController(exchange, "Replace",
Resource::replace);
+ protected void doUpdateReplicationController(Exchange exchange) {
+ doCreateOrUpdateReplicationController(exchange, "Update",
Resource::update);
}
protected void doCreateReplicationController(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
index 2318340552f..562d23391fb 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaProducer.java
@@ -75,8 +75,8 @@ public class KubernetesResourcesQuotaProducer extends
DefaultProducer {
doCreateResourceQuota(exchange);
break;
- case KubernetesOperations.REPLACE_RESOURCE_QUOTA_OPERATION:
- doReplaceResourceQuota(exchange);
+ case KubernetesOperations.UPDATE_RESOURCE_QUOTA_OPERATION:
+ doUpdateResourceQuota(exchange);
break;
case KubernetesOperations.DELETE_RESOURCE_QUOTA_OPERATION:
@@ -135,8 +135,8 @@ public class KubernetesResourcesQuotaProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, rq);
}
- protected void doReplaceResourceQuota(Exchange exchange) {
- doCreateOrUpdateResourceQuota(exchange, "Replace", Resource::replace);
+ protected void doUpdateResourceQuota(Exchange exchange) {
+ doCreateOrUpdateResourceQuota(exchange, "Update", Resource::update);
}
protected void doCreateResourceQuota(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
index 003ec056451..f811d4dd174 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsProducer.java
@@ -71,8 +71,8 @@ public class KubernetesSecretsProducer extends
DefaultProducer {
doCreateSecret(exchange);
break;
- case KubernetesOperations.REPLACE_SECRET_OPERATION:
- doReplaceSecret(exchange);
+ case KubernetesOperations.UPDATE_SECRET_OPERATION:
+ doUpdateSecret(exchange);
break;
case KubernetesOperations.DELETE_SECRET_OPERATION:
@@ -127,8 +127,8 @@ public class KubernetesSecretsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, secret);
}
- protected void doReplaceSecret(Exchange exchange) {
- doCreateOrUpdateSecret(exchange, "Replace", Resource::replace);
+ protected void doUpdateSecret(Exchange exchange) {
+ doCreateOrUpdateSecret(exchange, "Update", Resource::update);
}
protected void doCreateSecret(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
index 1fffa9d0627..d15cfd85809 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsProducer.java
@@ -71,8 +71,8 @@ public class KubernetesServiceAccountsProducer extends
DefaultProducer {
doCreateServiceAccount(exchange);
break;
- case KubernetesOperations.REPLACE_SERVICE_ACCOUNT_OPERATION:
- doReplaceServiceAccount(exchange);
+ case KubernetesOperations.UPDATE_SERVICE_ACCOUNT_OPERATION:
+ doUpdateServiceAccount(exchange);
break;
case KubernetesOperations.DELETE_SERVICE_ACCOUNT_OPERATION:
@@ -130,8 +130,8 @@ public class KubernetesServiceAccountsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, sa);
}
- protected void doReplaceServiceAccount(Exchange exchange) {
- doCreateOrUpdateServiceAccount(exchange, "Replace", Resource::replace);
+ protected void doUpdateServiceAccount(Exchange exchange) {
+ doCreateOrUpdateServiceAccount(exchange, "Update", Resource::update);
}
protected void doCreateServiceAccount(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
index 2383e5c9014..01b52fd3f17 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java
@@ -73,8 +73,8 @@ public class KubernetesServicesProducer extends
DefaultProducer {
doCreateService(exchange);
break;
- case KubernetesOperations.REPLACE_SERVICE_OPERATION:
- doReplaceService(exchange);
+ case KubernetesOperations.UPDATE_SERVICE_OPERATION:
+ doUpdateService(exchange);
break;
case KubernetesOperations.DELETE_SERVICE_OPERATION:
@@ -136,8 +136,8 @@ public class KubernetesServicesProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, service);
}
- protected void doReplaceService(Exchange exchange) {
- doCreateOrUpdateService(exchange, "Replace", Resource::replace);
+ protected void doUpdateService(Exchange exchange) {
+ doCreateOrUpdateService(exchange, "Update", Resource::update);
}
protected void doCreateService(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
index d49b245002f..078de1a81e7 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsProducer.java
@@ -78,8 +78,8 @@ public class OpenshiftDeploymentConfigsProducer extends
DefaultProducer {
doCreateDeployment(exchange);
break;
- case KubernetesOperations.REPLACE_DEPLOYMENT_CONFIG:
- doReplaceDeployment(exchange);
+ case KubernetesOperations.UPDATE_DEPLOYMENT_CONFIG:
+ doUpdateDeployment(exchange);
break;
case KubernetesOperations.SCALE_DEPLOYMENT_CONFIG:
@@ -139,8 +139,8 @@ public class OpenshiftDeploymentConfigsProducer extends
DefaultProducer {
prepareOutboundMessage(exchange, deploymentConfigDeleted);
}
- protected void doReplaceDeployment(Exchange exchange) {
- doCreateOrUpdateDeployment(exchange, "Replace", Resource::replace);
+ protected void doUpdateDeployment(Exchange exchange) {
+ doCreateOrUpdateDeployment(exchange, "Update", Resource::update);
}
protected void doCreateDeployment(Exchange exchange) {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
index 8b0bfda463e..fba62ef9b2f 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
@@ -30,6 +30,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.RequestConfig;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.utils.ResponseProvider;
import okhttp3.Headers;
@@ -74,6 +76,16 @@ public class LockTestServer<T extends HasMetadata> extends
KubernetesMockServer
}
+ @Override
+ protected Config getMockConfiguration() {
+ // Avoid exponential retry backoff from slowing down tests
+ Config mockConfiguration = super.getMockConfiguration();
+ RequestConfig requestConfig = mockConfiguration.getRequestConfig();
+ requestConfig.setRequestRetryBackoffInterval(1000);
+ requestConfig.setRequestRetryBackoffLimit(0);
+ return mockConfiguration;
+ }
+
public void addSimulator(ResourceLockSimulator<?> paramLockSimulator) {
ResourceLockSimulator<T> lockSimulator = (ResourceLockSimulator<T>)
paramLockSimulator;
if (this.simulators.containsKey(lockSimulator.getResourceName())) {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
index c16c2d99301..e65c1c5461a 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesConfigMapsConsumerIT.java
@@ -108,11 +108,11 @@ public class KubernetesConfigMapsConsumerIT extends
KubernetesTestSupport {
@Test
@Order(3)
- void replaceConfigMap() {
+ void updateConfigMap() {
configureMock();
Map<String, String> configMapData = Map.of("test1", "test1");
- Exchange ex = template.request("direct:replaceConfigmap", exchange -> {
+ Exchange ex = template.request("direct:updateConfigmap", exchange -> {
exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"default");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"test1");
@@ -156,8 +156,8 @@ public class KubernetesConfigMapsConsumerIT extends
KubernetesTestSupport {
from("direct:createConfigmap")
.toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap",
host,
authToken);
- from("direct:replaceConfigmap")
-
.toF("kubernetes-config-maps://%s?oauthToken=%s&operation=replaceConfigMap",
host,
+ from("direct:updateConfigmap")
+
.toF("kubernetes-config-maps://%s?oauthToken=%s&operation=updateConfigMap",
host,
authToken);
from("direct:deleteConfigmap")
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
index 214df659a4b..03304892806 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesCustomResourcesConsumerIT.java
@@ -102,7 +102,7 @@ public class KubernetesCustomResourcesConsumerIT extends
KubernetesTestSupport {
.endSpec()
.build();
- CLIENT.resource(crd).createOrReplace();
+ CLIENT.resource(crd).serverSideApply();
}
@AfterAll
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesEventsConsumerIT.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesEventsConsumerIT.java
index 1b710dd159e..0229da27e67 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesEventsConsumerIT.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesEventsConsumerIT.java
@@ -116,7 +116,7 @@ public class KubernetesEventsConsumerIT extends
KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_REASON, "Some
Reason");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_REPORTING_CONTROLLER,
"Some-Reporting-Controller");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_REPORTING_INSTANCE,
"Some-Reporting-Instance");
-
+ exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_TIME,
"2022-10-10T17:30:47.986439Z");
}
@Test
@@ -140,6 +140,7 @@ public class KubernetesEventsConsumerIT extends
KubernetesTestSupport {
assertEquals("Some Reason", evt.getReason());
assertEquals("Some-Reporting-Controller",
evt.getReportingController());
assertEquals("Some-Reporting-Instance", evt.getReportingInstance());
+ assertEquals(new
MicroTimeBuilder().withTime("2022-10-10T17:30:47.986439Z").build(),
evt.getEventTime());
mockResultEndpoint.assertIsSatisfied();
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index d18e510328b..fed8b6fab74 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -132,7 +132,7 @@ public class KubernetesConfigMapsProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceConfigMap() {
+ void updateConfigMap() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
Map<String, String> data = Map.of("my.data.key", "my.data.value");
ConfigMap cm1 = new
ConfigMapBuilder().withNewMetadata().withName("cm1").withNamespace("test").withLabels(labels).and()
@@ -143,7 +143,7 @@ public class KubernetesConfigMapsProducerTest extends
KubernetesTestSupport {
.once();
server.expect().put().withPath("/api/v1/namespaces/test/configmaps/cm1").andReturn(200,
cm1).once();
- Exchange ex = template.request("direct:replaceConfigMap", exchange -> {
+ Exchange ex = template.request("direct:updateConfigMap", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"cm1");
@@ -185,8 +185,8 @@ public class KubernetesConfigMapsProducerTest extends
KubernetesTestSupport {
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=getConfigMap");
from("direct:createConfigMap")
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=createConfigMap");
- from("direct:replaceConfigMap")
-
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=replaceConfigMap");
+ from("direct:updateConfigMap")
+
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=updateConfigMap");
from("direct:deleteConfigMap")
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=deleteConfigMap");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
index 22d54a9ddd4..dd402aa2e2b 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
@@ -101,13 +101,13 @@ public class KubernetesCustomResourcesProducerTest
extends KubernetesTestSupport
@Test
@Order(0)
- void replaceTest() {
+ void updateTest() {
server.expect().get().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources/samplecr")
.andReturn(200, githubSourceString).once();
server.expect().put().withPath("/apis/sources.knative.dev/v1alpha1/namespaces/testnamespace/githubsources/samplecr")
.andReturn(200, githubSourceString).once();
- Exchange ex = template.request("direct:replaceCustomResource",
exchange -> {
+ Exchange ex = template.request("direct:updateCustomResource", exchange
-> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_INSTANCE_NAME,
"samplecr");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"testnamespace");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CRD_NAME,
"githubsources.sources.knative.dev");
@@ -230,8 +230,8 @@ public class KubernetesCustomResourcesProducerTest extends
KubernetesTestSupport
"kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=deleteCustomResource");
from("direct:createCustomResource").toF(
"kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=createCustomResource");
- from("direct:replaceCustomResource").toF(
-
"kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=replaceCustomResource");
+ from("direct:updateCustomResource").toF(
+
"kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=updateCustomResource");
}
};
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index 32354ca1462..a9e007bc32b 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -103,7 +103,7 @@ public class KubernetesDeploymentsProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceDeployment() {
+ void updateDeployment() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
DeploymentSpec spec = new
DeploymentSpecBuilder().withReplicas(13).build();
Deployment de1
@@ -115,7 +115,7 @@ public class KubernetesDeploymentsProducerTest extends
KubernetesTestSupport {
.once();
server.expect().put().withPath("/apis/apps/v1/namespaces/test/deployments/de1").andReturn(200,
de1).once();
- Exchange ex = template.request("direct:replaceDeployment", exchange ->
{
+ Exchange ex = template.request("direct:updateDeployment", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME,
"de1");
@@ -190,8 +190,8 @@ public class KubernetesDeploymentsProducerTest extends
KubernetesTestSupport {
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=deleteDeployment");
from("direct:createDeployment")
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=createDeployment");
- from("direct:replaceDeployment")
-
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=replaceDeployment");
+ from("direct:updateDeployment")
+
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=updateDeployment");
from("direct:scaleDeployment")
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=scaleDeployment");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEventsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEventsProducerTest.java
index 047462d2ef6..01e0cfaef29 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEventsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesEventsProducerTest.java
@@ -121,7 +121,7 @@ public class KubernetesEventsProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceEvent() {
+ void updateEvent() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
String reason = "SomeReason";
Event event1 = new
EventBuilder().withNewMetadata().withName("event1").withNamespace("test").withLabels(labels).and()
@@ -132,7 +132,7 @@ public class KubernetesEventsProducerTest extends
KubernetesTestSupport {
.once();
server.expect().put().withPath("/apis/events.k8s.io/v1/namespaces/test/events/event1").andReturn(200,
event1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENTS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_EVENT_NAME, "event1");
@@ -172,7 +172,7 @@ public class KubernetesEventsProducerTest extends
KubernetesTestSupport {
.to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=listEventsByLabels");
from("direct:get").to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=getEvent");
from("direct:create").to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=createEvent");
-
from("direct:replace").to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=replaceEvent");
+
from("direct:update").to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=updateEvent");
from("direct:delete").to("kubernetes-events:///?kubernetesClient=#kubernetesClient&operation=deleteEvent");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 01a4c3d5155..4a924ff414f 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -127,7 +127,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceHPATest() {
+ void updateHPATest() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
HorizontalPodAutoscalerSpec spec = new
HorizontalPodAutoscalerSpecBuilder().withMinReplicas(13).build();
HorizontalPodAutoscaler hpa1 = new
HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1")
@@ -141,7 +141,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
.andReturn(200, hpa1)
.once();
- Exchange ex = template.request("direct:replaceHPA", exchange -> {
+ Exchange ex = template.request("direct:updateHPA", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_LABELS, labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_HPA_NAME, "hpa1");
@@ -183,7 +183,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
.to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=listHPAByLabels");
from("direct:getHPA").to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=getHPA");
from("direct:createHPA").to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=createHPA");
-
from("direct:replaceHPA").to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=replaceHPA");
+
from("direct:updateHPA").to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=updateHPA");
from("direct:deleteHPA").to("kubernetes-hpa:///?kubernetesClient=#kubernetesClient&operation=deleteHPA");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
index 52696df1e0b..a04762e25a7 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
@@ -118,7 +118,7 @@ public class KubernetesJobProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceJobTest() {
+ void updateJobTest() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
JobSpec spec = new
JobSpecBuilder().withBackoffLimit(13).withSelector(new LabelSelector())
.withTemplate(new PodTemplateSpecBuilder().build()).build();
@@ -132,7 +132,7 @@ public class KubernetesJobProducerTest extends
KubernetesTestSupport {
.times(2);
server.expect().put().withPath("/apis/batch/v1/namespaces/test/jobs/j1").andReturn(200,
j1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_JOB_LABELS, labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_JOB_NAME, "j1");
@@ -172,7 +172,7 @@ public class KubernetesJobProducerTest extends
KubernetesTestSupport {
from("direct:listByLabels").to("kubernetes-job:foo?operation=listJobByLabels");
from("direct:get").to("kubernetes-job:foo?operation=getJob");
from("direct:create").to("kubernetes-job:foo?operation=createJob");
-
from("direct:replace").to("kubernetes-job:foo?operation=replaceJob");
+
from("direct:update").to("kubernetes-job:foo?operation=updateJob");
from("direct:delete").to("kubernetes-job:foo?operation=deleteJob");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
index 2b99a42a27d..846465bc7a8 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java
@@ -90,14 +90,14 @@ public class KubernetesNamespacesProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceNamespace() {
+ void updateNamespace() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
Namespace ns1 = new
NamespaceBuilder().withNewMetadata().withName("ns1").withLabels(labels).endMetadata().build();
server.expect().get().withPath("/api/v1/namespaces/ns1")
.andReturn(200, new
NamespaceBuilder().withNewMetadata().withName("ns1").endMetadata().build()).once();
server.expect().put().withPath("/api/v1/namespaces/ns1").andReturn(200,
ns1).once();
- Exchange ex = template.request("direct:replaceNamespace", exchange -> {
+ Exchange ex = template.request("direct:updateNamespace", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"ns1");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_LABELS,
labels);
});
@@ -130,8 +130,8 @@ public class KubernetesNamespacesProducerTest extends
KubernetesTestSupport {
from("direct:getNs").to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=getNamespace");
from("direct:createNamespace")
.to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=createNamespace");
- from("direct:replaceNamespace")
-
.to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=replaceNamespace");
+ from("direct:updateNamespace")
+
.to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=updateNamespace");
from("direct:deleteNamespace")
.to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=deleteNamespace");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
index 576fd3b1181..5d4199ed9d1 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
@@ -96,13 +96,13 @@ public class KubernetesNodesProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceNodeTest() {
+ void updateNodeTest() {
ObjectMeta meta = new ObjectMeta();
meta.setName("test");
server.expect().get().withPath("/api/v1/nodes/test").andReturn(200,
new NodeBuilder().build()).once();
server.expect().put().withPath("/api/v1/nodes/test").andReturn(200,
new NodeBuilder().withMetadata(meta).build())
.once();
- Exchange ex = template.request("direct:replaceNode", exchange -> {
+ Exchange ex = template.request("direct:updateNode", exchange -> {
Map<String, String> labels = new HashMap<>();
labels.put("key1", "value1");
labels.put("key2", "value2");
@@ -139,7 +139,7 @@ public class KubernetesNodesProducerTest extends
KubernetesTestSupport {
from("direct:listByLabels")
.toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=listNodesByLabels");
from("direct:createNode").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=createNode");
-
from("direct:replaceNode").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=replaceNode");
+
from("direct:updateNode").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=updateNode");
from("direct:deleteNode").toF("kubernetes-nodes:///?kubernetesClient=#kubernetesClient&operation=deleteNode");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index ab2314c5d24..ab59f95b3fc 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -107,7 +107,7 @@ public class KubernetesPersistentVolumesClaimsProducerTest
extends KubernetesTes
}
@Test
- void replacePersistentVolumeClaim() {
+ void updatePersistentVolumeClaim() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
PersistentVolumeClaimSpec spec = new
PersistentVolumeClaimSpecBuilder().withVolumeName("SomeVolumeName").build();
PersistentVolumeClaim vc1 = new
PersistentVolumeClaimBuilder().withNewMetadata().withName("vc1").withNamespace("test")
@@ -119,7 +119,7 @@ public class KubernetesPersistentVolumesClaimsProducerTest
extends KubernetesTes
.once();
server.expect().put().withPath("/api/v1/namespaces/test/persistentvolumeclaims/vc1").andReturn(200,
vc1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME,
"vc1");
@@ -161,8 +161,8 @@ public class KubernetesPersistentVolumesClaimsProducerTest
extends KubernetesTes
"kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=listPersistentVolumesClaimsByLabels");
from("direct:create").to(
"kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=createPersistentVolumeClaim");
- from("direct:replace").to(
-
"kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=replacePersistentVolumeClaim");
+ from("direct:update").to(
+
"kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=updatePersistentVolumeClaim");
from("direct:delete").to(
"kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=deletePersistentVolumeClaim");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index bfb957f3e8b..b0c22cf3d66 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -123,7 +123,7 @@ public class KubernetesPodsProducerTest extends
KubernetesTestSupport {
}
@Test
- void replacePod() {
+ void updatePod() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
PodSpec spec = new
PodSpecBuilder().withHostname("SomeHostname").build();
Pod pod1 = new
PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").withLabels(labels).and()
@@ -133,7 +133,7 @@ public class KubernetesPodsProducerTest extends
KubernetesTestSupport {
.once();
server.expect().put().withPath("/api/v1/namespaces/test/pods/pod1").andReturn(200,
pod1).once();
- Exchange ex = template.request("direct:replacePod", exchange -> {
+ Exchange ex = template.request("direct:updatePod", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_POD_NAME, "pod1");
@@ -173,7 +173,7 @@ public class KubernetesPodsProducerTest extends
KubernetesTestSupport {
.to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=listPodsByLabels");
from("direct:getPod").to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=getPod");
from("direct:createPod").to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=createPod");
-
from("direct:replacePod").to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=replacePod");
+
from("direct:updatePod").to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=updatePod");
from("direct:deletePod").to("kubernetes-pods:///?kubernetesClient=#kubernetesClient&operation=deletePod");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index c3538678b59..946ce2dc755 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -123,7 +123,7 @@ public class KubernetesReplicationControllersProducerTest
extends KubernetesTest
}
@Test
- void replaceReplicationController() {
+ void updateReplicationController() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
ReplicationControllerSpec spec = new
ReplicationControllerSpecBuilder().withReplicas(13).build();
ReplicationController rc1 = new
ReplicationControllerBuilder().withNewMetadata().withName("rc1").withNamespace("test")
@@ -135,7 +135,7 @@ public class KubernetesReplicationControllersProducerTest
extends KubernetesTest
.once();
server.expect().put().withPath("/api/v1/namespaces/test/replicationcontrollers/rc1").andReturn(200,
rc1).once();
- Exchange ex = template.request("direct:replaceReplicationController",
exchange -> {
+ Exchange ex = template.request("direct:updateReplicationController",
exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLERS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_REPLICATION_CONTROLLER_NAME,
"rc1");
@@ -212,8 +212,8 @@ public class KubernetesReplicationControllersProducerTest
extends KubernetesTest
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=scaleReplicationController");
from("direct:createReplicationController").to(
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=createReplicationController");
- from("direct:replaceReplicationController").to(
-
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=replaceReplicationController");
+ from("direct:updateReplicationController").to(
+
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=updateReplicationController");
from("direct:deleteReplicationController").to(
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=deleteReplicationController");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
index 9834c295c9f..f9f1ba9f7e5 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java
@@ -84,7 +84,7 @@ public class KubernetesResourcesQuotaProducerTest extends
KubernetesTestSupport
}
@Test
- void replaceResourceQuota() {
+ void updateResourceQuota() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
ResourceQuotaSpec spec = new
ResourceQuotaSpecBuilder().withScopes("SomeScope").build();
ResourceQuota rq1
@@ -95,7 +95,7 @@ public class KubernetesResourcesQuotaProducerTest extends
KubernetesTestSupport
.once();
server.expect().put().withPath("/api/v1/namespaces/test/resourcequotas/rq1").andReturn(200,
rq1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_RESOURCES_QUOTA_NAME,
"rq1");
@@ -134,8 +134,8 @@ public class KubernetesResourcesQuotaProducerTest extends
KubernetesTestSupport
.to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=listResourcesQuota");
from("direct:create")
.to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=createResourceQuota");
- from("direct:replace")
-
.to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=replaceResourceQuota");
+ from("direct:update")
+
.to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=updateResourceQuota");
from("direct:delete")
.to("kubernetes-resources-quota:///?kubernetesClient=#kubernetesClient&operation=deleteResourceQuota");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
index f2257bfae5c..d175f855054 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
@@ -108,12 +108,12 @@ public class KubernetesSecretsProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceSecret() {
+ void updateSecret() {
Secret sc1 = new
SecretBuilder().withNewMetadata().withName("sc1").withNamespace("test").and().build();
server.expect().get().withPath("/api/v1/namespaces/test/secrets/sc1").andReturn(200,
sc1).once();
server.expect().put().withPath("/api/v1/namespaces/test/secrets/sc1").andReturn(200,
sc1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SECRET,
sc1);
});
@@ -149,7 +149,7 @@ public class KubernetesSecretsProducerTest extends
KubernetesTestSupport {
.to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=listSecretsByLabels");
from("direct:get").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=getSecret");
from("direct:create").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=createSecret");
-
from("direct:replace").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=replaceSecret");
+
from("direct:update").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=updateSecret");
from("direct:delete").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=deleteSecret");
}
};
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
index 96e3880677a..6cb72696199 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
@@ -94,12 +94,12 @@ public class KubernetesServiceAccountsProducerTest extends
KubernetesTestSupport
}
@Test
- void replaceServiceAccount() {
+ void updateServiceAccount() {
ServiceAccount sa1 = new
ServiceAccountBuilder().withNewMetadata().withName("sa1").withNamespace("test").and().build();
server.expect().get().withPath("/api/v1/namespaces/test/serviceaccounts/sa1").andReturn(200,
sa1).once();
server.expect().put().withPath("/api/v1/namespaces/test/serviceaccounts/sa1").andReturn(200,
sa1).once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_ACCOUNT, sa1);
});
@@ -136,8 +136,8 @@ public class KubernetesServiceAccountsProducerTest extends
KubernetesTestSupport
"kubernetes-service-accounts:///?kubernetesClient=#kubernetesClient&operation=listServiceAccountsByLabels");
from("direct:create").to(
"kubernetes-service-accounts:///?kubernetesClient=#kubernetesClient&operation=createServiceAccount");
- from("direct:replace").to(
-
"kubernetes-service-accounts:///?kubernetesClient=#kubernetesClient&operation=replaceServiceAccount");
+ from("direct:update").to(
+
"kubernetes-service-accounts:///?kubernetesClient=#kubernetesClient&operation=updateServiceAccount");
from("direct:delete").to(
"kubernetes-service-accounts:///?kubernetesClient=#kubernetesClient&operation=deleteServiceAccount");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
index e6753286747..111f5d3ec23 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
@@ -116,7 +116,7 @@ public class KubernetesServicesProducerTest extends
KubernetesTestSupport {
}
@Test
- void replaceService() {
+ void updateService() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
ServiceSpec spec = new
ServiceSpecBuilder().withExternalName("SomeExternalName").build();
Service se1 = new
ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").withLabels(labels).and()
@@ -127,7 +127,7 @@ public class KubernetesServicesProducerTest extends
KubernetesTestSupport {
.times(2);
server.expect().put().withPath("/api/v1/namespaces/test/services/se1").andReturn(200,
se1).once();
- Exchange ex = template.request("direct:replaceService", exchange -> {
+ Exchange ex = template.request("direct:updateService", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, "se1");
@@ -170,8 +170,8 @@ public class KubernetesServicesProducerTest extends
KubernetesTestSupport {
.to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=getService");
from("direct:createService")
.to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=createService");
- from("direct:replaceService")
-
.to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=replaceService");
+ from("direct:updateService")
+
.to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=updateService");
from("direct:deleteService")
.to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=deleteService");
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
index 764fb073cab..055c38994e3 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
@@ -69,7 +69,7 @@ public class ConfigMapPropertiesFunctionRouteTest extends
KubernetesTestSupport
Map<String, String> data = Map.of("foo", "123", "bar", "Moes Bar");
ConfigMap cm = new
ConfigMapBuilder().editOrNewMetadata().withName("myconfig").endMetadata().withData(data).build();
- this.cm = client.resource(cm).createOrReplace();
+ this.cm = client.resource(cm).serverSideApply();
return context;
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
index dab7c355f08..9571e6926ca 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
@@ -51,7 +51,7 @@ public class ConfigMapPropertiesFunctionTest extends
KubernetesTestSupport {
Map<String, String> data = Map.of("foo", "123", "bar", "Moes Bar");
ConfigMap cm = new
ConfigMapBuilder().editOrNewMetadata().withName("myconfig").endMetadata().withData(data).build();
- client.resource(cm).createOrReplace();
+ client.resource(cm).serverSideApply();
try (ConfigMapPropertiesFunction cmf = new
ConfigMapPropertiesFunction()) {
cmf.setClient(client);
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
index d5c4c6872f6..b233216ef7f 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionRouteTest.java
@@ -73,7 +73,7 @@ public class SecretPropertiesFunctionRouteTest extends
KubernetesTestSupport {
= Map.of("myuser",
Base64.getEncoder().encodeToString("scott".getBytes(StandardCharsets.UTF_8)),
"mypass",
Base64.getEncoder().encodeToString("tiger".getBytes(StandardCharsets.UTF_8)));
Secret sec = new
SecretBuilder().editOrNewMetadata().withName("mysecret").endMetadata().withData(data).build();
- this.sec = client.resource(sec).createOrReplace();
+ this.sec = client.resource(sec).serverSideApply();
return context;
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
index 669690b0e70..4732526a0f3 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
@@ -55,7 +55,7 @@ public class SecretPropertiesFunctionTest extends
KubernetesTestSupport {
= Map.of("myuser",
Base64.getEncoder().encodeToString("scott".getBytes(StandardCharsets.UTF_8)),
"mypass",
Base64.getEncoder().encodeToString("tiger".getBytes(StandardCharsets.UTF_8)));
Secret sec = new
SecretBuilder().editOrNewMetadata().withName("mysecret").endMetadata().withData(data).build();
- client.resource(sec).createOrReplace();
+ client.resource(sec).serverSideApply();
try (SecretPropertiesFunction cmf = new SecretPropertiesFunction()) {
cmf.setClient(client);
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
index dc0ac67024b..a5d3e2a0b92 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
@@ -104,7 +104,7 @@ public class OpenshiftDeploymentConfigsProducerTest extends
KubernetesTestSuppor
}
@Test
- void replaceDeploymentConfig() {
+ void updateDeploymentConfig() {
Map<String, String> labels = Map.of("my.label.key", "my.label.value");
DeploymentConfigSpec spec = new
DeploymentConfigSpecBuilder().withReplicas(13).build();
DeploymentConfig de1
@@ -116,7 +116,7 @@ public class OpenshiftDeploymentConfigsProducerTest extends
KubernetesTestSuppor
server.expect().put().withPath("/apis/apps.openshift.io/v1/namespaces/test/deploymentconfigs/de1").andReturn(200,
de1)
.once();
- Exchange ex = template.request("direct:replace", exchange -> {
+ Exchange ex = template.request("direct:update", exchange -> {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"test");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENTS_LABELS,
labels);
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_DEPLOYMENT_NAME,
"de1");
@@ -191,8 +191,8 @@ public class OpenshiftDeploymentConfigsProducerTest extends
KubernetesTestSuppor
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=listDeploymentConfigsByLabels");
from("direct:create")
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=createDeploymentConfig");
- from("direct:replace")
-
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=replaceDeploymentConfig");
+ from("direct:update")
+
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=updateDeploymentConfig");
from("direct:delete")
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=deleteDeploymentConfig");
from("direct:scale")
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index 61b9d303e0b..6ef5847781f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -184,6 +184,13 @@ The API in `org.apache.camel.http.common.HttpBinding` has
changed slightly to be
The `parseBody` method now takes in `HttpServletRequest` as input parameter.
And all `HttpMessage`
has been changed to generic `Message` types.
+=== camel-kubernetes
+
+The `io.fabric8:kubernetes-client` library has been upgraded and some
deprecated API usage has been removed. Operations previously prefixed with
`replace` are now prefixed with `update`.
+
+For example `replaceConfigMap` is now `updateConfigMap`, `replacePod` is now
`updatePod` etc. The corresponding
+constants in class `KubernetesOperations` are also renamed.
`REPLACE_CONFIGMAP_OPERATION` is now `UPDATE_CONFIGMAP_OPERATION`,
`REPLACE_POD_OPERATION` is now `UPDATE_POD_OPERATION` etc.
+
=== camel-micrometer
The metrics has been renamed to follow Micrometer naming convention
https://micrometer.io/docs/concepts#_naming_meters[Naming Meters].
diff --git a/parent/pom.xml b/parent/pom.xml
index 492741ab1c0..6823c93bac9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -319,8 +319,8 @@
<kafka-version>3.4.0</kafka-version>
<kafka-debezium-version>3.3.1</kafka-debezium-version>
<kotlin-version>1.8.0</kotlin-version>
- <kubernetes-client-version>6.4.1</kubernetes-client-version>
- <kubernetes-model-version>6.4.1</kubernetes-model-version>
+ <kubernetes-client-version>6.5.1</kubernetes-client-version>
+ <kubernetes-model-version>6.5.1</kubernetes-model-version>
<kudu-version>1.16.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>
