The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
-
+## [3.5.1]
+* DCAEGEN2-2388 - Extend DCAE CFY K8S plugin to support IPv6 services.
+* Add properties to ports list to support IPv6 services
## [3.5.0]
* DCAEGEN2-2388 - Extend DCAE CFY K8S plugin to support IPv6 services.
* Update kubernetes python plugin to version 12.0.1
ports on the Kubernetes host's external interface. Setting `<host port>` to a non-zero value will expose that port on the external interfaces
of every Kubernetes host in the cluster. (This uses the Kubernetes `NodePort` service type.)
+In dualstack Kubernetes environment, adding parameter ipv6 or ipv4, specify which ip family will be used.
+If ipv6 will be set in only ipv4 Kubernetes cluster, service will use ipv4 instead of declared ipv6.
+
+```yaml
+ports:
+ - concat: ['8000:31000']
+ ipv6: false
+ - concat: ['8000:31001']
+ ipv6: true
+```
+
#### `max_wait`
Integer - seconds to wait for component to become ready before throwing a `NonRecoverableError`. For example:
def _create_exposed_service_name(component_name):
return ("x{0}".format(component_name))[:63]
+def _create_exposed_v6_service_name(component_name):
+ return ("x{0}-ipv6".format(component_name))[:63]
+
def _configure_api(location=None):
# Look for a kubernetes config file
if os.path.exists(K8S_CONFIG_PATH):
return deployment
-def _create_service_object(service_name, component_name, service_ports, annotations, labels, service_type):
+
+def _create_service_object(service_name, component_name, service_ports, annotations, labels, service_type, ip_family):
service_spec = client.V1ServiceSpec(
ports=service_ports,
- selector={"app" : component_name},
- type=service_type
+ selector={"app": component_name},
+ type=service_type,
+ ip_family=ip_family
)
if annotations:
metadata = client.V1ObjectMeta(name=_create_service_name(service_name), labels=labels, annotations=annotations)
container_ports = []
port_map = {}
for p in port_list:
+ ipv6 = False
+ if type(p) is dict:
+ ipv6 = "ipv6" in p and p['ipv6']
+ p = "".join(str(v) for v in p['concat'])
m = PORTS.match(p.strip())
if m:
cport = int(m.group(1))
- hport = int (m.group(4))
+ hport = int(m.group(4))
if m.group(3):
proto = (m.group(3)).upper()
else:
proto = "TCP"
- container_ports.append((cport, proto))
- port_map[(cport, proto)] = hport
+ port = (cport, proto)
+ if port not in container_ports:
+ container_ports.append(port)
+ port_map[(cport, proto, ipv6)] = hport
else:
raise ValueError("Bad port specification: {0}".format(p))
return container_ports, port_map
+
def _parse_volumes(volume_list):
volumes = []
volume_mounts = []
}[output_type]
return destination_paths_template.format(tls_cert_dir)
+
def _process_port_map(port_map):
- service_ports = [] # Ports exposed internally on the k8s network
- exposed_ports = [] # Ports to be mapped to ports on the k8s nodes via NodePort
- for (cport, proto), hport in port_map.items():
+ service_ports = [] # Ports exposed internally on the k8s network
+ exposed_ports = [] # Ports to be mapped to ports on the k8s nodes via NodePort
+ exposed_ports_ipv6 = []
+ for (cport, proto, ipv6), hport in port_map.items():
name = "xport-{0}-{1}".format(proto[0].lower(), cport)
cport = int(cport)
hport = int(hport)
- service_ports.append(client.V1ServicePort(port=cport, protocol=proto, name=name[1:]))
+ port = client.V1ServicePort(port=cport, protocol=proto, name=name[1:])
+ if port not in service_ports:
+ service_ports.append(port)
if hport != 0:
- exposed_ports.append(client.V1ServicePort(port=cport, protocol=proto, node_port=hport, name=name))
- return service_ports, exposed_ports
+ if ipv6:
+ exposed_ports_ipv6.append(client.V1ServicePort(port=cport, protocol=proto, node_port=hport, name=name))
+ else:
+ exposed_ports.append(client.V1ServicePort(port=cport, protocol=proto, node_port=hport, name=name))
+ return service_ports, exposed_ports, exposed_ports_ipv6
def _service_exists(location, namespace, component_name):
exists = False
# Create service(s), if a port mapping is specified
if port_map:
- service_ports, exposed_ports = _process_port_map(port_map)
+ service_ports, exposed_ports, exposed_ports_ipv6 = _process_port_map(port_map)
# Create a ClusterIP service for access via the k8s network
- service = _create_service_object(_create_service_name(component_name), component_name, service_ports, None, labels, "ClusterIP")
+ service = _create_service_object(_create_service_name(component_name), component_name, service_ports, None,
+ labels, "ClusterIP", "IPv4")
core.create_namespaced_service(namespace, service)
cip_service_created = True
deployment_description["services"].append(_create_service_name(component_name))
# If there are ports to be exposed on the k8s nodes, create a "NodePort" service
if exposed_ports:
exposed_service = \
- _create_service_object(_create_exposed_service_name(component_name), component_name, exposed_ports, '', labels, "NodePort")
+ _create_service_object(_create_exposed_service_name(component_name), component_name, exposed_ports,
+ '', labels, "NodePort", "IPv4")
core.create_namespaced_service(namespace, exposed_service)
deployment_description["services"].append(_create_exposed_service_name(component_name))
+ if exposed_ports_ipv6:
+ exposed_service_ipv6 = \
+ _create_service_object(_create_exposed_v6_service_name(component_name), component_name,
+ exposed_ports_ipv6, '', labels, "NodePort", "IPv6")
+ core.create_namespaced_service(namespace, exposed_service_ipv6)
+ deployment_description["services"].append(_create_exposed_v6_service_name(component_name))
+
except Exception as e:
# If the ClusterIP service was created, delete the service:
if cip_service_created:
k8s:
executor: 'central_deployment_agent'
package_name: k8splugin
- package_version: 3.5.0
+ package_version: 3.5.1
data_types:
--- /dev/null
+tosca_definitions_version: cloudify_dsl_1_3
+
+description: >
+ Simple blueprint to launch nginx as a "service component"
+ Exposes port as a NodePort service with ipv6
+ If kubernetes doesn't have ipv6, service will get ipv4
+
+imports:
+ - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
+ - plugin:k8splugin?version=>=3.0.0,<4.0.0
+
+node_templates:
+ web_server:
+ type: dcae.nodes.ContainerizedServiceComponent
+ properties:
+ service_component_type: 'nginx-web'
+ image: nginx
+ docker_config:
+ healthcheck:
+ type: "http"
+ endpoint: "/"
+ ports:
+ - '80:0'
+ - concat: ['80:30581']
+ ipv6: true
<groupId>org.onap.dcaegen2.platform.plugins</groupId>
<artifactId>k8s</artifactId>
<name>k8s-plugin</name>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
setup(
name='k8splugin',
description='Cloudify plugin for containerized components deployed using Kubernetes',
- version="3.5.0",
+ version="3.5.1",
author='J. F. Lucas, Michael Hwang, Tommy Carpenter, Joanna Jeremicz, Sylwia Jakubek, Jan Malkiewicz, Remigiusz Janeczek, Piotr Marcinkiewicz',
packages=['k8splugin','k8sclient','configure'],
zip_safe=False,
good_ports = [{"in": input, "ex": expected}
for (input, expected) in [
- ("9101:0", (9101, 0, "TCP")),
- ("9101/TCP:0", (9101, 0, "TCP")),
- ("9101/tcp:0", (9101, 0, "TCP")),
- ("9101/UDP:0", (9101, 0, "UDP")),
- ("9101/udp:0", (9101, 0, "UDP")),
- ("9101:31043", (9101, 31043, "TCP")),
- ("9101/TCP:31043", (9101, 31043, "TCP")),
- ("9101/tcp:31043", (9101, 31043, "TCP")),
- ("9101/UDP:31043", (9101, 31043, "UDP")),
- ("9101/udp:31043", (9101, 31043, "UDP"))
+ ({u'concat': [u'9101', u':', 0], u'ipv6': True}, (9101, 0, True, "TCP")),
+ ({u'concat': [u'9102', u':', 0], u'ipv6': False}, (9102, 0, False, "TCP")),
+ ({u'concat': [u'9103', u':', 36000], u'ipv6': True}, (9103, 36000, True, "TCP")),
+ ("9101/TCP:0", (9101, 0, False, "TCP")),
+ ("9101/tcp:0", (9101, 0, False, "TCP")),
+ ("9101/UDP:0", (9101, 0, False, "UDP")),
+ ("9101/udp:0", (9101, 0, False, "UDP")),
+ ("9101:31043", (9101, 31043, False, "TCP")),
+ ("9101/TCP:31043", (9101, 31043, False, "TCP")),
+ ("9101/tcp:31043", (9101, 31043, False, "TCP")),
+ ("9101/UDP:31043", (9101, 31043, False, "UDP")),
+ ("9101/udp:31043", (9101, 31043, False, "UDP"))
]
]
]
port_list = [
- "9101:0",
+ {u'concat': [u'9101', u':', 3023], u'ipv6': True},
+ {u'concat': [u'9102', u':', 0], u'ipv6': True},
+ {u'concat': [u'9103', u':', 0], u'ipv6': False},
"5053/tcp:5053",
"5053/udp:5053",
"9661:19661",
]
expected_port_map = {
- (9101,"TCP") : 0,
- (5053,"TCP") : 5053,
- (5053,"UDP") : 5053,
- (9661,"TCP") : 19661,
- (9661,"UDP") : 19661,
- (8080,"TCP") : 8080
+ (9101, "TCP", True): 3023,
+ (9102, "TCP", True): 0,
+ (9103, "TCP", False): 0,
+ (5053, "TCP", False): 5053,
+ (5053, "UDP", False): 5053,
+ (9661, "TCP", False): 19661,
+ (9661, "UDP", False): 19661,
+ (8080, "TCP", False): 8080
}
for test_case in good_ports:
container_ports, port_map = parse_ports([test_case["in"]])
- (cport, hport, proto) = test_case["ex"]
+ (cport, hport, ipv6, proto) = test_case["ex"]
assert container_ports == [(cport, proto)]
- assert port_map == {(cport, proto) : hport}
+ assert port_map == {(cport, proto, ipv6): hport}
for port in bad_ports:
with pytest.raises(ValueError):
# Good - Test just docker config ports and volumes
- test_kwargs = { "docker_config": { "ports": ["1:1", "2:2"],
+ test_kwargs = { "docker_config": { "ports": [{u'concat': [u'8080', u':', 0], u'ipv6': True}, "1:1"],
"volumes": [{"container": "somewhere", "host": "somewhere else"}] },
"service_id": None }
actual = tasks._enhance_docker_params(**test_kwargs)
- assert actual == {'envs': {}, 'docker_config': {'ports': ['1:1', '2:2'],
+ assert actual == {'envs': {}, 'docker_config': {'ports': [{u'concat': [u'8080', u':', 0], u'ipv6': True}, "1:1"],
'volumes': [{'host': 'somewhere else', 'container': 'somewhere'}]},
- 'ports': ['1:1', '2:2'], 'volumes': [{'host': 'somewhere else',
- 'container': 'somewhere'}], "service_id": None}
+ 'ports': [{u'concat': [u'8080', u':', 0], u'ipv6': True}, "1:1"], 'volumes': [{'host': 'somewhere else',
+ 'container': 'somewhere'}], "service_id": None}
# Good - Test just docker config ports and volumes with overrrides
Code Review / dcaegen2 / platform / plugins.git / commitdiff