Development client/server

Author: rcastley

workshop/demo-client/app.py

@@ -8,7 +8,7 @@
 
 year = datetime.now().year
 
-VERSION = "1.9.0"
+VERSION = "1.0.0"
 CAPTION = f"© {year} Splunk Inc. All rights reserved. **Version {VERSION}**"
 
 st.set_page_config(
@@ -29,15 +29,16 @@
 if not "valid_inputs_received" in st.session_state:
     st.session_state.valid_inputs_received = False
 
-with st.form("demo_form") as form:
-    host = st.text_input("Host", placeholder="hostname")
-    port = st.text_input("Port", placeholder="8083", value="8083")
-    query = st.selectbox("Query", ("pods", "health", "Deploy Online Boutique"))
-    submit_button = st.form_submit_button(label="Submit")
+with st.sidebar:
+    with st.form("demo_form") as form:
+        host = st.text_input("Host", placeholder="hostname")
+        port = st.text_input("Port", placeholder="8083", value="8083")
+        query = st.selectbox("Query", ("pods", "health", "Deploy Online Boutique"))
+        submit_button = st.form_submit_button(label="Submit")
 
-    if submit_button:
-        st.cache_data.clear()
-        st.session_state.valid_inputs_received = True
+        if submit_button:
+            st.cache_data.clear()
+            st.session_state.valid_inputs_received = True
 
 if st.session_state.valid_inputs_received == False:
     st.warning(

workshop/demo-server/app.py

@@ -1,27 +1,41 @@
-from kubernetes import client, config, utils
+#from kubernetes import client, config, utils
 from flask import Flask, json, jsonify, request
 from os import path
 import yaml
 import pandas as pd
-
+import kr8s
+from kr8s.objects import objects_from_files
+import kr8s.asyncio
+import os
+import subprocess
 app = Flask(__name__)
 
-config.load_kube_config()
+#config.load_kube_config()
+
+#core_v1 = client.CoreV1Api()
+#apps_v1 = client.AppsV1Api()
+#api = client.ApiClient()
+
+def otel_collector_init():
+    get_chart = subprocess.check_output(["helm", "repo", "add", "splunk-otel-collector-chart", "https://signalfx.github.io/splunk-otel-collector-chart"])
+    helm_update = subprocess.check_output(["helm", "repo", "update"])
+    print(get_chart)
+    print(helm_update)
 
-core_v1 = client.CoreV1Api()
-apps_v1 = client.AppsV1Api()
-api = client.ApiClient()
 
+@app.route('start_collector', methods=['GET'])
+def start_collector():
+    start = subprocess.check_output
 @app.route('/pods', methods=['GET'])
 def get_pods():
-    result = core_v1.list_pod_for_all_namespaces(_preload_content=False)
-    pods = json.loads(result.data)
-    df = pd.DataFrame(columns=["Namespace", "Name", "Status", "Pod IP"])
-
-    for r in pods['items']:
-        row = (r["metadata"]["namespace"], r["metadata"]["name"], r["status"]["phase"], r["status"]["podIP"])
+    df = pd.DataFrame(columns=["Namespace", "Name", "Status", "HostIP"])
+    pods = kr8s.get("pods", namespace=kr8s.ALL)
+    for pod in pods:
+        print(pod.raw)
+        row = (pod.raw["metadata"]["namespace"], pod.raw["metadata"]["name"], pod.raw["status"]["phase"], pod.raw["status"]["hostIP"])
         df.loc[len(df)] = row
 
+    
     return df.to_dict(orient='records')
 
 
@@ -30,21 +44,38 @@ def health():
     return "OK"
 
 
-@app.route('/apply_deployment', methods=['POST'])
+@app.route('/apply_deployment', methods=['GET'])
 def deployment():
+    try:
         deployment = "deployment.yaml"
         #resp = apps_v1.create_namespaced_deployment(
         #    body=deployment, namespace=namespace, _preload_content=False)
-        resp = utils.create_from_yaml(api, deployment, namespace="default")
-        print(resp)
+        #resp = utils.create_from_yaml(api, deployment, namespace="default")
+        #print(resp)
+        resources = objects_from_files(deployment)
+        for r in resources:
+            print(r)
+            r.create()
         return "200"
+    except Exception as e:
+        return str(e)
 
 @app.route('/delete_deployment', methods=['GET'])
 def delete_deployment():
-    filename = request.args.get('type', default = 'deployment.yaml', type = str)
-    namespace = request.args.get('namespace', default = 'default', type = str)
-    resp = apps_v1.delete_namespaced_deployment(name="nginx-deployment", namespace=namespace, _preload_content=False)
-    return resp
+    try:
+        deployment = "deployment.yaml"
+        resources = objects_from_files(deployment)
+        for r in resources:
+            print(r)
+            r.delete()
+        return "200"
+    except Exception as e:
+        return str(e)
+    #filename = request.args.get('type', default = 'deployment.yaml', type = str)
+    #namespace = request.args.get('namespace', default = 'default', type = str)
+    #resp = apps_v1.delete_namespaced_deployment(name="nginx-deployment", namespace=namespace, _preload_content=False)
+    #return resp
 
 if __name__ == '__main__':
-   app.run(host="0.0.0.0", port=8083, debug=True)
+    otel_collector_init()
+    app.run(host="0.0.0.0", port=8083, debug=True)