Webapp deploy (#662)

stack_orchestrator/deploy/k8s/cluster_info.py

@@ -29,18 +29,19 @@ from stack_orchestrator.deploy.images import remote_tag_for_image
 class ClusterInfo:
     parsed_pod_yaml_map: Any
     image_set: Set[str] = set()
-    app_name: str = "test-app"
+    app_name: str
     environment_variables: DeployEnvVars
     spec: Spec
 
     def __init__(self) -> None:
         pass
 
-    def int(self, pod_files: List[str], compose_env_file, spec: Spec):
+    def int(self, pod_files: List[str], compose_env_file, deployment_name, spec: Spec):
         self.parsed_pod_yaml_map = parsed_pod_files_map_from_file_names(pod_files)
         # Find the set of images in the pods
         self.image_set = images_for_deployment(pod_files)
         self.environment_variables = DeployEnvVars(env_var_map_from_file(compose_env_file))
+        self.app_name = deployment_name
         self.spec = spec
         if (opts.o.debug):
             print(f"Env vars: {self.environment_variables.map}")
@@ -67,6 +68,8 @@ class ClusterInfo:
                 proxy_to = route["proxy-to"]
                 if opts.o.debug:
                     print(f"proxy config: {path} -> {proxy_to}")
+                # proxy_to has the form <service>:<port>
+                proxy_to_port = int(proxy_to.split(":")[1])
                 paths.append(client.V1HTTPIngressPath(
                     path_type="Prefix",
                     path=path,
@@ -75,7 +78,7 @@ class ClusterInfo:
                             # TODO: this looks wrong
                             name=f"{self.app_name}-service",
                             # TODO: pull port number from the service
-                            port=client.V1ServiceBackendPort(number=80)
+                            port=client.V1ServiceBackendPort(number=proxy_to_port)
                         )
                     )
                 ))
@@ -101,14 +104,23 @@ class ClusterInfo:
             )
         return ingress
 
+    # TODO: suppoprt multiple services
     def get_service(self):
+        for pod_name in self.parsed_pod_yaml_map:
+            pod = self.parsed_pod_yaml_map[pod_name]
+            services = pod["services"]
+            for service_name in services:
+                service_info = services[service_name]
+                port = int(service_info["ports"][0])
+                if opts.o.debug:
+                    print(f"service port: {port}")
         service = client.V1Service(
             metadata=client.V1ObjectMeta(name=f"{self.app_name}-service"),
             spec=client.V1ServiceSpec(
                 type="ClusterIP",
                 ports=[client.V1ServicePort(
-                    port=80,
-                    target_port=80
+                    port=port,
+                    target_port=port
                 )],
                 selector={"app": self.app_name}
             )
@@ -165,6 +177,10 @@ class ClusterInfo:
                 container_name = service_name
                 service_info = services[service_name]
                 image = service_info["image"]
+                port = int(service_info["ports"][0])
+                if opts.o.debug:
+                    print(f"image: {image}")
+                    print(f"service port: {port}")
                 # Re-write the image tag for remote deployment
                 image_to_use = remote_tag_for_image(
                     image, self.spec.get_image_registry()) if self.spec.get_image_registry() is not None else image
@@ -173,7 +189,7 @@ class ClusterInfo:
                     name=container_name,
                     image=image_to_use,
                     env=envs_from_environment_variables_map(self.environment_variables.map),
-                    ports=[client.V1ContainerPort(container_port=80)],
+                    ports=[client.V1ContainerPort(container_port=port)],
                     volume_mounts=volume_mounts,
                     resources=client.V1ResourceRequirements(
                         requests={"cpu": "100m", "memory": "200Mi"},

stack_orchestrator/deploy/k8s/deploy_k8s.py

@@ -55,7 +55,7 @@ class K8sDeployer(Deployer):
         self.deployment_context = deployment_context
         self.kind_cluster_name = compose_project_name
         self.cluster_info = ClusterInfo()
-        self.cluster_info.int(compose_files, compose_env_file, deployment_context.spec)
+        self.cluster_info.int(compose_files, compose_env_file, compose_project_name, deployment_context.spec)
         if (opts.o.debug):
             print(f"Deployment dir: {deployment_context.deployment_dir}")
             print(f"Compose files: {compose_files}")
@@ -126,6 +126,8 @@ class K8sDeployer(Deployer):
         # TODO: disable ingress for kind
         ingress: client.V1Ingress = self.cluster_info.get_ingress()
 
+        if opts.o.debug:
+            print(f"Sending this ingress: {ingress}")
         ingress_resp = self.networking_api.create_namespaced_ingress(
             namespace=self.k8s_namespace,
             body=ingress