x
/
fuel-ccp
Code Issues Proposed changes

Drop PetSet support 

Change-Id: I2547c925671ce411acf68a1e8a2020064aaf8608
This commit is contained in:
Andrey Pavlov 2016-11-10 16:04:35 +03:00
parent 95d2484ed4
commit 06a012c593
6 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/dsl.rst
View File

@ -85,8 +85,7 @@ service
+---------------+-----------------------------------------------+----------+------------------+------------+ +---------------+-----------------------------------------------+----------+------------------+------------+
| kind | Kind of k8s object to use for containers | false | one of: | Deployment | | kind | Kind of k8s object to use for containers | false | one of: | Deployment |
| | deployment | | ["Deployment", | | | | deployment | | ["Deployment", | |
| | | | "Daemonset", | | | | | | "DaemonSet"] | |
| | | | "PetSet"] | |
+---------------+-----------------------------------------------+----------+------------------+------------+ +---------------+-----------------------------------------------+----------+------------------+------------+
| containers | List of containers under multi-container pod | true | container_ array | | | containers | List of containers under multi-container pod | true | container_ array | |
+---------------+-----------------------------------------------+----------+------------------+------------+ +---------------+-----------------------------------------------+----------+------------------+------------+

6
fuel_ccp/common/utils.py
View File

@ -1,4 +1,3 @@
import itertools
import logging import logging
import os import os
import pkg_resources import pkg_resources
@ -94,8 +93,7 @@ def get_deploy_components_info(rendering_context=None):
def get_deployed_components(): def get_deployed_components():
"""Returns set of deployed components.""" """Returns set of deployed components."""
deployed_deployments = kubernetes.list_cluster_deployments() deployed_deployments = kubernetes.list_cluster_deployments()
deployed_petsets = kubernetes.list_cluster_petsets() deployed_components = set(
deployed_components = set(kubernetes.get_object_names( kubernetes.get_object_names(deployed_deployments)
itertools.chain(deployed_deployments, deployed_petsets))
) )
return deployed_components return deployed_components

16
fuel_ccp/deploy.py
View File

@ -109,18 +109,11 @@ def parse_role(component, topology, configmaps):
raise RuntimeError("Replicas couldn't be specified for services " raise RuntimeError("Replicas couldn't be specified for services "
"implemented using Kubernetes DaemonSet") "implemented using Kubernetes DaemonSet")
replicas = len(set(topology[service_name])) replicas = len(set(topology[service_name]))
obj = templates.serialize_deployment(service_name, cont_spec,
affinity, replicas,
component_name)
elif service.get("kind") == "PetSet":
replicas = replicas or 1
obj = templates.serialize_petset(service_name, cont_spec,
affinity, replicas, component_name)
else: else:
replicas = replicas or 1 replicas = replicas or 1
obj = templates.serialize_deployment(service_name, cont_spec,
affinity, replicas, obj = templates.serialize_deployment(service_name, cont_spec,
component_name) affinity, replicas, component_name)
kubernetes.process_object(obj) kubernetes.process_object(obj)
_process_ports(service) _process_ports(service)
@ -186,8 +179,7 @@ def _process_ports(service):
if ingress_host: if ingress_host:
ingress_rules.append(templates.serialize_ingress_rule( ingress_rules.append(templates.serialize_ingress_rule(
service["name"], ingress_host, source_port)) service["name"], ingress_host, source_port))
service_template = templates.serialize_service( service_template = templates.serialize_service(service["name"], ports)
service["name"], ports, service.get("kind") == "PetSet")
kubernetes.process_object(service_template) kubernetes.process_object(service_template)
if ingress_rules: if ingress_rules:

7
fuel_ccp/kubernetes.py
View File

@ -151,13 +151,6 @@ def list_cluster_services():
selector="ccp=true") selector="ccp=true")
def list_cluster_petsets():
client = get_client()
return pykube.PetSet.objects(client).filter(
namespace=CONF.kubernetes.namespace,
selector="ccp=true")
def get_object_names(items): def get_object_names(items):
names = [] names = []
for item in items: for item in items:

30
fuel_ccp/templates.py
View File

@ -318,36 +318,6 @@ def serialize_deployment(name, spec, affinity, replicas, component_name):
} }
def serialize_petset(name, spec, affinity, replicas, component_name):
annotations = {
"pod.alpha.kubernetes.io/initialized": "true"
}
annotations.update(affinity)
return {
"apiVersion": "apps/v1alpha1",
"kind": "PetSet",
"metadata": {
"name": name
},
"spec": {
"serviceName": name,
"replicas": replicas,
"template": {
"metadata": {
"annotations": annotations,
"labels": {
"ccp": "true",
"app": name,
"ccp-component": component_name
}
},
"spec": spec
}
}
}
def serialize_affinity(service, topology): def serialize_affinity(service, topology):
policy = { policy = {
"nodeAffinity": { "nodeAffinity": {

2
fuel_ccp/validation/service.py
View File

@ -183,7 +183,7 @@ SERVICE_SCHEMA = {
} }
}, },
"kind": { "kind": {
"enum": ["Deployment", "DaemonSet", "PetSet"] "enum": ["Deployment", "DaemonSet"]
}, },
"hostNetwork": { "hostNetwork": {
"type": "boolean" "type": "boolean"