cerc-io/stack-orchestrator
12
1
Fork 3
Code Issues 112 Pull Requests 22 Actions Packages Projects Releases 481 Wiki Activity

Implement logs command

Browse Source
This commit is contained in:
David Boreham 2023-10-27 10:15:42 -06:00
parent 9c226944e8
commit a9df9c0c07
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/deploy/k8s/deploy_k8s.py
View File

@ -17,15 +17,15 @@ from kubernetes import client, config
from app.deploy.deployer import Deployer from app.deploy.deployer import Deployer
from app.deploy.k8s.helpers import create_cluster, destroy_cluster, load_images_into_kind from app.deploy.k8s.helpers import create_cluster, destroy_cluster, load_images_into_kind
from app.deploy.k8s.helpers import pods_in_deployment from app.deploy.k8s.helpers import pods_in_deployment, log_stream_from_string
from app.deploy.k8s.cluster_info import ClusterInfo from app.deploy.k8s.cluster_info import ClusterInfo
from app.opts import opts from app.opts import opts
class K8sDeployer(Deployer): class K8sDeployer(Deployer):
name: str = "k8s" name: str = "k8s"
k8s_client: client core_api: client.CoreV1Api
k8s_api: client.AppsV1Api apps_api: client.AppsV1Api
kind_cluster_name: str kind_cluster_name: str
cluster_info : ClusterInfo cluster_info : ClusterInfo
@ -40,8 +40,8 @@ class K8sDeployer(Deployer):
def connect_api(self): def connect_api(self):
config.load_kube_config(context=f"kind-{self.kind_cluster_name}") config.load_kube_config(context=f"kind-{self.kind_cluster_name}")
self.k8s_client = client.CoreV1Api() self.core_api = client.CoreV1Api()
self.k8s_api = client.AppsV1Api() self.apps_api = client.AppsV1Api()
def up(self, detach, services): def up(self, detach, services):
# Create the kind cluster # Create the kind cluster
@ -52,7 +52,7 @@ class K8sDeployer(Deployer):
# Process compose files into a Deployment # Process compose files into a Deployment
deployment = self.cluster_info.get_deployment() deployment = self.cluster_info.get_deployment()
# Create the k8s objects # Create the k8s objects
resp = self.k8s_api.create_namespaced_deployment( resp = self.apps_api.create_namespaced_deployment(
body=deployment, namespace="default" body=deployment, namespace="default"
) )
@ -69,11 +69,11 @@ class K8sDeployer(Deployer):
def ps(self): def ps(self):
self.connect_api() self.connect_api()
# Call whatever API we need to get the running container list # Call whatever API we need to get the running container list
ret = self.k8s_client.list_pod_for_all_namespaces(watch=False) ret = self.core_api.list_pod_for_all_namespaces(watch=False)
if ret.items: if ret.items:
for i in ret.items: for i in ret.items:
print("%s\t%s\t%s" % (i.status.pod_ip, i.metadata.namespace, i.metadata.name)) print("%s\t%s\t%s" % (i.status.pod_ip, i.metadata.namespace, i.metadata.name))
ret = self.k8s_client.list_node(pretty=True, watch=False) ret = self.core_api.list_node(pretty=True, watch=False)
return [] return []
def port(self, service, private_port): def port(self, service, private_port):
@ -87,12 +87,12 @@ class K8sDeployer(Deployer):
def logs(self, services, tail, follow, stream): def logs(self, services, tail, follow, stream):
self.connect_api() self.connect_api()
pods = pods_in_deployment(self.k8s_api, "test-deployment") pods = pods_in_deployment(self.core_api, "test-deployment")
if len(pods) > 1: if len(pods) > 1:
print("Warning: more than one pod in the deployment") print("Warning: more than one pod in the deployment")
k8s_pod_name = pods[0] k8s_pod_name = pods[0]
log_data = self.k8s_api.read_namespaced_pod_log(k8s_pod_name, namespace="default", container="test") log_data = self.core_api.read_namespaced_pod_log(k8s_pod_name, namespace="default", container="test")
print(log_data) return log_stream_from_string(log_data)
def run(self, image, command, user, volumes, entrypoint=None): def run(self, image, command, user, volumes, entrypoint=None):
# We need to figure out how to do this -- check why we're being called first # We need to figure out how to do this -- check why we're being called first

18
app/deploy/k8s/helpers.py
View File

@ -41,9 +41,17 @@ def load_images_into_kind(kind_cluster_name: str, image_set: Set[str]):
_run_command(f"kind load docker-image {image} --name {kind_cluster_name}") _run_command(f"kind load docker-image {image} --name {kind_cluster_name}")
def pods_in_deployment(api: client.AppsV1Api, deployment_name: str): def pods_in_deployment(core_api: client.CoreV1Api, deployment_name: str):
# See: https://stackoverflow.com/a/73525759/1701505 pods = []
deployment_info = api.read_namespaced_deployment(deployment_name, "default") pod_response = core_api.list_namespaced_pod(namespace="default", label_selector="app=test-app")
if opts.o.debug: if opts.o.debug:
print(f"deployment: {deployment_info}") print(f"pod_response: {pod_response}")
return [] for pod_info in pod_response.items:
pod_name = pod_info.metadata.name
pods.append(pod_name)
return pods
def log_stream_from_string(s: str):
# Note response has to be UTF-8 encoded because the caller expects to decode it
yield ("ignore", s.encode())