-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1472 from rohanKanojia/pr/custom-resources-improv…
…ements
- Loading branch information
Showing
20 changed files
with
753 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -281,6 +281,7 @@ | |
| <version>${slf4j.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
.../src/main/java/io/fabric8/kubernetes/client/dsl/base/CustomResourceDefinitionContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /** | ||
| * 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.base; | ||
|
|
||
| public class CustomResourceDefinitionContext { | ||
| private String name; | ||
| private String group; | ||
| private String scope; | ||
| private String plural; | ||
| private String version; | ||
|
|
||
| public String getName() { return name; } | ||
|
|
||
| public String getGroup() { | ||
| return group; | ||
| } | ||
|
|
||
| public String getScope() { | ||
| return scope; | ||
| } | ||
|
|
||
| public String getPlural() { | ||
| return plural; | ||
| } | ||
|
|
||
| public String getVersion() { | ||
| return version; | ||
| } | ||
|
|
||
| public static class Builder { | ||
| private CustomResourceDefinitionContext customResourceDefinitionContext; | ||
|
|
||
| public Builder() { | ||
| this.customResourceDefinitionContext = new CustomResourceDefinitionContext(); | ||
| } | ||
|
|
||
| public Builder withName(String name) { | ||
| this.customResourceDefinitionContext.name = name; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withGroup(String group) { | ||
| this.customResourceDefinitionContext.group = group; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withScope(String scope) { | ||
| this.customResourceDefinitionContext.scope = scope; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withPlural(String plural) { | ||
| this.customResourceDefinitionContext.plural = plural; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withVersion(String version) { | ||
| this.customResourceDefinitionContext.version = version; | ||
| return this; | ||
| } | ||
|
|
||
| public CustomResourceDefinitionContext build() { | ||
| return this.customResourceDefinitionContext; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
190 changes: 190 additions & 0 deletions
190
.../main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| /** | ||
| * 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 com.fasterxml.jackson.databind.ObjectMapper; | ||
| import io.fabric8.kubernetes.client.Config; | ||
| import io.fabric8.kubernetes.client.KubernetesClientException; | ||
| import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext; | ||
| import io.fabric8.kubernetes.client.dsl.base.OperationSupport; | ||
| import io.fabric8.kubernetes.client.utils.IOHelpers; | ||
| import okhttp3.MediaType; | ||
| import okhttp3.OkHttpClient; | ||
| import okhttp3.Request; | ||
| import okhttp3.RequestBody; | ||
| import okhttp3.Response; | ||
|
|
||
| import java.io.IOException; | ||
| 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 enum HttpCallMethod { GET, POST, PUT, DELETE }; | ||
|
|
||
| public RawCustomResourceOperationsImpl(OkHttpClient client, Config config, CustomResourceDefinitionContext customResourceDefinition) { | ||
| this.client = client; | ||
| this.config = config; | ||
| this.customResourceDefinition = customResourceDefinition; | ||
| } | ||
|
|
||
| public Map<String, Object> create(String objectAsString) throws IOException { | ||
| return validateAndSubmitRequest(null, null, objectAsString, HttpCallMethod.POST); | ||
| } | ||
|
|
||
| public Map<String, Object> create(String namespace, String objectAsString) throws KubernetesClientException, IOException { | ||
| return validateAndSubmitRequest(namespace, null, objectAsString, HttpCallMethod.POST); | ||
| } | ||
|
|
||
| public Map<String, Object> create(InputStream objectAsStream) throws KubernetesClientException, IOException { | ||
| return validateAndSubmitRequest(null, null, IOHelpers.readFully(objectAsStream), HttpCallMethod.POST); | ||
| } | ||
|
|
||
| public Map<String, Object> create(String namespace, InputStream objectAsStream) throws KubernetesClientException, IOException { | ||
| return validateAndSubmitRequest(namespace, null, IOHelpers.readFully(objectAsStream), HttpCallMethod.POST); | ||
| } | ||
|
|
||
| public Map<String, Object> edit(String name, String objectAsString) throws IOException { | ||
| return validateAndSubmitRequest(null, name, objectAsString, HttpCallMethod.PUT); | ||
| } | ||
|
|
||
| public Map<String, Object> edit(String namespace, String name, String objectAsString) throws IOException { | ||
| return validateAndSubmitRequest(namespace, name, objectAsString, HttpCallMethod.PUT); | ||
| } | ||
|
|
||
| public Map<String, Object> edit(String namespace, String name, InputStream objectAsStream) throws IOException, KubernetesClientException { | ||
| return validateAndSubmitRequest(namespace, name, IOHelpers.readFully(objectAsStream), HttpCallMethod.PUT); | ||
| } | ||
|
|
||
| public Map<String, Object> get(String name) { | ||
| return makeCall(fetchUrl(null, null) + name, null, HttpCallMethod.GET); | ||
| } | ||
|
|
||
| public Map<String, Object> get(String namespace, String name) { | ||
| return makeCall(fetchUrl(namespace, null) + name, null, HttpCallMethod.GET); | ||
| } | ||
|
|
||
| public Map<String, Object> list() { | ||
| return makeCall(fetchUrl(null, null), null, HttpCallMethod.GET); | ||
| } | ||
|
|
||
| public Map<String, Object> list(String namespace) { | ||
| return makeCall(fetchUrl(namespace, null), null, HttpCallMethod.GET); | ||
| } | ||
|
|
||
| public Map<String, Object> list(String namespace, Map<String, String> labels) { | ||
| return makeCall(fetchUrl(namespace, labels), null, HttpCallMethod.GET); | ||
| } | ||
|
|
||
| public Map<String, Object> delete(String namespace) { | ||
| return makeCall(fetchUrl(namespace, null), null, HttpCallMethod.DELETE); | ||
| } | ||
|
|
||
| public Map<String, Object> delete(String namespace, String name) { | ||
| return makeCall(fetchUrl(namespace, null) + name, null, HttpCallMethod.DELETE); | ||
| } | ||
|
|
||
| private String fetchUrl(String namespace, Map<String, String> labels) { | ||
| StringBuilder urlBuilder = new StringBuilder(config.getMasterUrl()); | ||
| urlBuilder.append("apis/") | ||
| .append(customResourceDefinition.getGroup()) | ||
| .append("/") | ||
| .append(customResourceDefinition.getVersion()) | ||
| .append("/"); | ||
|
|
||
| if(customResourceDefinition.getScope().equals("Namespaced") && namespace != null) { | ||
| urlBuilder.append("namespaces/").append(namespace).append("/"); | ||
| } | ||
| urlBuilder.append(customResourceDefinition.getPlural()).append("/"); | ||
| if(labels != null) { | ||
| urlBuilder.append("?labelSelector").append("=").append(getLabelsQueryParam(labels)); | ||
| } | ||
| return urlBuilder.toString(); | ||
| } | ||
|
|
||
| private String getLabelsQueryParam(Map<String, String> labels) { | ||
| StringBuilder labelQueryBuilder = new StringBuilder(); | ||
| for(Map.Entry<String, String> entry : labels.entrySet()) { | ||
| if(labelQueryBuilder.length() > 0) { | ||
| labelQueryBuilder.append(","); | ||
| } | ||
| labelQueryBuilder.append(entry.getKey()).append("=").append(entry.getValue()); | ||
| } | ||
| return labelQueryBuilder.toString(); | ||
| } | ||
|
|
||
| private Map<String, Object> makeCall(String url, String body, HttpCallMethod callMethod) throws RuntimeException { | ||
| try { | ||
| Response response; | ||
| if(body == null) { | ||
| response = client.newCall(getRequest(url, callMethod)).execute(); | ||
| } | ||
| else { | ||
| response = client.newCall(getRequest(url, body, callMethod)).execute(); | ||
| } | ||
| 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); | ||
| } else { | ||
| response.close(); | ||
| throw new IllegalStateException(response.message()); | ||
| } | ||
| } catch(Exception e) { | ||
| throw KubernetesClientException.launderThrowable(e); | ||
| } | ||
| } | ||
|
|
||
| private Map<String, Object> validateAndSubmitRequest(String namespace, String name, String objectAsString, HttpCallMethod httpCallMethod) throws IOException { | ||
| if (IOHelpers.isJSONValid(objectAsString)) { | ||
| return makeCall(fetchUrl(namespace, null) + (name != null ? name : ""), objectAsString, httpCallMethod); | ||
| } else { | ||
| return makeCall(fetchUrl(namespace, null) + (name != null ? name : ""), IOHelpers.convertYamlToJson(objectAsString), httpCallMethod); | ||
| } | ||
| } | ||
|
|
||
| private Request getRequest(String url, HttpCallMethod httpCallMethod) { | ||
| Request.Builder requestBuilder = new Request.Builder(); | ||
| switch(httpCallMethod) { | ||
| case GET: | ||
| requestBuilder.get().url(url); | ||
| break; | ||
| case DELETE: | ||
| requestBuilder.delete().url(url); | ||
| break; | ||
| } | ||
|
|
||
| return requestBuilder.build(); | ||
| } | ||
|
|
||
| private Request getRequest(String url, String body, HttpCallMethod httpCallMethod) { | ||
| Request.Builder requestBuilder = new Request.Builder(); | ||
| RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), body); | ||
| switch(httpCallMethod) { | ||
| case POST: | ||
| return requestBuilder.post(requestBody).url(url).build(); | ||
| case PUT: | ||
| return requestBuilder.put(requestBody).url(url).build(); | ||
| } | ||
| return requestBuilder.build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.