gitops 0.11.0__tar.gz → 0.11.3__tar.gz

{gitops-0.11.0 → gitops-0.11.3}/Dockerfile

@@ -39,6 +39,7 @@ COPY --link=true pyproject.toml uv.lock /app/
 RUN --mount=type=cache,target=/root/.cache/ \
     (uv sync --frozen --no-install-project --extra server || uv sync --frozen --no-install-project --extra server)
 # Install dependencies
+RUN git config --global advice.detachedHead false
 
 COPY cluster.key /app/
 COPY gitops /app/gitops/

{gitops-0.11.0 → gitops-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gitops
-Version: 0.11.0
+Version: 0.11.3
 Summary: Manage multiple apps across one or more k8s clusters.
 Author-email: Jarek Głowacki <jarekwg@gmail.com>
 License-File: LICENSE

{gitops-0.11.0 → gitops-0.11.3}/charts/gitops/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: GitOps Server Helm chart.
 name: gitops
-version: 0.11.0
+version: 0.11.3

{gitops-0.11.0 → gitops-0.11.3}/charts/gitops/templates/environment.yml

@@ -4,5 +4,5 @@ metadata:
   name: {{ .Release.Name }}-environment
 data:
   {{- range $key, $val := .Values.environment }}
-  {{ $key }}: {{ $val }}
+  {{ $key }}: {{ $val | quote }}
   {{- end }}

{gitops-0.11.0 → gitops-0.11.3}/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   web:
     build: .

{gitops-0.11.0 → gitops-0.11.3}/gitops/__init__.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from .utils.cli import success, warning
 
-__version__ = "0.11.0"
+__version__ = "0.11.3"
 
 
 # Checking gitops version matches cluster repo version.

{gitops-0.11.0 → gitops-0.11.3}/gitops_server/utils/__init__.py

@@ -15,11 +15,12 @@ async def run(command, suppress_errors=False) -> RunOutput:
     exit_code = 0
     logger.info(f'Running "{command}".')
     proc = await asyncio.create_subprocess_shell(
-        command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
+        command,  # stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
     )
 
-    stdout, stderr = await proc.communicate()
-    exit_code = proc.returncode or 1
+    stdout, stderr = b"", b""
+    await proc.communicate()
+    exit_code = proc.returncode if proc.returncode not in (None, 128) else 1  # type: ignore
     if exit_code == 0:
         return RunOutput(exit_code=exit_code, output=stdout.decode())
     else:

{gitops-0.11.0 → gitops-0.11.3}/gitops_server/utils/git.py

@@ -1,19 +1,22 @@
+import asyncio
 import logging
 import os
 import tempfile
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
+from pathlib import Path
 
 from opentelemetry.trace import get_tracer
 
 from . import run
 
 tracer = get_tracer(__name__)
-
-BASE_REPO_DIR = "/var/gitops/repos"
-
 logger = logging.getLogger("gitops")
 
+REPO_CACHE_DIR = Path("/tmp/gitops/repocache")
+REPO_CACHE: dict[str, Path] = {}
+repo_lock = asyncio.Semaphore(1)
+
 
 async def clone_repo(git_repo_url: str, path: str, sha: str | None = None):
     """Shallow Clones a git repo url to path and git-crypt unlocks all encrypted files"""
@@ -22,7 +25,10 @@ async def clone_repo(git_repo_url: str, path: str, sha: str | None = None):
     url_with_oauth_token = git_repo_url.replace("://", f"://{os.environ['GITHUB_OAUTH_TOKEN'].strip()}@")
 
     with tracer.start_as_current_span("tempo_repo.clone_repo"):
-        await run(f"git clone {url_with_oauth_token} {path}; cd {path}; git checkout {sha}")
+        if sha:
+            await run(f"git clone --depth 100 {url_with_oauth_token} {path}; cd {path}; git checkout {sha}")
+        else:
+            await run(f"git clone --depth 100 {url_with_oauth_token} {path};")
 
     with tracer.start_as_current_span("temp_repo.git_crypt_unlock"):
         await run(f'cd {path}; git-crypt unlock {os.environ["GIT_CRYPT_KEY_FILE"]}')
@@ -32,6 +38,18 @@ async def clone_repo(git_repo_url: str, path: str, sha: str | None = None):
 async def temp_repo(git_repo_url: str, sha: str | None = None) -> AsyncGenerator[str, None]:
     """Checks out a git_repo_url to a temporary folder location. Returns temporary folder location"""
     with tracer.start_as_current_span("checkout_temp_repo"):
+        cache_path = REPO_CACHE_DIR / git_repo_url.split("/")[-1].split(".")[0]
+        if not (cache_path / ".git").exists():
+            logger.info("Repo %s not in cache, cloning", git_repo_url)
+            async with repo_lock:
+                if cache_path.exists():
+                    await run(f"rm -rf {cache_path}", suppress_errors=True)
+                if not cache_path.exists():
+                    cache_path.mkdir(parents=True)
+                REPO_CACHE[git_repo_url] = cache_path
+                await clone_repo(git_repo_url, path=str(cache_path))
         with tempfile.TemporaryDirectory() as temporary_folder_path:
-            await clone_repo(git_repo_url, path=temporary_folder_path, sha=sha)
+            await run(f"rm -rf {temporary_folder_path}", suppress_errors=True)
+            await run(f"cp -r {cache_path} {temporary_folder_path}")
+            await run(f"cd {temporary_folder_path};git fetch; git checkout {sha}")
             yield temporary_folder_path

{gitops-0.11.0 → gitops-0.11.3}/gitops_server/workers/deployer/deploy.py

@@ -115,33 +115,37 @@ class Deployer:
         )
 
     async def deploy(self):
