Kubernetes - Image Pull Secrets moved to Cartridge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a3e5debd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a3e5debd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a3e5debd Branch: refs/heads/master Commit: a3e5debdfd38c8ae94c61b339dfcaee25ea09374 Parents: 4bb4874 Author: Chamila de Alwis <[email protected]> Authored: Tue Jan 26 16:42:21 2016 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Thu Jan 28 16:24:42 2016 +0530 ---------------------------------------------------------------------- .../iaases/kubernetes/KubernetesIaas.java | 9 +-- samples/cartridges/kubernetes/php-secret.json | 51 ++++++++++++++++ .../kubernetes-cluster-secret.json | 64 -------------------- 3 files changed, 56 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a3e5debd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index 8008c47..54966d3 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -210,10 +210,6 @@ public class KubernetesIaas extends Iaas { if (property.getName().startsWith(PAYLOAD_PARAMETER_PREFIX)) { String name = property.getName().replace(PAYLOAD_PARAMETER_PREFIX, ""); payload.add(new NameValuePair(name, property.getValue())); - }else{ - if (property.getName().equals(IMAGE_PULL_SECRETS)){ - imagePullSecrets.add(property.getValue()); - } } } } @@ -403,6 +399,11 @@ public class KubernetesIaas extends Iaas { memory = memoryProperty.getValue(); } + Property imagePullSecretsProperty = cartridge.getProperties().getProperty(IMAGE_PULL_SECRETS); + if (imagePullSecretsProperty != null){ + imagePullSecrets.add(imagePullSecretsProperty.getValue()); + } + IaasProvider iaasProvider = CloudControllerContext.getInstance() .getIaasProviderOfPartition(cartridge.getType(), partition.getId()); if (iaasProvider == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a3e5debd/samples/cartridges/kubernetes/php-secret.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/php-secret.json b/samples/cartridges/kubernetes/php-secret.json new file mode 100755 index 0000000..cdf4662 --- /dev/null +++ b/samples/cartridges/kubernetes/php-secret.json @@ -0,0 +1,51 @@ +{ + "type": "php", + "provider": "apache", + "category": "framework", + "host": "php.stratos.org", + "displayName": "php", + "description": "php Cartridge", + "version": "7", + "multiTenant": "false", + "loadBalancingIPType": "public", + "portMapping": [ + { + "name": "http-80", + "protocol": "http", + "port": "80", + "proxyPort": "8281", + "kubernetesPortType":"NodePort" + } + ], + "deployment": { + "baseDir": "/var/www" + }, + "iaasProvider": [ + { + "type": "kubernetes", + "imageId": "stratos/php:4.1.5", + "networkInterfaces": [ + ], + "property": [ + ] + } + ], + "property": [ + { + "name": "KUBERNETES_CONTAINER_CPU", + "value": "0" + }, + { + "name": "KUBERNETES_CONTAINER_MEMORY", + "value": "0" + }, + { + "name": "KUBERNETES_SERVICE_SESSION_AFFINITY", + "value": "ClientIP" + }, + { + "name": "IMAGE_PULL_SECRETS", + "value": "privateDockerSecret" + } + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a3e5debd/samples/kubernetes-clusters/kubernetes-cluster-secret.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-secret.json b/samples/kubernetes-clusters/kubernetes-cluster-secret.json deleted file mode 100644 index 18b1697..0000000 --- a/samples/kubernetes-clusters/kubernetes-cluster-secret.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "clusterId": "kubernetes-cluster-1", - "description": "Kubernetes Cluster 1", - "kubernetesMaster": { - "hostId": "master", - "hostname": "master.dev.kubernetes.org", - "privateIPAddress": "172.17.8.101", - "publicIPAddress": "172.17.8.101", - "property": [ - ] - }, - "portRange": { - "upper": "32767", - "lower": "30000" - }, - "kubernetesHosts": [ - { - "hostId": "minion-1", - "hostname": "minion-1.dev.kubernetes.org", - "privateIPAddress": "172.17.8.102", - "publicIPAddress": "172.17.8.102", - "property": [ - ] - }, - { - "hostId": "minion-2", - "hostname": "minion-2.dev.kubernetes.org", - "privateIPAddress": "172.17.8.103", - "publicIPAddress": "172.17.8.103", - "property": [ - ] - } - ], - "property": [ - { - "name": "payload_parameter.MB_URLS", - "value": "172.17.8.1:1883" - }, - { - "name": "payload_parameter.MB_USERNAME", - "value": "system" - }, - { - "name": "payload_parameter.MB_PASSWORD", - "value": "manager" - }, - { - "name": "payload_parameter.CEP_URLS", - "value": "172.17.8.1:7711" - }, - { - "name": "payload_parameter.LOG_LEVEL", - "value": "DEBUG" - }, - { - "name": "payload_parameter.METADATA_SERVICE_URL", - "value": "https://172.17.8.1:9443"; - }, - { - "name": "IMAGE_PULL_SECRETS", - "value": "privateDockerSecret" - } - ] -}
