Merge branch 'fix-local-env' into 'enterprise'

fix: Local env deployment

See merge request dkinternal/observability/dataops-observability!55

Author: rboni-dk

deploy/charts_values/values-app-dev.yaml

@@ -5,51 +5,60 @@
 observability:
   flask_debug: "true"
   image:
-    repository: "datakitchen"
+    repository: ""
     tag: "latest"
 
 observability_ui:
   enable: true
   image:
+    name: "observability-ui"
     pullPolicy: Never
 
 observability_api:
   image:
+    name: "observability-be"
     pullPolicy: Never
   service:
     type: NodePort
     nodePort: 5000
 
 event_api:
   image:
+    name: "observability-be"
     pullPolicy: Never
   service:
     type: NodePort
     nodePort: 5001
 
 agent_api:
   image:
+    name: "observability-be"
     pullPolicy: Never
   service:
     type: NodePort
     nodePort: 5003
 
 event_store:
   image:
+    name: "observability-be"
     pullPolicy: Never
 
 run_manager:
   image:
+    name: "observability-be"
     pullPolicy: Never
 
 rules_engine:
   image:
+    name: "observability-be"
     pullPolicy: Never
 
 scheduler:
   image:
+    name: "observability-be"
     pullPolicy: Never
 
 cli_hook:
   image:
+    name: "observability-be"
     pullPolicy: Never

deploy/docker/observability-be.dockerfile

@@ -21,7 +21,7 @@ RUN python3 -O -m pip install /tmp/dk --prefix=/dk
 
 # Copy and build the actual application
 COPY . /tmp/dk/
-ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.12/site-packages
+ENV PYTHONPATH=/dk/lib/python3.12/site-packages
 #    --no-deps: The previous pip layer will have already installed the dependencies. This
 #               will disable doing a second dependency resolution check.
 #           -O: Strips asserts from the code which removes some unnecessary codepaths resulting in a small
@@ -46,8 +46,8 @@ COPY --from=build-image \
 
 COPY --from=build-image /tmp/dk/deploy/migrations/ /dk/lib/migrations/
 
-ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.12/site-packages
-ENV PATH ${PATH}:/dk/bin
+ENV PYTHONPATH=/dk/lib/python3.12/site-packages
+ENV PATH=${PATH}:/dk/bin
 
 RUN addgroup -S observability && adduser -S observability -G observability
 

deploy/docker/observability-ui.dockerfile

@@ -12,8 +12,8 @@ FROM ${BASE_IMAGE_URL}nginxinc/nginx-unprivileged:alpine3.22
 
 WORKDIR /observability_ui
 
-ENV OBSERVABILITY_API_HOSTNAME=
-ENV OBSERVABILITY_CSP_EXTRA=
+ENV OBSERVABILITY_API_HOSTNAME=""
+ENV OBSERVABILITY_CSP_EXTRA=""
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 
 COPY --from=build-image --chown=nginx:nginx /observability_ui/dist /observability_ui

scripts/invocations/deploy.py

@@ -30,7 +30,7 @@
 
 from scripts.invocations.common import MINIKUBE_PROFILE, check_env_tools, get_docker_env, get_host_env
 
-KUBE_VERSION = os.environ.get("INVOKE_KUBE_VERSION", "v1.25.7")
+KUBE_VERSION = os.environ.get("INVOKE_KUBE_VERSION", "v1.29")
 NAMESPACE = "datakitchen"
 HELM_SVC_FOLDER = os.path.join("deploy", "charts", "observability-services")
 HELM_APP_FOLDER = os.path.join("deploy", "charts", "observability-app")
@@ -273,7 +273,7 @@ def helm_services(ctx, upgrade=False, template=False, atomic=False, timeout=None
             ("backend", "Builds only the Observability backend image"),
             ("ui", "Builds only the Observability UI image"),
             ("base-image-url", "Base image prefix. Useful to enable a dependency proxy"),
-            ("local", "Use the local docker instead of minikube's."),
+            ("load", "Loads the image into the current minikube profile."),
         )
     ),
 )
@@ -284,7 +284,7 @@ def build(
     tag="latest",
     no_cache=False,
     base_image_url=None,
-    local=False,
+    load=False,
 ):
     """
     Build Observability's images inside the minikube instance.
@@ -296,9 +296,6 @@ def build(
         backend = True
         ui = True
 
-    # "minikube image build" support for build-arg is clunky, using the docker CLI instead
-    env = {} if local else get_docker_env(ctx)
-
     args_str = ""
     if no_cache:
         args_str += "--no-cache "
@@ -307,17 +304,21 @@ def build(
         args_str += f"--build-arg BASE_IMAGE_URL={base_image_url} "
 
     if backend:
+        be_tag = f"observability-be:{tag}"
         ctx.run(
             f"docker build . {args_str} --build-arg tag={tag} "
-            f"-t 'observability-be:{tag}' -f ./deploy/docker/observability-be.dockerfile",
-            env=env,
+            f"-t '{be_tag}' -f ./deploy/docker/observability-be.dockerfile",
         )
+        if load:
+            ctx.run(f"minikube image load --daemon {be_tag}", echo=True)
 
     if ui:
+        ui_tag = f"observability-ui:{tag}"
         ctx.run(
-            f"docker build . {args_str} " f"-t 'observability-ui:{tag}' -f ./deploy/docker/observability-ui.dockerfile",
-            env=env,
+            f"docker build . {args_str} " f"-t '{ui_tag}' -f ./deploy/docker/observability-ui.dockerfile",
         )
+        if load:
+            ctx.run(f"minikube image load --daemon {ui_tag}", echo=True)
 
 
 @task(
@@ -419,7 +420,7 @@ def local(ctx, values="", driver=None, memory=None, cpus=None, base_image_url=""
     Required tools: docker, helm, minikube
     """
     minikube(ctx, driver=driver, memory=memory, cpus=cpus)
-    build(ctx, base_image_url=base_image_url)
+    build(ctx, base_image_url=base_image_url, load=True)
     helm_build(ctx)
     helm_services(ctx, timeout="10m")
     helm_app(ctx, timeout="10m")