From fc2941267a2e0ea5141d057a65b7c37e3132f984 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Mon, 22 Apr 2019 16:21:33 +0530 Subject: [PATCH] Chore: Add example for custom resource new dsl --- CHANGELOG.md | 2 + .../RawCustomResourceOperationsImpl.java | 48 ++- .../examples/RawCustomResourceExample.java | 79 ++++ .../main/resources/prometheous-rule-cr.yml | 30 ++ .../main/resources/prometheous-rule-crd.yml | 354 ++++++++++++++++++ .../client/mock/CustomResourceTest.java | 136 +++++++ .../src/test/resources/test-hello-cr.yml | 22 ++ 7 files changed, 666 insertions(+), 5 deletions(-) create mode 100644 kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/RawCustomResourceExample.java create mode 100644 kubernetes-examples/src/main/resources/prometheous-rule-cr.yml create mode 100644 kubernetes-examples/src/main/resources/prometheous-rule-crd.yml create mode 100644 kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceTest.java create mode 100644 kubernetes-tests/src/test/resources/test-hello-cr.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 4335f65cb79..38b72eb66d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ * Fix #1500: exec `redirectingInput` was not correctly setting the input pipe (since 4.2.0). Improvements + + * Added example for raw custom resources. Dependency Upgrade diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java index fc7c7140e48..f3af0f7754f 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java @@ -21,6 +21,7 @@ import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; import io.fabric8.kubernetes.client.dsl.base.OperationSupport; import io.fabric8.kubernetes.client.utils.IOHelpers; +import io.fabric8.kubernetes.client.utils.Utils; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -31,13 +32,13 @@ import java.io.InputStream; import java.net.HttpURLConnection; import java.util.HashMap; -import java.util.List; import java.util.Map; public class RawCustomResourceOperationsImpl extends OperationSupport { private OkHttpClient client; private Config config; private CustomResourceDefinitionContext customResourceDefinition; + private ObjectMapper objectMapper; private enum HttpCallMethod { GET, POST, PUT, DELETE }; @@ -45,12 +46,28 @@ public RawCustomResourceOperationsImpl(OkHttpClient client, Config config, Custo this.client = client; this.config = config; this.customResourceDefinition = customResourceDefinition; + this.objectMapper = new ObjectMapper(); + } + + public Map load(InputStream fileInputStream) throws IOException { + String objectAsString = IOHelpers.readFully(fileInputStream); + HashMap retVal = null; + if (IOHelpers.isJSONValid(objectAsString)) { + retVal = objectMapper.readValue(objectAsString, HashMap.class); + } else { + retVal = objectMapper.readValue(IOHelpers.convertYamlToJson(objectAsString), HashMap.class); + } + return retVal; } public Map create(String objectAsString) throws IOException { return validateAndSubmitRequest(null, null, objectAsString, HttpCallMethod.POST); } + public Map create(Map object) throws KubernetesClientException, IOException { + return validateAndSubmitRequest(null, null, objectMapper.writeValueAsString(object), HttpCallMethod.POST); + } + public Map create(String namespace, String objectAsString) throws KubernetesClientException, IOException { return validateAndSubmitRequest(namespace, null, objectAsString, HttpCallMethod.POST); } @@ -63,14 +80,30 @@ public Map create(String namespace, InputStream objectAsStream) return validateAndSubmitRequest(namespace, null, IOHelpers.readFully(objectAsStream), HttpCallMethod.POST); } + public Map create(String namespace, Map object) throws KubernetesClientException, IOException { + return validateAndSubmitRequest(namespace, null, objectMapper.writeValueAsString(object), HttpCallMethod.POST); + } + + public Map edit(String name, Map object) throws IOException { + return validateAndSubmitRequest(null, name, objectMapper.writeValueAsString(object), HttpCallMethod.PUT); + } + public Map edit(String name, String objectAsString) throws IOException { return validateAndSubmitRequest(null, name, objectAsString, HttpCallMethod.PUT); } + public Map edit(String namespace, String name, Map object) throws IOException { + return validateAndSubmitRequest(namespace, name, objectMapper.writeValueAsString(object), HttpCallMethod.PUT); + } + public Map edit(String namespace, String name, String objectAsString) throws IOException { return validateAndSubmitRequest(namespace, name, objectAsString, HttpCallMethod.PUT); } + public Map edit(String name, InputStream objectAsStream) throws IOException, KubernetesClientException { + return validateAndSubmitRequest(null, name, IOHelpers.readFully(objectAsStream), HttpCallMethod.PUT); + } + public Map edit(String namespace, String name, InputStream objectAsStream) throws IOException, KubernetesClientException { return validateAndSubmitRequest(namespace, name, IOHelpers.readFully(objectAsStream), HttpCallMethod.PUT); } @@ -116,6 +149,7 @@ private String fetchUrl(String namespace, Map labels) { } urlBuilder.append(customResourceDefinition.getPlural()).append("/"); if(labels != null) { + urlBuilder.deleteCharAt(urlBuilder.lastIndexOf("/")); urlBuilder.append("?labelSelector").append("=").append(getLabelsQueryParam(labels)); } return urlBuilder.toString(); @@ -127,7 +161,7 @@ private String getLabelsQueryParam(Map labels) { if(labelQueryBuilder.length() > 0) { labelQueryBuilder.append(","); } - labelQueryBuilder.append(entry.getKey()).append("=").append(entry.getValue()); + labelQueryBuilder.append(entry.getKey()).append(Utils.toUrlEncoded("=")).append(entry.getValue()); } return labelQueryBuilder.toString(); } @@ -144,10 +178,14 @@ private Map makeCall(String url, String body, HttpCallMethod cal if(response.code() != HttpURLConnection.HTTP_NOT_FOUND && response.code() != HttpURLConnection.HTTP_SERVER_ERROR && response.code() != HttpURLConnection.HTTP_BAD_REQUEST) { - return new ObjectMapper().readValue(response.body().string(), HashMap.class); + return objectMapper.readValue(response.body().string(), HashMap.class); } else { - response.close(); - throw new IllegalStateException(response.message()); + if(response.body() != null) { + throw new KubernetesClientException(response.body().string()); + } else { + response.close(); + throw new KubernetesClientException(response.message()); + } } } catch(Exception e) { throw KubernetesClientException.launderThrowable(e); diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/RawCustomResourceExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/RawCustomResourceExample.java new file mode 100644 index 00000000000..f026269a3b7 --- /dev/null +++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/RawCustomResourceExample.java @@ -0,0 +1,79 @@ +/** + * 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.examples; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition; +import io.fabric8.kubernetes.client.DefaultKubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +public class RawCustomResourceExample { + private static final Logger logger = LoggerFactory.getLogger(RawCustomResourceExample.class); + + public static void main(String args[]) throws IOException { + + try (final KubernetesClient client = new DefaultKubernetesClient()) { + CustomResourceDefinition prometheousRuleCrd = client.customResourceDefinitions().load(RawCustomResourceExample.class.getResourceAsStream("/prometheous-rule-crd.yml")).get(); + client.customResourceDefinitions().create(prometheousRuleCrd); + log("Successfully created prometheous custom resource definition"); + + // Creating Custom Resources Now: + CustomResourceDefinitionContext crdContext = new CustomResourceDefinitionContext.Builder() + .withGroup("monitoring.coreos.com") + .withPlural("prometheusrules") + .withScope("Namespaced") + .withVersion("v1") + .build(); + + client.customResource(crdContext).create("myproject", RawCustomResourceExample.class.getResourceAsStream("/prometheous-rule-cr.yml")); + log("Created Custom Resource successfully too"); + + // Listing all custom resources in given namespace: + Map list = client.customResource(crdContext).list("myproject"); + List> items = (List>) list.get("items"); + log("Custom Resources :- "); + for(Map customResource : items) { + Map metadata = (Map) customResource.get("metadata"); + log(metadata.get("name").toString()); + } + + // Cleanup + log("Deleting custom resources..."); + Map deleted = client.customResource(crdContext).delete("myproject", "prometheus-example-rules"); + client.customResourceDefinitions().withName("prometheusrules.monitoring.coreos.com").delete(); + + } catch (KubernetesClientException e) { + e.printStackTrace(); + log("Could not create resource", e.getMessage()); + } + } + + private static void log(String action, Object obj) { + logger.info("{}: {}", action, obj); + } + + private static void log(String action) { + logger.info(action); + } +} diff --git a/kubernetes-examples/src/main/resources/prometheous-rule-cr.yml b/kubernetes-examples/src/main/resources/prometheous-rule-cr.yml new file mode 100644 index 00000000000..4d949f16672 --- /dev/null +++ b/kubernetes-examples/src/main/resources/prometheous-rule-cr.yml @@ -0,0 +1,30 @@ +# +# 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. +# + +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + creationTimestamp: null + labels: + prometheus: example + role: alert-rules + name: prometheus-example-rules +spec: + groups: + - name: ./example.rules + rules: + - alert: ExampleAlert + expr: vector(1) diff --git a/kubernetes-examples/src/main/resources/prometheous-rule-crd.yml b/kubernetes-examples/src/main/resources/prometheous-rule-crd.yml new file mode 100644 index 00000000000..b5b6dd7d62e --- /dev/null +++ b/kubernetes-examples/src/main/resources/prometheous-rule-crd.yml @@ -0,0 +1,354 @@ +# +# 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. +# + +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + name: prometheusrules.monitoring.coreos.com +spec: + group: monitoring.coreos.com + names: + kind: PrometheusRule + plural: prometheusrules + scope: Namespaced + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: + description: ObjectMeta is metadata that all persisted resources must have, + which includes all objects users must create. + properties: + annotations: + description: 'Annotations is an unstructured key value map stored with + a resource that may be set by external tools to store and retrieve + arbitrary metadata. They are not queryable and should be preserved + when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + clusterName: + description: The name of the cluster which the object belongs to. This + is used to distinguish resources with same name and namespace in different + clusters. This field is not set anywhere right now and apiserver is + going to ignore it if set in create or update request. + type: string + creationTimestamp: + description: Time is a wrapper around time.Time which supports correct + marshaling to YAML and JSON. Wrappers are provided for many of the + factory methods that the time package offers. + format: date-time + type: string + deletionGracePeriodSeconds: + description: Number of seconds allowed for this object to gracefully + terminate before it will be removed from the system. Only set when + deletionTimestamp is also set. May only be shortened. Read-only. + format: int64 + type: integer + deletionTimestamp: + description: Time is a wrapper around time.Time which supports correct + marshaling to YAML and JSON. Wrappers are provided for many of the + factory methods that the time package offers. + format: date-time + type: string + finalizers: + description: Must be empty before the object is deleted from the registry. + Each entry is an identifier for the responsible component that will + remove the entry from the list. If the deletionTimestamp of the object + is non-nil, entries in this list can only be removed. + items: + type: string + type: array + generateName: + description: |- + GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server. + If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header). + Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency + type: string + generation: + description: A sequence number representing a specific generation of + the desired state. Populated by the system. Read-only. + format: int64 + type: integer + initializers: + description: Initializers tracks the progress of initialization. + properties: + pending: + description: Pending is a list of initializers that must execute + in order before this object is visible. When the last pending + initializer is removed, and no failing result is set, the initializers + struct will be set to nil and the object is considered as initialized + and visible to all clients. + items: + description: Initializer is information about an initializer that + has not yet completed. + properties: + name: + description: name of the process that is responsible for initializing + this object. + type: string + required: + - name + type: array + result: + description: Status is a return value for calls that don't return + other objects. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this + representation of an object. Servers should convert recognized + schemas to the latest internal value, and may reject unrecognized + values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + code: + description: Suggested HTTP return code for this status, 0 if + not set. + format: int32 + type: integer + details: + description: StatusDetails is a set of additional properties + that MAY be set by the server to provide additional information + about a response. The Reason field of a Status object defines + what attributes will be set. Clients must ignore fields that + do not match the defined type of each attribute, and should + assume that any attribute may be empty, invalid, or under + defined. + properties: + causes: + description: The Causes array includes more details associated + with the StatusReason failure. Not all StatusReasons may + provide detailed causes. + items: + description: StatusCause provides more information about + an api.Status failure, including cases when multiple + errors are encountered. + properties: + field: + description: |- + The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional. + Examples: + "name" - the field "name" on the current resource + "items[0].name" - the field "name" on the first array entry in "items" + type: string + message: + description: A human-readable description of the cause + of the error. This field may be presented as-is + to a reader. + type: string + reason: + description: A machine-readable description of the + cause of the error. If this value is empty there + is no information available. + type: string + type: array + group: + description: The group attribute of the resource associated + with the status StatusReason. + type: string + kind: + description: 'The kind attribute of the resource associated + with the status StatusReason. On some operations may differ + from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: The name attribute of the resource associated + with the status StatusReason (when there is a single name + which can be described). + type: string + retryAfterSeconds: + description: If specified, the time in seconds before the + operation should be retried. Some errors may indicate + the client must take an alternate action - for those errors + this field may indicate how long to wait before taking + the alternate action. + format: int32 + type: integer + uid: + description: 'UID of the resource. (when there is a single + resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + kind: + description: 'Kind is a string value representing the REST resource + this object represents. Servers may infer this from the endpoint + the client submits requests to. Cannot be updated. In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + message: + description: A human-readable description of the status of this + operation. + type: string + metadata: + description: ListMeta describes metadata that synthetic resources + must have, including lists and various status objects. A resource + may have only one of {ObjectMeta, ListMeta}. + properties: + continue: + description: continue may be set if the user set a limit + on the number of items returned, and indicates that the + server has more data available. The value is opaque and + may be used to issue another request to the endpoint that + served this list to retrieve the next set of available + objects. Continuing a consistent list may not be possible + if the server configuration has changed or more than a + few minutes have passed. The resourceVersion field returned + when using this continue value will be identical to the + value in the first response, unless you have received + this token from an error message. + type: string + resourceVersion: + description: 'String that identifies the server''s internal + version of this object that can be used by clients to + determine when objects have changed. Value must be treated + as opaque by clients and passed unmodified back to the + server. Populated by the system. Read-only. More info: + https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency' + type: string + selfLink: + description: selfLink is a URL representing this object. + Populated by the system. Read-only. + type: string + reason: + description: A machine-readable description of why this operation + is in the "Failure" status. If this value is empty there is + no information available. A Reason clarifies an HTTP status + code but does not override it. + type: string + status: + description: 'Status of the operation. One of: "Success" or + "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + type: string + required: + - pending + labels: + description: 'Map of string keys and values that can be used to organize + and categorize (scope and select) objects. May match selectors of + replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' + type: object + name: + description: 'Name must be unique within a namespace. Is required when + creating resources, although some resources may allow a client to + request the generation of an appropriate name automatically. Name + is primarily intended for creation idempotence and configuration definition. + Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + namespace: + description: |- + Namespace defines the space within each name must be unique. An empty namespace is equivalent to the "default" namespace, but "default" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty. + Must be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces + type: string + ownerReferences: + description: List of objects depended by this object. If ALL objects + in the list have been deleted, this object will be garbage collected. + If this object is managed by a controller, then an entry in this list + will point to this controller, with the controller field set to true. + There cannot be more than one managing controller. + items: + description: OwnerReference contains enough information to let you + identify an owning object. An owning object must be in the same + namespace as the dependent, or be cluster-scoped, so there is no + namespace field. + properties: + apiVersion: + description: API version of the referent. + type: string + blockOwnerDeletion: + description: If true, AND if the owner has the "foregroundDeletion" + finalizer, then the owner cannot be deleted from the key-value + store until this reference is removed. Defaults to false. To + set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. + type: boolean + controller: + description: If true, this reference points to the managing controller. + type: boolean + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + uid: + description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + required: + - apiVersion + - kind + - name + - uid + type: array + resourceVersion: + description: |- + An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources. + Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency + type: string + selfLink: + description: SelfLink is a URL representing this object. Populated by + the system. Read-only. + type: string + uid: + description: |- + UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations. + Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids + type: string + spec: + description: PrometheusRuleSpec contains specification parameters for a + Rule. + properties: + groups: + description: Content of Prometheus rule file + items: + description: RuleGroup is a list of sequentially evaluated recording + and alerting rules. + properties: + interval: + type: string + name: + type: string + rules: + items: + description: Rule describes an alerting or recording rule. + properties: + alert: + type: string + annotations: + type: object + expr: + anyOf: + - type: string + - type: integer + for: + type: string + labels: + type: object + record: + type: string + required: + - expr + type: array + required: + - name + - rules + type: array + version: v1 diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceTest.java new file mode 100644 index 00000000000..0eac7442172 --- /dev/null +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceTest.java @@ -0,0 +1,136 @@ +/** + * 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.mock; + +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; +import io.fabric8.kubernetes.client.server.mock.KubernetesServer; +import org.junit.Rule; +import org.junit.Test; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +public class CustomResourceTest { + @Rule + public KubernetesServer server = new KubernetesServer(); + + private CustomResourceDefinitionContext customResourceDefinitionContext = new CustomResourceDefinitionContext.Builder() + .withGroup("test.fabric8.io") + .withName("hellos.test.fabric8.io") + .withPlural("hellos") + .withScope("Namespaced") + .withVersion("v1alpha1") + .build(); + + @Test + public void testLoad() throws IOException { + KubernetesClient client = server.getClient(); + Map customResource = client.customResource(customResourceDefinitionContext).load(getClass().getResourceAsStream("/test-hello-cr.yml")); + assertNotNull(customResource); + assertEquals("example-hello", ((Map)customResource.get("metadata")).get("name").toString()); + } + + @Test + public void testCreate() throws IOException { + String jsonObject = "{\"apiVersion\": \"test.fabric8.io/v1alpha1\",\"kind\": \"Hello\"," + + "\"metadata\": {\"name\": \"example-hello\"},\"spec\": {\"size\": 3}}"; + + server.expect().post().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos/").andReturn(HttpURLConnection.HTTP_CREATED, jsonObject).once(); + KubernetesClient client = server.getClient(); + + Map resource = client.customResource(customResourceDefinitionContext).create("ns1", jsonObject); + assertEquals("example-hello", ((Map)resource.get("metadata")).get("name").toString()); + } + + @Test + public void testList() { + String jsonObject = "{\"metadata\":{\"continue\":\"\",\"resourceVersion\":\"539617\",\"selfLink\":\"test.fabric8.io/v1alpha1/namespaces/ns1/hellos/\"},\"apiVersion\":\"test.fabric8.io/v1alpha1\",\"kind\":\"HelloList\",\"items\":[{\"apiVersion\": \"test.fabric8.io/v1alpha1\",\"kind\": \"Hello\"," + + "\"metadata\": {\"name\": \"example-hello\"},\"spec\": {\"size\": 3},\"uid\":\"3525437a-6a56-11e9-8787-525400b18c1d\"}]}"; + + server.expect().get().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos/").andReturn(HttpURLConnection.HTTP_CREATED, jsonObject).once(); + KubernetesClient client = server.getClient(); + + Map list = client.customResource(customResourceDefinitionContext).list("ns1"); + List> items = (List>)list.get("items"); + assertNotNull(items); + assertEquals(1, items.size()); + } + + @Test + public void testListWithLabels() { + String jsonObject = "{\"metadata\":{\"continue\":\"\",\"resourceVersion\":\"539617\",\"selfLink\":\"test.fabric8.io/v1alpha1/namespaces/ns1/hellos/\"},\"apiVersion\":\"test.fabric8.io/v1alpha1\",\"kind\":\"HelloList\",\"items\":[{\"apiVersion\": \"test.fabric8.io/v1alpha1\",\"kind\": \"Hello\"," + + "\"metadata\": {\"name\": \"example-hello\", \"labels\": {\"scope\":\"test\"}},\"spec\": {\"size\": 3},\"uid\":\"3525437a-6a56-11e9-8787-525400b18c1d\"}]}"; + + server.expect().get().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos?labelSelector=org%3Dfabric8,scope%3Dtest").andReturn(HttpURLConnection.HTTP_CREATED, jsonObject).once(); + KubernetesClient client = server.getClient(); + + Map labels = new HashMap<>(); + labels.put("org", "fabric8"); + labels.put("scope", "test"); + Map list = client.customResource(customResourceDefinitionContext).list("ns1", labels); + List> items = (List>)list.get("items"); + assertNotNull(items); + assertEquals(1, items.size()); + } + + @Test + public void testGet() { + String jsonObject = "{\"apiVersion\": \"test.fabric8.io/v1alpha1\",\"kind\": \"Hello\"," + + "\"metadata\": {\"name\": \"example-hello\"},\"spec\": {\"size\": 3}}"; + server.expect().get().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos/example-hello").andReturn(HttpURLConnection.HTTP_OK, jsonObject).once(); + + KubernetesClient client = server.getClient(); + Map customResource = client.customResource(customResourceDefinitionContext).get("ns1", "example-hello"); + assertNotNull(customResource); + assertEquals("example-hello", ((Map)customResource.get("metadata")).get("name").toString()); + } + + @Test + public void testEdit() throws IOException { + String jsonObjectNew = "{\"apiVersion\": \"test.fabric8.io/v1alpha1\",\"kind\": \"Hello\"," + + "\"metadata\": {\"name\": \"example-hello\"},\"spec\": {\"size\": 4}}"; + server.expect().put().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos/example-hello").andReturn(HttpURLConnection.HTTP_OK, jsonObjectNew).once(); + + KubernetesClient client = server.getClient(); + Map customResource = client.customResource(customResourceDefinitionContext).edit("ns1", "example-hello", jsonObjectNew); + assertNotNull(customResource); + assertEquals(4, ((Map)customResource.get("spec")).get("size")); + } + + @Test + public void testDelete() { + server.expect().delete().withPath("/apis/test.fabric8.io/v1alpha1/namespaces/ns1/hellos/example-hello").andReturn(HttpURLConnection.HTTP_OK, "{\"metadata\":{},\"apiVersion\":\"v1\",\"kind\":\"Status\",\"details\":{\"name\":\"prometheus-example-rules\",\"group\":\"monitoring.coreos.com\",\"kind\":\"prometheusrules\",\"uid\":\"b3d085bd-6a5c-11e9-8787-525400b18c1d\"},\"status\":\"Success\"}").once(); + + KubernetesClient client = server.getClient(); + Map result = client.customResource(customResourceDefinitionContext).delete("ns1", "example-hello"); + assertEquals("Success", result.get("status")); + } + + @Test(expected = KubernetesClientException.class) + public void testDeleteWithNamespaceMismatch() { + KubernetesClient client = server.getClient(); + client.customResource(customResourceDefinitionContext).delete("ns2", "example-hello"); + } +} diff --git a/kubernetes-tests/src/test/resources/test-hello-cr.yml b/kubernetes-tests/src/test/resources/test-hello-cr.yml new file mode 100644 index 00000000000..52fb08ccc5c --- /dev/null +++ b/kubernetes-tests/src/test/resources/test-hello-cr.yml @@ -0,0 +1,22 @@ +# +# 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. +# + +apiVersion: test.fabric8.io/v1alpha1 +kind: Hello +metadata: + name: example-hello +spec: + size: 3