staging

Author: erikschlegel

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "justMyCode": true
+        }
+    ]
+}

azure.yaml

@@ -14,7 +14,7 @@ services:
     language: py
     k8s:
       deploymentPath: api/manifests
-      namespace: bigbang
+      namespace: apps
     host: aks
     hooks:
       postdeploy:

src/.gitignore

@@ -0,0 +1 @@
+.azure

src/api/manifests/helm-release.yaml.tmpl

@@ -22,17 +22,5 @@ spec:
     - kind: Secret
       name: common-bb
       valuesKey: values.yaml
-  values:
-    nameOverride: ${SERVICE_NAME}-istio-svc
-    fullnameOverride: ${SERVICE_NAME}-istio-svc
-    replicas: 1
-    istio:
-      gateways:
-      - 'istio-system/public'
-      hosts:
-      - '${SERVICE_NAME}-istio-svc.bigbang.dev'
-    image:
-      repository: ${SERVICE_API_IMAGE_NAME}
-      pullSecret: private-registry
-    service:
-      port: 5000
+    - kind: ConfigMap
+      name: common

src/api/manifests/kustomization.yaml.tmpl

@@ -1,6 +1,10 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
 resources:
   - namespace.yaml
   - repository.yaml
-  - helm-release.yaml
+  - helm-release.yaml
+
+configMapGenerator:
+  - name: common
+    behavior: create
+    files:
+      - values.yaml

src/api/manifests/repository.yaml.tmpl

@@ -11,4 +11,4 @@ spec:
   url: https://github.com/csemissionplatformops/big-bang-istio-service.git
   ref:
     branch: main
-    tag: 0.0.10
+    tag: 0.0.12

src/api/manifests/values.yaml.tmpl

@@ -0,0 +1,16 @@
+nameOverride: ${SERVICE_NAME}-istio-svc
+fullnameOverride: ${SERVICE_NAME}-istio-svc
+replicas: 1
+
+istio:
+  gateways:
+  - 'istio-system/public'
+  hosts:
+  - '${SERVICE_NAME}-istio-svc.bigbang.dev'
+
+image:
+  repository: ${SERVICE_API_IMAGE_NAME}
+  pullSecret: private-registry
+
+service:
+  port: 5000

src/azure.yaml

@@ -0,0 +1,3 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
+
+name: src

src/hooks/postdeploy.py

@@ -7,6 +7,7 @@
 from wrappers.renderer import RenderEngine
 
 TEMPLATE_FILE = "azure.yaml"
+CWD = os.path.abspath(os.path.join(os.getcwd(), os.pardir))
 
 def set_env_from_azd():
     """
@@ -21,28 +22,28 @@ def set_env_from_azd():
         os.environ[key] = value
 
 def get_services_to_deploy(yaml_template) -> dict:
-    template_file = os.path.join(os.getcwd(), yaml_template)
+    template_file = os.path.join(CWD, yaml_template)
 
     with open(template_file, "r", encoding="utf-8") as stream:
         try:
             # Converts yaml document to python object
             yaml_dict = yaml.safe_load(stream)
 
             if "services" not in yaml_dict:
-                raise ValueError("No services found in yaml file.")
+                raise ValueError(f"No services found in yaml file {template_file}.")
 
             return yaml_dict["services"]
         except yaml.YAMLError as ex:
             print("Error loading yaml file: ", ex)
 
 def pre_req_assertions(deployment_template):
-    azure_dir = os.path.join(os.getcwd(), ".azure")
-    template_file = os.path.join(os.getcwd(), deployment_template)
+    azure_dir = os.path.join(CWD, ".azure")
+    template_file = os.path.join(CWD, deployment_template)
 
     # verify that the .azure folder exists
     if not os.path.exists(azure_dir):
         raise ValueError(
-            "The .azure folder does not exist. Please run 'azd init' \
+            f"The .azure folder in {azure_dir} does not exist. Please run 'azd init' \
                          to setup your environment."
         )
 
@@ -108,11 +109,15 @@ def ignore_func(_, files):
                 and "deploymentPath" in services_to_deploy[service]["k8s"]:
                 manifest_dir = services_to_deploy[service]["k8s"]["deploymentPath"]
 
-            manifest_path = os.path.join(os.getcwd(), project_dir, manifest_dir)
-            service_render_path = os.path.join(git_clone_dir, "environments", \
-                environment_name, "src", "manifests", "services", service)
+            manifest_path = os.path.join(CWD, project_dir, manifest_dir)
+            gitops_environment_path = os.path.join(git_clone_dir, "environments", \
+                environment_name, "src", "manifests")
+            service_render_path = os.path.join(gitops_environment_path, "services", service)
             copy_manifest_dir_tree_to_repo(manifest_path, service_render_path)
-            render_client = RenderEngine(service_render_path)
+            render_client = RenderEngine(service_render_path, \
+                                         os.path.join(gitops_environment_path, \
+                                            "kustomization.yaml"), \
+                                            service)
             render_client.render()
             git_client.push_changes(git_clone_dir, f"Deployed service: {service}")
             print(f"Service {service} deployed successfully.")

src/hooks/wrappers/renderer.py

@@ -1,9 +1,12 @@
 import os
 import subprocess
+import yaml
 
 class RenderEngine:
-    def __init__(self, path):
+    def __init__(self, path, kustomization_path, service_name):
         self.path = path
+        self.service_name = service_name
+        self.kustomization_path = kustomization_path
         self.remove_template_file = True
 
     def __retrieve_files_to_render(self):
@@ -23,6 +26,38 @@ def render(self):
             if self.remove_template_file:
                 os.remove(file)
 
+        self.__add_service_to_kustomization_resources()
+
+    def __run_command(self, command):
+        try:
+            output = subprocess.check_output(command, stderr=subprocess.STDOUT, \
+                                             universal_newlines=True, shell=True)
+            return output.strip()
+        except subprocess.CalledProcessError as ex:
+            print(f"Error: {ex.output}")
+            return None
+
+    def __add_service_to_kustomization_resources(self):
+        # verify that the kustomization file exists
+        if not os.path.exists(self.kustomization_path):
+            raise ValueError(
+                f"The kustomization file {self.kustomization_path} does not exist."
+            )
+
+        print(f"Adding {self.service_name} to {self.kustomization_path}")
+
+        with open(self.kustomization_path, "r", encoding="utf-8") as r_stream:
+            yaml_dict = yaml.safe_load(r_stream)
+            # check if the resources key exists
+
+            if "resources" not in yaml_dict:
+                raise ValueError("No resources found in kustomization yaml file.")
+
+            yaml_dict["resources"].append(f"./services/{self.service_name}")
+            # Write the updated yaml to the kustomization file\
+            with open(self.kustomization_path, "w", encoding="utf-8") as w_stream:
+                yaml.safe_dump(yaml_dict, w_stream, default_flow_style=False, sort_keys=False)
+
     def __run_command(self, command):
         try:
             output = subprocess.check_output(command, stderr=subprocess.STDOUT, \