-        with tracer.start_as_current_span("deploy"):
-            added_apps, updated_apps, removed_apps = self.calculate_app_deltas()
-            if not (added_apps | updated_apps | removed_apps):
-                logger.info("No deltas; aborting.")
-                return
-            logger.info(
-                f"Running deployment for these deltas: A{list(added_apps)}, U{list(updated_apps)},"
-                f" R{list(removed_apps)}"
-            )
-            await post_init_summary(
-                source=self.current_app_definitions.name,
-                username=self.author_name,
-                added_apps=added_apps,
-                updated_apps=updated_apps,
-                removed_apps=removed_apps,
-                commit_message=self.commit_message,
-            )
-            update_results = await asyncio.gather(
-                *[
-                    self.update_app_deployment(self.current_app_definitions.apps[app_name])
-                    for app_name in (added_apps | updated_apps)
-                ]
-            )
-            uninstall_results = await asyncio.gather(
-                *[self.uninstall_app(self.previous_app_definitions.apps[app_name]) for app_name in removed_apps]
-            )
-            await post_result_summary(self.current_app_definitions.name, update_results + uninstall_results)
+        added_apps, updated_apps, removed_apps = self.calculate_app_deltas()
+        current_span = trace.get_current_span()
+        if current_span:
+            current_span.set_attribute("gitops.added_apps", len(added_apps))
+            current_span.set_attribute("gitops.updated_aps", len(updated_apps))
+            current_span.set_attribute("gitops.removed_app", len(removed_apps))
+        if not (added_apps | updated_apps | removed_apps):
+            logger.info("No deltas; aborting.")
+            return
+        logger.info(
+            f"Running deployment for these deltas: A{list(added_apps)}, U{list(updated_apps)},"
+            f" R{list(removed_apps)}"
+        )
+        await post_init_summary(
+            source=self.current_app_definitions.name,
+            username=self.author_name,
+            added_apps=added_apps,
+            updated_apps=updated_apps,
+            removed_apps=removed_apps,
+            commit_message=self.commit_message,
+        )
+        update_results = await asyncio.gather(
+            *[
+                self.update_app_deployment(self.current_app_definitions.apps[app_name])
+                for app_name in (added_apps | updated_apps)
+            ]
+        )
+        uninstall_results = await asyncio.gather(
+            *[self.uninstall_app(self.previous_app_definitions.apps[app_name]) for app_name in removed_apps]
+        )
+        await post_result_summary(self.current_app_definitions.name, update_results + uninstall_results)
 
     async def uninstall_app(self, app: App) -> UpdateAppResult:
         with tracer.start_as_current_span("uninstall_app", attributes={"app": app.name}):

{gitops-0.11.0 → gitops-0.11.3}/gitops_server/workers/deployer/worker.py

@@ -1,10 +1,14 @@
 import asyncio
 import logging
 
+from opentelemetry import trace
+
 from .deploy import Deployer
 
 logger = logging.getLogger("gitops_worker")
 
+tracer = trace.get_tracer(__name__)
+
 
 class DeployQueueWorker:
     """Simple synchronous background work queue.
@@ -52,5 +56,12 @@ class DeployQueueWorker:
         ref = work.get("ref")
         logger.info(f'Have a push to "{ref}".')
         if ref == "refs/heads/master":
-            deployer = await Deployer.from_push_event(work)
-            await deployer.deploy()
+            with tracer.start_as_current_span("gitops_process_webhook") as current_span:
+                deployer = await Deployer.from_push_event(work)
+                current_span.set_attribute("gitops.ref", ref)
+                current_span.set_attribute("gitops.after", work.get("after"))
+                current_span.set_attribute("gitops.before", work.get("before"))
+                current_span.set_attribute("gitops.author_email", deployer.author_email)
+                current_span.set_attribute("gitops.author_name", deployer.author_name)
+                current_span.set_attribute("gitops.commit_message", deployer.commit_message)
+                await deployer.deploy()

{gitops-0.11.0 → gitops-0.11.3}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "gitops"
-version = "0.11.0"
+version = "0.11.3"
 description = "Manage multiple apps across one or more k8s clusters."
 requires-python = ">=3.12"
 readme = "README.md"

{gitops-0.11.0 → gitops-0.11.3}/uv.lock

@@ -277,7 +277,7 @@ wheels = [
 
 [[package]]
 name = "gitops"
-version = "0.11.0"
+version = "0.11.1"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },