From 05e95de3b9736160b4229232903e86706fb782e1 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Mon, 20 Apr 2020 13:25:47 -0400 Subject: Remove ContainerizedPlatformContainer from types Also allow environment variables to specified via docker_config Issue-ID: DCAEGEN2-1791 Issue-ID: DCAEGEN2-2215 Change-Id: If6b3b206856031d3c2aa3a5f787c1be30bdc4afd Signed-off-by: Jack Lucas --- k8s/k8sclient/k8sclient.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'k8s/k8sclient/k8sclient.py') diff --git a/k8s/k8sclient/k8sclient.py b/k8s/k8sclient/k8sclient.py index bd83322..e73d96a 100644 --- a/k8s/k8sclient/k8sclient.py +++ b/k8s/k8sclient/k8sclient.py @@ -21,7 +21,6 @@ import os import re import uuid -from msb import msb from kubernetes import config, client, stream # Default values for readiness probe @@ -442,7 +441,6 @@ def deploy(namespace, component_name, image, replicas, always_pull, k8sconfig, * {"host":{"path": "/path/on/host"}, "container":{"bind":"/path/on/container","mode":"rw_or_ro"} - ports: array of strings in the form "container_port:host_port" - env: map of name-value pairs ( {name0: value0, name1: value1...} - - msb_list: array of msb objects, where an msb object is as described in msb/msb.py. - log_info: an object with info for setting up ELK logging, with the form: {"log_directory": "/path/to/container/log/directory", "alternate_fb_path" : "/alternate/sidecar/log/path"} - tls_info: an object with info for setting up TLS (HTTPS), with the form: @@ -521,12 +519,8 @@ def deploy(namespace, component_name, image, replicas, always_pull, k8sconfig, * if port_map: service_ports, exposed_ports = _process_port_map(port_map) - # If there are ports to be exposed via MSB, set up the annotation for the service - msb_list = kwargs.get("msb_list") - annotations = msb.create_msb_annotation(msb_list) if msb_list else '' - # Create a ClusterIP service for access via the k8s network - service = _create_service_object(_create_service_name(component_name), component_name, service_ports, annotations, labels, "ClusterIP") + service = _create_service_object(_create_service_name(component_name), component_name, service_ports, None, labels, "ClusterIP") core.create_namespaced_service(namespace, service) cip_service_created = True deployment_description["services"].append(_create_service_name(component_name)) -- cgit 1.2.3-korg