- * If specified CRD is of Namespaced scope, this method would delete all Custom Resources in namespace which is
- * specified as parameter.
- * If specified CRD is of Cluster scope, this method would delete a Custom Resource matching the name which is
- * specified as parameter
- *
- *
- * @param namespaceOrName desired namespace(if CRD is Namespaced) or name(If CRD is Cluster)
- * @return deleted objects as HashMap
- * @deprecated Use {@link #inNamespace(String)}.{@link #delete()} or {@link #withName(String)}.{@link #delete()} instead.
- */
- @Deprecated
- public boolean delete(String namespaceOrName) {
- if (delegate.isResourceNamespaced()) {
- return delegate.inNamespace(namespaceOrName).delete();
- }
- return delegate.withName(namespaceOrName).delete();
- }
-
- /**
- * Delete all Namespaced Scoped Custom Resources in a specified namespace
- *
- * If specified CRD is of Namespaced scope, this method would delete all Custom Resources in namespace which is
- * specified as parameter.
- * If specified CRD is of Cluster scope, this method would delete a Custom Resource matching the name which is
- * specified as parameter
- *
- *
- * @param namespaceOrName desired namespace(If CRD is Namespaced) or name(If CRD is Cluster)
- * @param cascading whether dependent object need to be orphaned or not. If true/false, the "orphan"
- * finalizer will be added to/removed from the object's finalizers list.
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException in case of any network/parsing exception
- */
- public boolean delete(String namespaceOrName, boolean cascading) throws IOException {
- if (delegate.isResourceNamespaced()) {
- return delegate.inNamespace(namespaceOrName).delete();
- }
- return delegate.withName(namespaceOrName).cascading(cascading).delete();
- }
-
- /**
- * Delete all Namespaced Scoped Custom Resources in a specified namespace
- *
- * If specified CRD is of Namespaced scope, this method would delete all Custom Resources in namespace which is
- * specified as parameter.
- * If specified CRD is of Cluster scope, this method would delete a Custom Resource matching the name which is
- * specified as parameter
- *
- *
- * @param namespaceOrName desired namespace(If CRD is Namespaced) or name(If CRD is Cluster)
- * @param deleteOptions object provided by Kubernetes API for more fine grained control over deletion.
- * For more information please see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#deleteoptions-v1-meta
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException in case of any network/object parse problems
- */
- public boolean delete(String namespaceOrName, DeleteOptions deleteOptions) throws IOException {
- if (delegate.isResourceNamespaced()) {
- return withDeleteOptions(deleteOptions).inNamespace(namespaceOrName).delete();
- }
- return withDeleteOptions(deleteOptions).withName(namespaceOrName).delete();
- }
-
- /**
- * Delete a custom resource in a specific namespace
- *
- * @param namespace desired namespace
- * @param name custom resource's name
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException in case of any network/object parse problems
- * @deprecated Use {@link #inNamespace(String)}.{@link #withName(String)}.{@link #delete()} instead.
- */
- @Deprecated
- public boolean delete(String namespace, String name) throws IOException {
- return delegate.inNamespace(namespace).withName(name).delete();
- }
-
- /**
- * Delete a custom resource in a specific namespace
- *
- * @param namespace required namespace
- * @param name required name of custom resource
- * @param cascading whether dependent object need to be orphaned or not. If true/false, the "orphan"
- * finalizer will be added to/removed from the object's finalizers list.
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException exception related to network/object parsing
- */
- public boolean delete(String namespace, String name, boolean cascading) throws IOException {
- return delegate.inNamespace(namespace).withName(name).cascading(cascading).delete();
- }
-
- /**
- * Delete a custom resource in a specific namespace
- *
- * @param namespace required namespace
- * @param name required name of custom resource
- * @param propagationPolicy Whether and how garbage collection will be performed. Either this field or OrphanDependents
- * may be set, but not both. The default policy is decided by the existing finalizer set in
- * the metadata.finalizers and the resource-specific default policy.
- * Acceptable values are:
- * 'Orphan' - orphan the dependents;
- * 'Background' - allow the garbage collector to delete the dependents in the background;
- * 'Foreground' - a cascading policy that deletes all dependents in the foreground.
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException in case of network/object parse exception
- */
- public boolean delete(String namespace, String name, String propagationPolicy) throws IOException {
- return delegate.inNamespace(namespace).withName(name)
- .withPropagationPolicy(resolveDeletionPropagation(propagationPolicy)).delete();
- }
-
- /**
- * Delete a custom resource in a specific namespace
- *
- * @param namespace required namespace
- * @param name name of custom resource
- * @param deleteOptions object provided by Kubernetes API for more fine grained control over deletion.
- * For more information please see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#deleteoptions-v1-meta
- * @return a boolean value whether item was deleted or item didn't exist in server
- * @throws IOException in case of any network/object parse exception
- */
- public boolean delete(String namespace, String name, DeleteOptions deleteOptions) throws IOException {
- return withDeleteOptions(deleteOptions).inNamespace(namespace).withName(name).delete();
- }
-
- @Override
- public Boolean delete() {
- return delegate.delete();
- }
-
-
- /**
- * Watch custom resources across all namespaces. Here watcher is provided
- * for string type only. User has to deserialize object itself.
- *
- * @param watcher watcher object which reports events
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(Watcher watcher) throws IOException {
- return delegate.watch(new DelegateWatcher(watcher));
- }
-
- /**
- * Watch custom resources in the parameters specified.
- *
- * Most of the parameters except watcher are optional, they would be
- * skipped if passed null. Here watcher is provided for string type
- * only. User has to deserialize the object itself.
- *
- * @param namespace namespace to watch (optional
- * @param name name of custom resource (optional)
- * @param labels HashMap containing labels (optional)
- * @param options {@link ListOptions} list options for watch
- * @param watcher watcher object which reports events
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(String namespace, String name, Map labels, ListOptions options, Watcher watcher) throws IOException {
- GenericKubernetesResourceOperationsImpl ops = delegate;
- if (Utils.isNotNullOrEmpty(namespace)) {
- ops = (GenericKubernetesResourceOperationsImpl) ops.inNamespace(namespace);
- }
- if (Utils.isNotNullOrEmpty(name)) {
- ops = (GenericKubernetesResourceOperationsImpl) ops.withName(name);
- }
- return ops.watch(
- listOptionsBuilder(options).withLabelSelector(getLabelsQueryParam(labels)).build(),
- new DelegateWatcher(watcher));
- }
-
- /**
- * Watch custom resources in the parameters specified.
- *
- * Most of the parameters except watcher are optional, they would be
- * skipped if passed null. Here watcher is provided for string type
- * only. User has to deserialize the object itself.
- *
- * @param namespace namespace to watch (optional
- * @param name name of custom resource (optional)
- * @param labels HashMap containing labels (optional)
- * @param resourceVersion resource version to start watch from
- * @param watcher watcher object which reports events
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(String namespace, String name, Map labels, String resourceVersion, Watcher watcher) throws IOException {
- return watch(namespace, name, labels, new ListOptionsBuilder().withResourceVersion(resourceVersion).build(), watcher);
- }
-
- /**
- * Watch custom resources in a specific namespace. Here Watcher is provided
- * for string type only. User has to deserialize object itself.
- *
- * @param namespace namespace to watch
- * @param watcher watcher object which reports updates with object
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(String namespace, Watcher watcher) throws IOException {
- return watch(namespace, null, null, (ListOptions) null, watcher);
- }
-
- /**
- * Watch a custom resource in a specific namespace with some resourceVersion. Here
- * watcher is provided from string type only. User has to deserialize object itself.
- *
- * @param namespace namespace to watch
- * @param resourceVersion resource version since when to watch
- * @param watcher watcher object which reports updates
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(String namespace, String resourceVersion, Watcher watcher) throws IOException {
- return watch(namespace, null, null, resourceVersion, watcher);
- }
-
- /**
- * Watch a custom resource in a specific namespace with some resourceVersion. Here
- * watcher is provided from string type only. User has to deserialize object itself.
- *
- * @param namespace namespace to watch
- * @param options {@link ListOptions} list options for watching
- * @param watcher watcher object which reports updates
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(String namespace, ListOptions options, Watcher watcher) throws IOException {
- return watch(namespace, null, null, options, watcher);
- }
-
- /**
- * Watch custom resources in the parameters specified.
- *
- * Most of the parameters except watcher are optional, they would be
- * skipped if passed null. Here watcher is provided for string type
- * only. User has to deserialize the object itself.
- *
- * @param labels HashMap containing labels (optional)
- * @param options {@link ListOptions} list options for watch
- * @param watcher watcher object which reports events
- * @return watch object for watching resource
- * @throws IOException in case of network error
- */
- public Watch watch(Map labels, ListOptions options, Watcher watcher) throws IOException {
- return delegate.watch(
- listOptionsBuilder(options).withLabelSelector(getLabelsQueryParam(labels)).build(),
- new DelegateWatcher(watcher));
- }
-
- private String getLabelsQueryParam(Map labels) {
- if (labels == null) {
- return null;
- }
- StringBuilder labelQueryBuilder = new StringBuilder();
- for (Map.Entry entry : labels.entrySet()) {
- if (labelQueryBuilder.length() > 0) {
- labelQueryBuilder.append(",");
- }
- labelQueryBuilder.append(entry.getKey()).append("=").append(entry.getValue());
- }
- return labelQueryBuilder.toString();
- }
-
- private static DeletionPropagation resolveDeletionPropagation(String propagationPolicy) {
- return Stream.of(DeletionPropagation.values())
- .filter(dp -> dp.name().toUpperCase(Locale.ENGLISH).equals(propagationPolicy.toUpperCase(Locale.ENGLISH)))
- .findFirst()
- .orElse(DEFAULT_PROPAGATION_POLICY);
- }
-
- private long resolveGracePeriod(Long gracePeriodInSeconds) {
- return gracePeriodInSeconds != null ? gracePeriodInSeconds : delegate.getGracePeriodSeconds();
- }
-
- private DeletionPropagation resolvePropagationPolicy(String deletionPropagation) {
- return deletionPropagation != null ? resolveDeletionPropagation(deletionPropagation) : delegate.getPropagationPolicy();
- }
-
- private static ListOptionsBuilder listOptionsBuilder(ListOptions options) {
- return options == null ? new ListOptionsBuilder() : new ListOptionsBuilder(options);
- }
-
- private static Map toMap(GenericKubernetesResource gkr) {
- return Serialization.jsonMapper().convertValue(gkr, new TypeReference>() {
- });
- }
-
- private static Map toMap(GenericKubernetesResourceList gkrl) {
- return Serialization.jsonMapper().convertValue(gkrl, new TypeReference>() {
- });
- }
-
- private static final class DelegateWatcher implements Watcher {
-
- private final Watcher delegate;
-
- public DelegateWatcher(Watcher delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public boolean reconnecting() {
- return delegate.reconnecting();
- }
-
- @Override
- public void eventReceived(Action action, GenericKubernetesResource resource) {
- try {
- delegate.eventReceived(action, Serialization.jsonMapper().writeValueAsString(resource));
- } catch (JsonProcessingException e) {
- delegate.eventReceived(action, resource.toString());
- }
- }
-
- @Override
- public void onClose() {
- delegate.onClose();
- }
-
- @Override
- public void onClose(WatcherException cause) {
- delegate.onClose(cause);
- }
- }
-}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/package-info.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/package-info.java
deleted file mode 100644
index 0cb10840c48..00000000000
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/package-info.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Package leaderelection implements leader election of a set of endpoints.
- *
- * It uses an annotation in the endpoints object to store the record of the
- * election state. This implementation does not guarantee that only one
- * client is acting as a leader (a.k.a. fencing).
- *
- *
A client only acts on timestamps captured locally to infer the state of the
- * leader election. The client does not consider timestamps in the leader
- * election record to be accurate because these timestamps may not have been
- * produced by a local clock. The implementation does not depend on their
- * accuracy and only uses their change to indicate that another client has
- * renewed the leader lease. Thus the implementation is tolerant to arbitrary
- * clock skew, but is not tolerant to arbitrary clock skew rate.
- *
- *
However the level of tolerance to skew rate can be configured by setting
- * RenewDeadline and LeaseDuration appropriately. The tolerance expressed as a
- * maximum tolerated ratio of time passed on the fastest node to time passed on
- * the slowest node can be approximately achieved with a configuration that sets
- * the same ratio of LeaseDuration to RenewDeadline. For example if a user wanted
- * to tolerate some nodes progressing forward in time twice as fast as other nodes,
- * the user could set LeaseDuration to 60 seconds and RenewDeadline to 30 seconds.
- *
- *
While not required, some method of clock synchronization between nodes in the
- * cluster is highly recommended. It's important to keep in mind when configuring
- * this client that the tolerance to skew rate varies inversely to master
- * availability.
- *
- *
Larger clusters often have a more lenient SLA for API latency. This should be
- * taken into account when configuring the client. The rate of leader transitions
- * should be monitored and RetryPeriod and LeaseDuration should be increased
- * until the rate is stable and acceptably low. It's important to keep in mind
- * when configuring this client that the tolerance to API latency varies inversely
- * to master availability.
- *
- *
DISCLAIMER: This is a port of leaderelection package in client-go:
- * github.com/kubernetes/client-go
- *
- * @since 4.7.1
- */
-package io.fabric8.kubernetes.client.extended.leaderelection;
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperations.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperationsImpl.java
similarity index 82%
rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperations.java
rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperationsImpl.java
index 87987d3a004..1702e268a74 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperations.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/run/RunOperationsImpl.java
@@ -20,12 +20,12 @@
import io.fabric8.kubernetes.client.ClientContext;
import io.fabric8.kubernetes.client.dsl.internal.core.v1.PodOperationsImpl;
-public class RunOperations {
+public class RunOperationsImpl implements RunOperations {
private final ClientContext clientContext;
private final String namespace;
private final RunConfigBuilder runConfigBuilder;
- public RunOperations(ClientContext clientContext, String namespace, RunConfigBuilder runConfigBuilder) {
+ public RunOperationsImpl(ClientContext clientContext, String namespace, RunConfigBuilder runConfigBuilder) {
this.clientContext = clientContext;
this.namespace = namespace;
this.runConfigBuilder = runConfigBuilder;
@@ -37,8 +37,9 @@ public RunOperations(ClientContext clientContext, String namespace, RunConfigBui
* @param namespace namespace in which resource needs to be created
* @return {@link RunOperations} with injected namespace
*/
+ @Override
public RunOperations inNamespace(String namespace) {
- return new RunOperations(clientContext, namespace, runConfigBuilder);
+ return new RunOperationsImpl(clientContext, namespace, runConfigBuilder);
}
/**
@@ -47,8 +48,9 @@ public RunOperations inNamespace(String namespace) {
* @param image image as a string
* @return {@link RunOperations} with image injected into {@link RunConfig}
*/
+ @Override
public RunOperations withImage(String image) {
- return new RunOperations(clientContext, namespace, runConfigBuilder.withImage(image));
+ return new RunOperationsImpl(clientContext, namespace, runConfigBuilder.withImage(image));
}
/**
@@ -57,8 +59,9 @@ public RunOperations withImage(String image) {
* @param name name of the pod to be created
* @return {@link RunOperations} with name injected into {@link RunConfig}
*/
+ @Override
public RunOperations withName(String name) {
- return new RunOperations(clientContext, namespace, runConfigBuilder.withName(name));
+ return new RunOperationsImpl(clientContext, namespace, runConfigBuilder.withName(name));
}
/**
@@ -67,8 +70,9 @@ public RunOperations withName(String name) {
* @param generatorRunConfig {@link RunConfig} which allows to provide configuring environment variables, labels, resources, ports etc
* @return {@link RunOperations} with specified configuration
*/
+ @Override
public RunOperations withRunConfig(RunConfig generatorRunConfig) {
- return new RunOperations(clientContext, namespace, new RunConfigBuilder(generatorRunConfig));
+ return new RunOperationsImpl(clientContext, namespace, new RunConfigBuilder(generatorRunConfig));
}
/**
@@ -76,6 +80,7 @@ public RunOperations withRunConfig(RunConfig generatorRunConfig) {
*
* @return Pod which got created from the operation
*/
+ @Override
public Pod done() {
return new PodOperationsImpl(clientContext, namespace).create(convertRunConfigIntoPod());
}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java
similarity index 97%
rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java
rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java
index ca0e3b8f2cb..3010482f97a 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactoryImpl.java
@@ -47,8 +47,8 @@
* This has been taken from https://github.com/kubernetes-client/java/blob/master/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java
* which is ported from official go client https://github.com/kubernetes/client-go/blob/master/informers/factory.go
*/
-public class SharedInformerFactory {
- private static final Logger log = LoggerFactory.getLogger(SharedInformerFactory.class);
+public class SharedInformerFactoryImpl implements SharedInformerFactory {
+ private static final Logger log = LoggerFactory.getLogger(SharedInformerFactoryImpl.class);
private final List> informers = new ArrayList<>();
@@ -63,7 +63,7 @@ public class SharedInformerFactory {
private BaseKubernetesClient client;
- public SharedInformerFactory(BaseKubernetesClient client) {
+ public SharedInformerFactoryImpl(BaseKubernetesClient client) {
// ideally this should be bounded. The current implication is that there
// can be 1 thread used (not dedicated to) per informer - which
// could be problematic for a large number of informers. however
@@ -75,7 +75,7 @@ public SharedInformerFactory(BaseKubernetesClient client) {
* Constructor with thread pool specified.
* @param threadPool specified thread pool.
*/
- public SharedInformerFactory(BaseKubernetesClient client, ExecutorService threadPool) {
+ public SharedInformerFactoryImpl(BaseKubernetesClient client, ExecutorService threadPool) {
this.informerExecutor = threadPool;
this.client = client;
}
@@ -87,6 +87,7 @@ public SharedInformerFactory(BaseKubernetesClient client, ExecutorService thr
* @return {@link SharedInformerFactory} with namespace configured
* @deprecated use {@link Informable} instead
*/
+ @Override
@Deprecated
public SharedInformerFactory inNamespace(String namespace) {
this.namespace = namespace;
@@ -100,6 +101,7 @@ public SharedInformerFactory inNamespace(String namespace) {
* @return {@link SharedInformerFactory} with name configured
* @deprecated use {@link Informable} instead
*/
+ @Override
@Deprecated
public SharedInformerFactory withName(String name) {
this.name = name;
@@ -117,6 +119,7 @@ public SharedInformerFactory withName(String name) {
* @param the type parameter (should extend {@link io.fabric8.kubernetes.api.model.HasMetadata} and implement {@link io.fabric8.kubernetes.api.model.Namespaced}) if Namespace scoped resource
* @return the shared index informer
*/
+ @Override
public synchronized SharedIndexInformer sharedIndexInformerFor(Class apiTypeClass, long resyncPeriodInMillis) {
return sharedIndexInformerFor(apiTypeClass, null, null, resyncPeriodInMillis, ResourceDefinitionContext.fromResourceType(apiTypeClass));
}
@@ -152,6 +155,7 @@ public synchronized SharedIndexInformer sharedIndexIn
* @return the shared index informer
* @deprecated Since 5.x versions of client {@link CustomResourceDefinitionContext} are configured via annotations in CustomResource implementations, please use any of the alternative sharedIndexInformerForCustomResource methods
*/
+ @Override
@Deprecated
public synchronized , L extends KubernetesResourceList> SharedIndexInformer sharedIndexInformerForCustomResource(
CustomResourceDefinitionContext customResourceContext, Class apiTypeClass, Class apiListTypeClass, long resyncPeriodInMillis) {
@@ -170,6 +174,7 @@ public synchronized SharedIndexInformer sharedIndexIn
* @return {@link SharedIndexInformer} for GenericKubernetesResource
* @deprecated use {@link #sharedIndexInformerFor(Class, long)}
*/
+ @Override
@Deprecated
public synchronized SharedIndexInformer sharedIndexInformerForCustomResource(ResourceDefinitionContext genericResourceContext, long resyncPeriodInMillis) {
return sharedIndexInformerFor(GenericKubernetesResource.class, GenericKubernetesResourceList.class, null, resyncPeriodInMillis, genericResourceContext);
@@ -200,6 +205,7 @@ public synchronized > SharedIndexInformer share
* @return the shared index informer
* @deprecated use {@link #sharedIndexInformerFor(Class, long)} instead
*/
+ @Override
@Deprecated
public synchronized > SharedIndexInformer sharedIndexInformerForCustomResource(
Class apiTypeClass, long resyncPeriodInMillis) {
@@ -219,6 +225,7 @@ public synchronized > SharedIndexInformer share
* @return the shared index informer
* @deprecated use {@link #sharedIndexInformerFor(Class, Class, OperationContext, long, ResourceDefinitionContext)}
*/
+ @Override
@Deprecated
public synchronized , L extends KubernetesResourceList> SharedIndexInformer sharedIndexInformerForCustomResource(Class apiTypeClass, Class apiListTypeClass, long resyncPeriodInMillis) {
return sharedIndexInformerFor(apiTypeClass, apiListTypeClass, null, resyncPeriodInMillis, ResourceDefinitionContext.fromResourceType(apiTypeClass));
@@ -292,6 +299,7 @@ private > HasMetadata
* @param type of API type
* @return SharedIndexInformer object
*/
+ @Override
public synchronized SharedIndexInformer getExistingSharedIndexInformer(Class apiTypeClass) {
for (Map.Entry entry : this.informers) {
if (entry.getValue().getApiTypeClass().equals(apiTypeClass)) {
@@ -318,6 +326,7 @@ public List> getExistingSharedI
*
* @return {@link Future} for status of all started informer tasks.
*/
+ @Override
public synchronized Future startAllRegisteredInformers() {
List> startInformerTasks = new ArrayList<>();
@@ -332,6 +341,7 @@ public synchronized Future startAllRegisteredInformers() {
/**
* Stop all registered informers and shut down thread pool.
*/
+ @Override
public synchronized void stopAllRegisteredInformers() {
stopAllRegisteredInformers(true);
}
@@ -341,6 +351,7 @@ public synchronized void stopAllRegisteredInformers() {
*
* @param shutDownThreadPool Whether to shut down thread pool or not.
*/
+ @Override
public synchronized void stopAllRegisteredInformers(boolean shutDownThreadPool) {
informers.forEach(e -> e.getValue().stop());
if (shutDownThreadPool && allowShutdown) {
@@ -348,6 +359,7 @@ public synchronized void stopAllRegisteredInformers(boolean shutDownThreadPool)
}
}
+ @Override
public void addSharedInformerEventListener(SharedInformerEventListener event) {
this.eventListeners.add(event);
}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java
similarity index 98%
rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java
rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java
index d08dbd17097..dcc95e7c5c2 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/Cache.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/CacheImpl.java
@@ -36,7 +36,7 @@
*
* @param type for cache object
*/
-public class Cache implements Indexer {
+public class CacheImpl implements Cache {
// Defines how to map objects into indices
private Function keyFunc;
@@ -54,11 +54,11 @@ public class Cache implements Indexer {
private BooleanSupplier isRunning = () -> false;
- public Cache() {
+ public CacheImpl() {
this(NAMESPACE_INDEX, Cache::metaNamespaceIndexFunc, Cache::metaNamespaceKeyFunc);
}
- public Cache(String indexName, Function> indexFunc, Function keyFunc) {
+ public CacheImpl(String indexName, Function> indexFunc, Function keyFunc) {
this.indexers.put(indexName, indexFunc);
this.keyFunc = keyFunc;
this.indices.put(indexName, new HashMap<>());
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java
index efeb979cdac..368d8578e8e 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/cache/ProcessorStore.java
@@ -28,10 +28,10 @@
*/
public class ProcessorStore implements SyncableStore {
- private Cache cache;
+ private CacheImpl cache;
private SharedProcessor processor;
- public ProcessorStore(Cache cache, SharedProcessor processor) {
+ public ProcessorStore(CacheImpl cache, SharedProcessor processor) {
this.cache = cache;
this.processor = processor;
}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java
index 931e2e9f9e5..877aa4be84f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/DefaultSharedIndexInformer.java
@@ -21,7 +21,7 @@
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import io.fabric8.kubernetes.client.informers.ResyncRunnable;
import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
-import io.fabric8.kubernetes.client.informers.cache.Cache;
+import io.fabric8.kubernetes.client.informers.cache.CacheImpl;
import io.fabric8.kubernetes.client.informers.cache.Indexer;
import io.fabric8.kubernetes.client.informers.cache.ProcessorStore;
import io.fabric8.kubernetes.client.informers.cache.Reflector;
@@ -58,7 +58,7 @@ public class DefaultSharedIndexInformer reflector;
private final Class apiTypeClass;
private final ProcessorStore processorStore;
- private final Cache indexer;
+ private final CacheImpl indexer;
private final SharedProcessor processor;
private final Executor informerExecutor;
@@ -78,7 +78,7 @@ public DefaultSharedIndexInformer(Class apiTypeClass, ListerWatcher lis
this.informerExecutor = informerExecutor;
// reuse the informer executor, but ensure serial processing
this.processor = new SharedProcessor<>(new SerialExecutor(informerExecutor));
- this.indexer = new Cache<>();
+ this.indexer = new CacheImpl<>();
this.indexer.setIsRunning(this::isRunning);
processorStore = new ProcessorStore<>(this.indexer, this.processor);
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/PatchUtils.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/PatchUtils.java
index 1cc6483fcec..e2bbc46998d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/PatchUtils.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/PatchUtils.java
@@ -18,7 +18,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.client.internal.patchmixins.ObjectMetaMixIn;
+import io.fabric8.kubernetes.client.internal.serializationmixins.ObjectMetaMixIn;
public class PatchUtils {
private PatchUtils() { }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/patchmixins/ObjectMetaMixIn.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/patchmixins/ObjectMetaMixIn.java
deleted file mode 100644
index 5a3085b430a..00000000000
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/internal/patchmixins/ObjectMetaMixIn.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.internal.patchmixins;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-
-public abstract class ObjectMetaMixIn extends ObjectMeta {
- @JsonIgnore
- private String creationTimestamp;
- @JsonIgnore
- private String deletionTimestamp;
- @JsonIgnore
- private Long generation;
- @JsonIgnore
- private String resourceVersion;
- @JsonIgnore
- private String selfLink;
- @JsonIgnore
- private String uid;
-
- @Override
- @JsonIgnore
- public abstract String getCreationTimestamp();
- @Override
- @JsonIgnore
- public abstract String getDeletionTimestamp();
- @Override
- @JsonIgnore
- public abstract Long getGeneration();
- @Override
- @JsonIgnore
- public abstract String getResourceVersion();
- @Override
- @JsonIgnore
- public abstract String getSelfLink();
- @Override
- @JsonIgnore
- public abstract String getUid();
-}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
index 4cffb6be9e5..b09222b39c6 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
@@ -103,10 +103,10 @@
import io.fabric8.kubernetes.client.dsl.V1APIGroupDSL;
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
-import io.fabric8.kubernetes.client.dsl.internal.RawCustomResourceOperationsImpl;
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
import io.fabric8.kubernetes.client.extended.run.RunConfigBuilder;
import io.fabric8.kubernetes.client.extended.run.RunOperations;
+import io.fabric8.kubernetes.client.extended.run.RunOperationsImpl;
import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -479,11 +479,6 @@ public EventingAPIGroupDSL events() {
return delegate.events();
}
- @Override
- public RawCustomResourceOperationsImpl customResource(CustomResourceDefinitionContext customResourceDefinition) {
- return delegate.customResource(customResourceDefinition);
- }
-
@Override
public SharedInformerFactory informers() {
return delegate.informers();
@@ -585,7 +580,7 @@ public FunctionCallable withRequestConfig(RequestCon
@Override
public RunOperations run() {
- return new RunOperations(this, getNamespace(), new RunConfigBuilder());
+ return new RunOperationsImpl(this, getNamespace(), new RunConfigBuilder());
}
@Override
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DefaultKubernetesClientTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DefaultKubernetesClientTest.java
index 5ee94dd29d7..a173d9d3b93 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DefaultKubernetesClientTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/DefaultKubernetesClientTest.java
@@ -21,6 +21,8 @@
import io.fabric8.kubernetes.client.http.BasicBuilder;
import io.fabric8.kubernetes.client.http.HttpHeaders;
import io.fabric8.kubernetes.client.utils.HttpClientUtils;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.utils.Utils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -29,18 +31,26 @@
import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author wangyushuai2@jd.com
*/
class DefaultKubernetesClientTest {
+
+ private static final String TEST_CONFIG_YML_FILE = Utils.filePath(DefaultKubernetesClientTest.class.getResource("/test-config.yml"));
private DefaultKubernetesClient defaultKubernetesClient;
@@ -93,4 +103,48 @@ void loadWithWindowsLineSeparatorsString() throws Exception {
.hasAtLeastOneElementOfType(Service.class)
.hasAtLeastOneElementOfType(Deployment.class);
}
+
+ @Test
+ void shouldInstantiateClientUsingYaml() {
+ File configYml = new File(TEST_CONFIG_YML_FILE);
+ try (InputStream is = new FileInputStream(configYml)){
+ KubernetesClient client = DefaultKubernetesClient.fromConfig(is);
+ assertEquals("http://some.url", client.getMasterUrl().toString());
+ } catch (Exception e) {
+ fail();
+ }
+ }
+
+ @Test
+ void shouldInstantiateClientUsingSerializeDeserialize() {
+ DefaultKubernetesClient original = new DefaultKubernetesClient();
+ String json = Serialization.asJson(original.getConfiguration());
+ DefaultKubernetesClient copy = DefaultKubernetesClient.fromConfig(json);
+
+ assertEquals(original.getConfiguration().getMasterUrl(), copy.getConfiguration().getMasterUrl());
+ assertEquals(original.getConfiguration().getOauthToken(), copy.getConfiguration().getOauthToken());
+ assertEquals(original.getConfiguration().getNamespace(), copy.getConfiguration().getNamespace());
+ assertEquals(original.getConfiguration().getUsername(), copy.getConfiguration().getUsername());
+ assertEquals(original.getConfiguration().getPassword(), copy.getConfiguration().getPassword());
+ }
+
+ @Test
+ void shouldPropagateImpersonateSettings() {
+
+ final Map> extras = new HashMap<>();
+ extras.put("c", Collections.singletonList("d"));
+
+ final Config config = new ConfigBuilder()
+ .withImpersonateUsername("a")
+ .withImpersonateGroup("b")
+ .withImpersonateExtras(extras)
+ .build();
+
+ final DefaultKubernetesClient client = new DefaultKubernetesClient(config);
+ final Config currentConfig = client.getConfiguration();
+
+ assertEquals("a", currentConfig.getImpersonateUsername());
+ assertArrayEquals(new String[]{"b"}, currentConfig.getImpersonateGroups());
+ assertEquals(Collections.singletonList("d"), currentConfig.getImpersonateExtras().get("c"));
+ }
}
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
index 105a130e0a1..e4db40835ac 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
@@ -33,7 +33,6 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.kubernetes.client.utils.URLUtils;
import io.fabric8.kubernetes.client.utils.Utils;
-import okhttp3.OkHttpClient;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImplTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImplTest.java
deleted file mode 100644
index e231074183d..00000000000
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImplTest.java
+++ /dev/null
@@ -1,881 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.dsl.internal;
-
-import io.fabric8.kubernetes.api.model.DeleteOptionsBuilder;
-import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
-import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.SimpleClientContext;
-import io.fabric8.kubernetes.client.Watch;
-import io.fabric8.kubernetes.client.Watcher;
-import io.fabric8.kubernetes.client.WatcherException;
-import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
-import io.fabric8.kubernetes.client.http.HttpClient;
-import io.fabric8.kubernetes.client.http.HttpRequest;
-import io.fabric8.kubernetes.client.http.HttpResponse;
-import io.fabric8.kubernetes.client.http.WebSocket;
-import io.fabric8.kubernetes.client.utils.Serialization;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-
-import static io.fabric8.kubernetes.client.MockHttpClientUtils.buildResponse;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-class RawCustomResourceOperationsImplTest {
- private HttpClient mockClient;
- private HttpRequest.Builder mockRequestBuilder;
- private HttpRequest mockRequest;
- private Config config;
- private CustomResourceDefinitionContext namespacedCustomResourceDefinitionContext;
- private RawCustomResourceOperationsImpl namespacedOperations;
- private RawCustomResourceOperationsImpl clusterOperations;
- private ArgumentCaptor requestCaptor;
- private ArgumentCaptor urlCaptor;
- private ArgumentCaptor bodyCaptor;
-
- @BeforeEach
- public void setUp() throws IOException {
- mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
- mockRequestBuilder = Mockito.mock(HttpRequest.Builder.class, Mockito.RETURNS_SELF);
- mockRequest = Mockito.mock(HttpRequest.class);
- when(mockRequest.uri()).thenAnswer(uri -> {
- ArgumentCaptor urlCaptor = ArgumentCaptor.forClass(URL.class);
- verify(mockRequestBuilder, atLeastOnce()).url(urlCaptor.capture());
- return urlCaptor.getValue().toURI();
- });
- when(mockRequestBuilder.build()).thenReturn(mockRequest);
- when(mockClient.newHttpRequestBuilder()).thenReturn(mockRequestBuilder);
- config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
- namespacedCustomResourceDefinitionContext = new CustomResourceDefinitionContext.Builder()
- .withGroup("test.fabric8.io")
- .withName("hellos.test.fabric8.io")
- .withPlural("hellos")
- .withScope("Namespaced")
- .withVersion("v1alpha1")
- .build();
- final CustomResourceDefinitionContext clusterCustomResourceDefinitionContext = new CustomResourceDefinitionContext.Builder()
- .withGroup("test.fabric8.io")
- .withName("hellos.test.fabric8.io")
- .withPlural("hellos")
- .withScope("Cluster")
- .withVersion("v1alpha1")
- .build();
- namespacedOperations = new RawCustomResourceOperationsImpl(new SimpleClientContext(config, mockClient), namespacedCustomResourceDefinitionContext);
- clusterOperations = new RawCustomResourceOperationsImpl(new SimpleClientContext(config, mockClient), clusterCustomResourceDefinitionContext);
- requestCaptor = ArgumentCaptor.forClass(HttpRequest.class);
- urlCaptor = ArgumentCaptor.forClass(URL.class);
- bodyCaptor = ArgumentCaptor.forClass(String.class);
- }
-
- @Test
- @DisplayName("load, with valid InputStream, should load a valid Map")
- void loadWithInputStream() throws IOException {
- // When
- final Map result = namespacedOperations.load(RawCustomResourceOperationsImplTest.class
- .getResourceAsStream("/raw-custom-resource-operations/custom-resource.yml"));
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.name", "custom-resource-example")
- .hasFieldOrPropertyWithValue("spec.field", "value");
- }
-
- @Test
- @DisplayName("load, with valid object string, should load a valid Map")
- void loadWithObjectString() throws IOException {
- // When
- final Map result = namespacedOperations.load(
- "{\"metadata\":{\"name\":\"custom-resource-example\"}, \"spec\": {\"field\": \"value\"}}"
- );
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.name", "custom-resource-example")
- .hasFieldOrPropertyWithValue("spec.field", "value");
- }
-
- @Test
- @DisplayName("create, with valid object string, should create")
- void createFromObjectString() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = clusterOperations.create(
- "{\"metadata\":{\"name\":\"custom-resource-example\"}}"
- );
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/hellos", "POST");
- }
-
- @Test
- @DisplayName("create, with valid Map, should create")
- void createFromMap() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = clusterOperations.create(
- Collections.singletonMap("metadata",
- Collections.singletonMap("name", "custom-resource-example"))
- );
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/hellos", "POST");
- }
-
- @Test
- @DisplayName("create, with valid InputStream, should create")
- void createFromInputStream() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = clusterOperations.create(RawCustomResourceOperationsImplTest.class
- .getResourceAsStream("/raw-custom-resource-operations/custom-resource.yml"));
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/hellos", "POST");
- }
-
- @Test
- @DisplayName("create, with namespace and valid InputStream, should create")
- void createWithNamespaceFromInputStream() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = namespacedOperations.create("other-namespace",
- RawCustomResourceOperationsImplTest.class.getResourceAsStream("/raw-custom-resource-operations/custom-resource.yml"));
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/namespaces/other-namespace/hellos", "POST");
- }
-
- @Test
- @DisplayName("create, with namespace and valid Map, should create")
- void createWithNamespaceFromMap() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = namespacedOperations.create("other-namespace",
- Collections.singletonMap("metadata",
- Collections.singletonMap("name", "custom-resource-example"))
- );
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/namespaces/other-namespace/hellos", "POST");
- }
-
- @Test
- @DisplayName("createOrReplace, with valid object string, should create")
- void createOrReplaceFromString() throws IOException {
- // Given
- String resourceAsString = "{\"metadata\":{\"name\":\"myresource\",\"namespace\":\"myns\",\"resourceVersion\":\"111\"}, \"kind\":\"raw\", \"apiVersion\":\"v1\"}";
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"kind\": \"raw\", \"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map result = namespacedOperations.inNamespace("myns").createOrReplace(resourceAsString);
- // Then
- assertThat(result)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.resourceVersion", "created");
- assertRequestCaptured("/apis/test.fabric8.io/v1alpha1/namespaces/myns/hellos", "POST");
- }
-
- @Test
- @DisplayName("createOrReplace, with valid Map, should create")
- void createOrReplaceFromMap() throws IOException {
- // Given
- mockCallWithResponse(
- i -> buildResponse(HttpURLConnection.HTTP_CREATED,
- "{\"metadata\": {\"resourceVersion\": \"created\"}}")
- );
- // When
- final Map