stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [08/12] stratos git commit: Migrating Kubernetes API client to Fabric8
Date Mon, 15 Jun 2015 12:43:13 GMT
http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesExtensions.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesExtensions.java
b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesExtensions.java
new file mode 100644
index 0000000..342aac6
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesExtensions.java
@@ -0,0 +1,226 @@
+/**
+ *  Copyright 2005-2014 Red Hat, Inc.
+ *
+ *  Red Hat licenses this file to you 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.api;
+
+import io.fabric8.openshift.api.model.Build;
+import io.fabric8.openshift.api.model.BuildConfig;
+import io.fabric8.openshift.api.model.BuildConfigList;
+import io.fabric8.openshift.api.model.BuildList;
+import io.fabric8.openshift.api.model.DeploymentConfig;
+import io.fabric8.openshift.api.model.DeploymentConfigList;
+import io.fabric8.openshift.api.model.ImageStream;
+import io.fabric8.openshift.api.model.ImageStreamList;
+import io.fabric8.openshift.api.model.Route;
+import io.fabric8.openshift.api.model.RouteList;
+import io.fabric8.openshift.api.model.template.Template;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+/**
+ * Various Kubernetes extensions defined in the OpenShift project
+ */
+@Path(KubernetesExtensions.OSAPI_ROOT_PATH + "/namespaces/{namespace}")
+@Produces("application/json")
+@Consumes("application/json")
+public interface KubernetesExtensions {
+
+    String OSAPI_ROOT_PATH = "osapi/v1beta3";
+
+    @POST
+    @Path("processedtemplates")
+    @Consumes("application/json")
+    String processTemplate(Template entity, @PathParam("namespace") String namespace) throws
Exception;
+
+
+/*
+    TODO uncomment when TemplateList is in the schema
+
+    @Path("templates")
+    @GET
+    @Produces("application/json")
+    TemplateList getTemplates(@PathParam("namespace") String namespace);
+*/
+
+    @Path("templates")
+    @POST
+    @Consumes("application/json")
+    String createTemplate(Template entity, @PathParam("namespace") String namespace) throws
Exception;
+
+    @GET
+    @Path("templates/{name}")
+    @Produces("application/json")
+    Template getTemplate(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+    @PUT
+    @Path("templates/{name}")
+    @Consumes("application/json")
+    String updateTemplate(@PathParam("name") @NotNull String name, Template entity, @PathParam("namespace")
String namespace) throws Exception;
+
+    @DELETE
+    @Path("templates/{name}")
+    @Produces("application/json")
+    @Consumes("text/plain")
+    String deleteTemplate(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace) throws Exception;
+
+
+    // Routes
+    //-------------------------------------------------------------------------
+
+
+    @GET
+    @Path("routes")
+    RouteList getRoutes(@PathParam("namespace") String namespace);
+
+
+    @POST
+    @Path("routes")
+    String createRoute(Route entity, @PathParam("namespace") String namespace) throws Exception;
+
+    @GET
+    @Path("routes/{name}")
+    Route getRoute(@PathParam("name") @NotNull String name, @PathParam("namespace") String
namespace);
+
+    @PUT
+    @Path("routes/{name}")
+    @Consumes("application/json")
+    String updateRoute(@PathParam("name") @NotNull String name, Route entity, @PathParam("namespace")
String namespace) throws Exception;
+
+    @DELETE
+    @Path("routes/{name}")
+    String deleteRoute(@PathParam("name") @NotNull String name, @PathParam("namespace") String
namespace);
+
+
+    // Builds
+    //-------------------------------------------------------------------------
+
+    @GET
+    @Path("builds")
+    BuildList getBuilds(@PathParam("namespace") String namespace);
+
+    @POST
+    @Path("builds")
+    String createBuild(Build entity, @PathParam("namespace") String namespace) throws Exception;
+
+    @GET
+    @Path("builds/{name}")
+    Build getBuild(@PathParam("name") @NotNull String name, @PathParam("namespace") String
namespace);
+
+    @PUT
+    @Path("builds/{name}")
+    @Consumes("application/json")
+    String updateBuild(@PathParam("name") @NotNull String name, Build entity, @PathParam("namespace")
String namespace) throws Exception;
+
+    @DELETE
+    @Path("builds/{name}")
+    String deleteBuild(@PathParam("name") @NotNull String name, @PathParam("namespace") String
namespace);
+
+
+    // BuildConfigs
+    //-------------------------------------------------------------------------
+
+    @GET
+    @Path("buildconfigs")
+    BuildConfigList getBuildConfigs(@PathParam("namespace") String namespace);
+
+    @POST
+    @Path("buildconfigs")
+    String createBuildConfig(BuildConfig entity, @PathParam("namespace") String namespace)
throws Exception;
+
+    @GET
+    @Path("buildconfigs/{name}")
+    BuildConfig getBuildConfig(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+    @PUT
+    @Path("buildconfigs/{name}")
+    @Consumes("application/json")
+    String updateBuildConfig(@PathParam("name") @NotNull String name, BuildConfig entity,
@PathParam("namespace") String namespace) throws Exception;
+
+    @DELETE
+    @Path("buildconfigs/{name}")
+    String deleteBuildConfig(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+
+    // BuildConfigHooks
+    //-------------------------------------------------------------------------
+    @POST
+    @Path("buildconfigHooks/{name}/{secret}/{type}")
+    @Produces("text/plain")
+    @Consumes("application/json")
+    String triggerBuild(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace,
+                        @PathParam("secret") @NotNull String secret,
+                        @PathParam("type") @NotNull String type,
+                        byte[] body);
+
+
+    // ImageRepositorys
+    //-------------------------------------------------------------------------
+
+    @GET
+    @Path("imagestreams")
+    ImageStreamList getImageStreams(@PathParam("namespace") String namespace);
+
+    @POST
+    @Path("imagestreams")
+    String createImageStream(ImageStream entity, @PathParam("namespace") String namespace)
throws Exception;
+
+    @GET
+    @Path("imagestreams/{name}")
+    ImageStream getImageStream(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+    @PUT
+    @Path("imagestreams/{name}")
+    @Consumes("application/json")
+    String updateImageStream(@PathParam("name") @NotNull String name, ImageStream entity,
@PathParam("namespace") String namespace) throws Exception;
+
+    @DELETE
+    @Path("imagestreams/{name}")
+    String deleteImageStream(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+
+    // DeploymentConfigs
+    //-------------------------------------------------------------------------
+
+    @GET
+    @Path("deploymentconfigs")
+    DeploymentConfigList getDeploymentConfigs(@PathParam("namespace") String namespace);
+
+    @POST
+    @Path("deploymentconfigs")
+    String createDeploymentConfig(DeploymentConfig entity, @PathParam("namespace") String
namespace) throws Exception;
+
+    @GET
+    @Path("deploymentconfigs/{name}")
+    DeploymentConfig getDeploymentConfig(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+    @PUT
+    @Path("deploymentconfigs/{name}")
+    @Consumes("application/json")
+    String updateDeploymentConfig(@PathParam("name") @NotNull String name, DeploymentConfig
entity, @PathParam("namespace") String namespace) throws Exception;
+
+    @DELETE
+    @Path("deploymentconfigs/{name}")
+    String deleteDeploymentConfig(@PathParam("name") @NotNull String name, @PathParam("namespace")
String namespace);
+
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesFactory.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesFactory.java
b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesFactory.java
new file mode 100644
index 0000000..9877ecb
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesFactory.java
@@ -0,0 +1,384 @@
+/**
+ *  Copyright 2005-2014 Red Hat, Inc.
+ *
+ *  Red Hat licenses this file to you 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.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.fabric8.kubernetes.api.extensions.Configs;
+import io.fabric8.kubernetes.api.model.config.Config;
+import io.fabric8.kubernetes.api.model.config.Context;
+import io.fabric8.utils.Strings;
+import io.fabric8.utils.Systems;
+import io.fabric8.utils.cxf.AuthorizationHeaderFilter;
+import io.fabric8.utils.cxf.WebClients;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.core.MediaType;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A simple helper class for creating instances of Kubernetes
+ */
+public class KubernetesFactory {
+    public static final String KUBERNETES_SCHEMA_JSON = "schema/kube-schema.json";
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    public static final String DEFAULT_KUBERNETES_MASTER = "http://localhost:8080";
+
+    public static final String KUBERNETES_TRUST_ALL_CERIFICATES = "KUBERNETES_TRUST_CERT";
+
+    public static final String KUBERNETES_SERVICE_HOST_ENV_VAR = "KUBERNETES_SERVICE_HOST";
+    public static final String KUBERNETES_SERVICE_PORT_ENV_VAR = "KUBERNETES_SERVICE_PORT";
+    public static final String KUBERNETES_MASTER_ENV_VAR = "KUBERNETES_MASTER";
+    public static final String KUBERNETES_CA_CERTIFICATE_FILE_ENV_VAR = "KUBERNETES_CA_CERTIFICATE_FILE";
+    public static final String KUBERNETES_CLIENT_CERTIFICATE_FILE_ENV_VAR = "KUBERNETES_CLIENT_CERTIFICATE_FILE";
+    public static final String KUBERNETES_CLIENT_KEY_FILE_ENV_VAR = "KUBERNETES_CLIENT_KEY_FILE";
+    public static final String KUBERNETES_CLIENT_KEY_DATA_ENV_VAR = "KUBERNETES_CLIENT_KEY_DATA";
+    public static final String KUBERNETES_CA_CERTIFICATE_DATA_ENV_VAR = "KUBERNETES_CA_CERTIFICATE_DATA";
+    public static final String KUBERNETES_CLIENT_CERTIFICATE_DATA_ENV_VAR = "KUBERNETES_CLIENT_CERTIFICATE_DATA";
+    public static final String KUBERNETES_CLIENT_KEY_ALGO_ENV_VAR = "KUBERNETES_CLIENT_KEY_ALGO";
+    public static final String KUBERNETES_CLIENT_KEY_PASSWORD_ENV_VAR = "KUBERNETES_CLIENT_KEY_PASSWORD";
+    public static final String KUBERNETES_MASTER_SYSTEM_PROPERTY = "kubernetes.master";
+    public static final String KUBERNETES_VERIFY_SYSTEM_PROPERTY = "kubernetes.verify";
+
+    private String address;
+    private boolean verifyAddress = true;
+    private boolean trustAllCerts = false;
+
+    private File caCertFile;
+    private File clientCertFile;
+    private File clientKeyFile;
+    private String caCertData;
+    private String clientCertData;
+    private String clientKeyData;
+    private String clientKeyAlgo = "RSA";
+    private char[] clientKeyPassword = new char[]{};
+    private String username;
+    private String password;
+
+    public KubernetesFactory() {
+        this(null);
+    }
+
+    public KubernetesFactory(String address) {
+        this(address, Boolean.parseBoolean(System.getProperty(KUBERNETES_VERIFY_SYSTEM_PROPERTY,
"true")));
+    }
+
+    public KubernetesFactory(String address, boolean verifyAddress) {
+        this.verifyAddress = verifyAddress;
+        init();
+        initAddress(address);
+    }
+
+    protected void initAddress(String address) {
+        if (Strings.isNullOrBlank(address)) {
+            setAddress(findKubernetesMaster());
+        } else {
+            setAddress(address);
+        }
+    }
+
+    protected String findKubernetesMaster() {
+        return resolveHttpKubernetesMaster();
+    }
+
+    private void init() {
+        if (System.getenv(KUBERNETES_TRUST_ALL_CERIFICATES) != null) {
+            this.trustAllCerts = Boolean.valueOf(System.getenv(KUBERNETES_TRUST_ALL_CERIFICATES));
+        } else if (System.getenv(KUBERNETES_CA_CERTIFICATE_FILE_ENV_VAR) != null) {
+            File candidateCaCertFile = new File(System.getenv(KUBERNETES_CA_CERTIFICATE_FILE_ENV_VAR));
+            if (candidateCaCertFile.exists() && candidateCaCertFile.canRead()) {
+                this.caCertFile = candidateCaCertFile;
+            } else {
+                log.error("Specified CA certificate file {} does not exist or is not readable",
candidateCaCertFile);
+            }
+        }
+
+        if (System.getenv(KUBERNETES_CA_CERTIFICATE_DATA_ENV_VAR) != null) {
+            this.caCertData = System.getenv(KUBERNETES_CA_CERTIFICATE_DATA_ENV_VAR);
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_CERTIFICATE_FILE_ENV_VAR) != null) {
+            File candidateClientCertFile = new File(System.getenv(KUBERNETES_CLIENT_CERTIFICATE_FILE_ENV_VAR));
+            if (candidateClientCertFile.exists() && candidateClientCertFile.canRead())
{
+                this.clientCertFile = candidateClientCertFile;
+            } else {
+                log.error("Specified client certificate file {} does not exist or is not
readable", candidateClientCertFile);
+            }
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_CERTIFICATE_DATA_ENV_VAR) != null) {
+            this.clientCertData = System.getenv(KUBERNETES_CLIENT_CERTIFICATE_DATA_ENV_VAR);
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_KEY_FILE_ENV_VAR) != null) {
+            File candidateClientKeyFile = new File(System.getenv(KUBERNETES_CLIENT_KEY_FILE_ENV_VAR));
+            if (candidateClientKeyFile.exists() && candidateClientKeyFile.canRead())
{
+                this.clientKeyFile = candidateClientKeyFile;
+            } else {
+                log.error("Specified client key file {} does not exist or is not readable",
candidateClientKeyFile);
+            }
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_KEY_DATA_ENV_VAR) != null) {
+            this.clientKeyData = System.getenv(KUBERNETES_CLIENT_KEY_DATA_ENV_VAR);
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_KEY_ALGO_ENV_VAR) != null) {
+            this.clientKeyAlgo = System.getenv(KUBERNETES_CLIENT_KEY_ALGO_ENV_VAR);
+        }
+
+        if (System.getenv(KUBERNETES_CLIENT_KEY_PASSWORD_ENV_VAR) != null) {
+            this.clientKeyPassword = System.getenv(KUBERNETES_CLIENT_KEY_PASSWORD_ENV_VAR).toCharArray();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "KubernetesFactory{" + address + '}';
+    }
+
+    public Kubernetes createKubernetes() {
+        return createWebClient(Kubernetes.class);
+    }
+
+    public KubernetesExtensions createKubernetesExtensions() {
+        return createWebClient(KubernetesExtensions.class);
+    }
+
+    public KubernetesGlobalExtensions createKubernetesGlobalExtensions() {
+        return createWebClient(KubernetesGlobalExtensions.class);
+    }
+
+    /**
+     * Creates a JAXRS web client for the given JAXRS client
+     */
+    public <T> T createWebClient(Class<T> clientType) {
+        WebClient webClient = createWebClient();
+        return JAXRSClientFactory.fromClient(webClient, clientType);
+    }
+
+    public WebClient createWebClient() {
+        return createWebClient(address);
+    }
+
+    public WebClient createWebClient(String serviceAddress) {
+        List<Object> providers = createProviders();
+
+        AuthorizationHeaderFilter authorizationHeaderFilter = new AuthorizationHeaderFilter();
+        providers.add(authorizationHeaderFilter);
+
+        WebClient webClient = WebClient.create(serviceAddress, providers);
+        WebClients.configureUserAndPassword(webClient, this.username, this.password);
+        boolean registeredCert = false;
+        if (trustAllCerts) {
+            WebClients.disableSslChecks(webClient);
+        } else if (caCertFile != null || caCertData != null) {
+            WebClients.configureCaCert(webClient, this.caCertData, this.caCertFile);
+        }
+        if ((clientCertFile != null || clientCertData != null) && (clientKeyFile
!= null || clientKeyData != null)) {
+            WebClients.configureClientCert(webClient, this.clientCertData, this.clientCertFile,
this.clientKeyData, this.clientKeyFile, this.clientKeyAlgo, this.clientKeyPassword);
+            registeredCert = true;
+        }
+        if (!registeredCert) {
+            String token = findToken();
+            if (Strings.isNotBlank(token)) {
+                String authHeader = "Bearer " + token;
+                authorizationHeaderFilter.setAuthorizationHeader(authHeader);
+            }
+        }
+        return webClient;
+    }
+
+    public WebSocketClient createWebSocketClient() throws Exception {
+        SslContextFactory sslContextFactory = null;
+        if (trustAllCerts) {
+            sslContextFactory = new SslContextFactory(trustAllCerts);
+        } else if (caCertData != null || caCertFile != null) {
+            KeyStore trustStore = WebClients.createTrustStore(caCertData, caCertFile);
+            sslContextFactory = new SslContextFactory();
+            sslContextFactory.setTrustStore(trustStore);
+        }
+        if ((clientCertFile != null || clientCertData != null) && (clientKeyFile
!= null || clientKeyData != null)) {
+            if (sslContextFactory == null) {
+                sslContextFactory = new SslContextFactory();
+            }
+            KeyStore keyStore = WebClients.createKeyStore(this.clientCertData, this.clientCertFile,
this.clientKeyData, this.clientKeyFile, this.clientKeyAlgo, this.clientKeyPassword);
+            sslContextFactory = new SslContextFactory();
+            sslContextFactory.setKeyStore(keyStore);
+        }
+
+        sslContextFactory.setIncludeProtocols("TLSv1", "TLSv1.1", "TLSv1.2");
+
+        WebSocketClient client = new WebSocketClient(sslContextFactory);
+
+        return client;
+    }
+
+    public String findToken() {
+        String token = getServiceAccountToken();
+        if (Strings.isNotBlank(token)) {
+            return token;
+        }
+        return findOpenShiftToken();
+    }
+
+    public String getServiceAccountToken() {
+        try {
+            return new String(Files.readAllBytes(Paths.get(Kubernetes.SERVICE_ACCOUNT_TOKEN_FILE)));
+        } catch (IOException e) {
+            log.debug("Cannot read service account token");
+        }
+        return null;
+    }
+
+    public String findOpenShiftToken() {
+        Config config = Configs.parseConfigs();
+        if (config != null) {
+            Context context = Configs.getCurrentContext(config);
+            if (context != null) {
+                return Configs.getUserToken(config, context);
+            }
+        }
+        return null;
+    }
+
+    protected List<Object> createProviders() {
+        List<Object> providers = new ArrayList<Object>();
+        Annotations[] annotationsToUse = JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS;
+        ObjectMapper objectMapper = createObjectMapper();
+        providers.add(new JacksonJaxbJsonProvider(objectMapper, annotationsToUse));
+        providers.add(new PlainTextJacksonProvider(objectMapper, annotationsToUse));
+        providers.add(new ExceptionResponseMapper());
+        //providers.add(new JacksonIntOrStringConfig(objectMapper));
+        return providers;
+    }
+
+
+    /**
+     * Lets accept plain text too as if its JSON to work around some issues with the REST
API and remote kube....
+     */
+    @javax.ws.rs.ext.Provider
+    @javax.ws.rs.Consumes({"text/plain"})
+    @javax.ws.rs.Produces({"text/plain"})
+    public static class PlainTextJacksonProvider extends JacksonJaxbJsonProvider {
+        public PlainTextJacksonProvider(ObjectMapper mapper, Annotations[] annotationsToUse)
{
+            super(mapper, annotationsToUse);
+        }
+
+        @Override
+        protected boolean hasMatchingMediaType(MediaType mediaType) {
+            boolean answer = super.hasMatchingMediaType(mediaType);
+            String type = mediaType.getType();
+            String subtype = mediaType.getSubtype();
+            if (!answer && type.equals("text")) {
+                answer = super.hasMatchingMediaType(MediaType.APPLICATION_JSON_TYPE);
+            }
+            return answer;
+        }
+    }
+
+    public String getKubernetesMaster() {
+        String answer = address;
+        int idx = answer.lastIndexOf(":");
+        if (idx > 0) {
+            answer = answer.substring(0, idx);
+        }
+        idx = answer.lastIndexOf(":");
+        if (idx > 0) {
+            answer = answer.substring(idx + 1);
+        }
+        idx = answer.lastIndexOf("/");
+        if (idx > 0) {
+            answer = answer.substring(idx + 1);
+        }
+        return answer;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+        if (Strings.isNullOrBlank(address)) {
+            this.address = findKubernetesMaster();
+        }
+
+        if (verifyAddress) {
+            try {
+                URL url = new URL(this.address);
+                if (KubernetesHelper.isServiceSsl(url.getHost(), url.getPort(), true)) {
+                    this.address = "https://" + url.getHost() + ":" + url.getPort();
+                } else {
+                    this.address = "http://" + url.getHost() + ":" + url.getPort();
+                }
+            } catch (MalformedURLException e) {
+                throw new IllegalArgumentException("Invalid kubernetes master address", e);
+            }
+        }
+    }
+
+    // Helpers
+
+    public static String resolveHttpKubernetesMaster() {
+        String kubernetesMaster = resolveKubernetesMaster();
+        if (kubernetesMaster.startsWith("tcp:")) {
+            return "https:" + kubernetesMaster.substring(4);
+        }
+        return kubernetesMaster;
+    }
+
+    public static String resolveKubernetesMaster() {
+        String hostEnvVar = KUBERNETES_SERVICE_HOST_ENV_VAR;
+        String portEnvVar = KUBERNETES_SERVICE_PORT_ENV_VAR;
+        String proto = "https";
+
+        // First let's check if it's available as a kubernetes service like it should be...
+        String kubernetesMaster = System.getenv(hostEnvVar);
+        if (Strings.isNotBlank(kubernetesMaster)) {
+            kubernetesMaster = proto + "://" + kubernetesMaster + ":" + System.getenv(portEnvVar);
+        } else {
+            // If not then fall back to KUBERNETES_MASTER env var
+            kubernetesMaster = Systems.getSystemPropertyOrEnvVar(KUBERNETES_MASTER_SYSTEM_PROPERTY,
KUBERNETES_MASTER_ENV_VAR, DEFAULT_KUBERNETES_MASTER);
+        }
+        return kubernetesMaster;
+    }
+
+    /**
+     * Creates a configured Jackson object mapper for parsing JSON
+     */
+    public static ObjectMapper createObjectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        return mapper;
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesGlobalExtensions.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesGlobalExtensions.java
b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesGlobalExtensions.java
new file mode 100644
index 0000000..9ce945f
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-api/src/main/java/io/fabric8/kubernetes/api/KubernetesGlobalExtensions.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2005-2014 Red Hat, Inc.
+ * <p/>
+ * Red Hat licenses this file to you 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.api;
+
+import io.fabric8.openshift.api.model.OAuthClient;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+/**
+ * Various Kubernetes extensions defined in the OpenShift project which are namespace agnostic
+ */
+@Path("osapi/v1beta3")
+@Produces("application/json")
+@Consumes("application/json")
+public interface KubernetesGlobalExtensions {
+
+    @POST
+    @Path("oauthclients")
+    @Consumes("application/json")
+    String createOAuthClient(OAuthClient entity) throws Exception;
+
+    @GET
+    @Path("oauthclients/{name}")
+    OAuthClient getOAuthClient(@PathParam("name") @NotNull String name);
+
+    @PUT
+    @Path("oauthclients/{name}")
+    @Consumes("application/json")
+    String updateOAuthClient(@PathParam("name") @NotNull String name, OAuthClient entity)
throws Exception;
+
+    @DELETE
+    @Path("oauthclients/{name}")
+    String deleteOAuthClient(@PathParam("name") @NotNull String name);
+
+}


Mime
View raw message