gitops 1.6.0__tar.gz → 1.6.2__tar.gz

gitops-1.6.2/.release-please-manifest.json

@@ -0,0 +1,5 @@
+{
+    ".": "1.6.2",
+    "gitops_server": "0.15.1",
+    "charts/gitops": "1.2.2"
+}

{gitops-1.6.0 → gitops-1.6.2}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.6.2](https://github.com/uptick/gitops/compare/gitops-v1.6.1...gitops-v1.6.2) (2026-06-23)
+
+
+### Bug Fixes
+
+* **deploy:** isolate per-app failures so one bad app doesn't abort the batch ([29ff9c3](https://github.com/uptick/gitops/commit/29ff9c378ab8d003fc862f274b39bc131ada5871))
+* **deploy:** isolate per-app failures so one bad app doesn't abort the batch ([8261b7b](https://github.com/uptick/gitops/commit/8261b7bb335678a029586b2238e81cb783988009))
+* **deploy:** make post_result fail-proof so reporting errors don't abort the batch ([83dbc8e](https://github.com/uptick/gitops/commit/83dbc8e217e358ea51168eb955007ac76bceb9aa))
+
+## [1.6.1](https://github.com/uptick/gitops/compare/gitops-v1.6.0...gitops-v1.6.1) (2026-05-28)
+
+
+### Bug Fixes
+
+* improve app not found error message ([2c2a5a6](https://github.com/uptick/gitops/commit/2c2a5a6398ec6f7e7609982e6105b87cc6fd0d9d))
+* improve app not found error message ([e0f93b4](https://github.com/uptick/gitops/commit/e0f93b40f14c732ac1661c6a61e981eee05e32b2))
+
 ## [1.6.0](https://github.com/uptick/gitops/compare/gitops-v1.5.1...gitops-v1.6.0) (2026-05-06)
 
 

{gitops-1.6.0 → gitops-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitops
-Version: 1.6.0
+Version: 1.6.2
 Summary: Manage multiple apps across one or more k8s clusters.
 Author-email: Jarek Głowacki <jarekwg@gmail.com>
 License-File: LICENSE
@@ -13,12 +13,19 @@ Requires-Dist: invoke>=2.2.0
 Requires-Dist: packaging>=24.1
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: tabulate>=0.8.9
+Requires-Dist: urllib3>=2.7.0
 Provides-Extra: server
-Requires-Dist: fastapi==0.109.2; extra == 'server'
-Requires-Dist: httpx<0.24.0,>=0.23.0; extra == 'server'
+Requires-Dist: aiohttp>=3.14.0; extra == 'server'
+Requires-Dist: fastapi>=0.133.0; extra == 'server'
+Requires-Dist: h11>=0.16.0; extra == 'server'
+Requires-Dist: httpx>=0.27.0; extra == 'server'
+Requires-Dist: idna>=3.15; extra == 'server'
 Requires-Dist: kubernetes-asyncio>=25.1.2; extra == 'server'
+Requires-Dist: protobuf>=5.29.6; extra == 'server'
+Requires-Dist: requests>=2.33.0; extra == 'server'
 Requires-Dist: sentry-sdk>=1.3.0; extra == 'server'
 Requires-Dist: slack-sdk>=3.33.5; extra == 'server'
+Requires-Dist: starlette>=1.3.1; extra == 'server'
 Requires-Dist: uptick-observability[fastapi]>=0.2.2; extra == 'server'
 Requires-Dist: uvicorn>=0.34.0; extra == 'server'
 Description-Content-Type: text/markdown

{gitops-1.6.0 → gitops-1.6.2}/charts/gitops/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.2.2](https://github.com/uptick/gitops/compare/helm-v1.2.1...helm-v1.2.2) (2026-05-28)
+
+
+### Bug Fixes
+
+* **helm:** remove trailing colon from OTEL_RESOURCE_ATTRIBUTES env var name ([0c23326](https://github.com/uptick/gitops/commit/0c23326d62ed331e5ca24b9c3a04bbc3a58b2931))
+* **helm:** remove trailing colon from OTEL_RESOURCE_ATTRIBUTES env var name ([f454c45](https://github.com/uptick/gitops/commit/f454c4587cd79fda5ac8ad30fd9a65541f0f4636))
+* **helm:** use correct values reference for OTEL_RESOURCE_ATTRIBUTES cluster name ([2184d70](https://github.com/uptick/gitops/commit/2184d7040c36b802af7c86a1b6c074c92940b269))
+
 ## [1.2.1](https://github.com/uptick/gitops/compare/helm-v1.2.0...helm-v1.2.1) (2026-05-06)
 
 

{gitops-1.6.0 → gitops-1.6.2}/charts/gitops/Chart.yaml

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

{gitops-1.6.0 → gitops-1.6.2}/charts/gitops/templates/deployment.yml

@@ -90,8 +90,8 @@ spec:
             value: "gitops"
           - name: OTEL_EXPORTER_OTLP_TIMEOUT
             value: "1"
-          - name: OTEL_RESOURCE_ATTRIBUTES: 
-            value: "cluster={{.Values.cluster}}"
+          - name: OTEL_RESOURCE_ATTRIBUTES
+            value: "cluster={{.Values.environment.CLUSTER_NAME}}"
           # We want to limit the length of the attributes so that we don't store too much
           - name: OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT
             value: "512"

{gitops-1.6.0 → gitops-1.6.2}/gitops/__init__.py

@@ -6,7 +6,7 @@ from gitops.utils.apps import App, get_app_details, get_apps  # type: ignore[att
 
 from .utils.cli import success, warning
 
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 
 
 # Checking gitops version matches cluster repo version.

{gitops-1.6.0 → gitops-1.6.2}/gitops/utils/apps.py

@@ -38,7 +38,10 @@ def get_app_details(
     except FileNotFoundError as e:
         msg, exc = "", Exception
         if get_apps_directory().exists():
-            msg, exc = f"There's no app with the name '{app_name}', silly.", AppDoesNotExist
+            msg, exc = (
+                f"There's no app with the name '{app_name}', silly. is your cluster repo up to date?",
+                AppDoesNotExist,
+            )
         else:
             msg, exc = "Could not find an 'apps' directory. Are you in a cluster repo?", AppDirectoryDoesNotExist
         if exit_if_not_found:

gitops-1.6.2/gitops_server/version.py

@@ -0,0 +1 @@
+__version__ = "1.6.2"

{gitops-1.6.0 → gitops-1.6.2}/gitops_server/workers/deployer/deploy.py

@@ -162,9 +162,27 @@ class Deployer:
             )
 
     async def update_app_deployment(self, app: App) -> UpdateAppResult | None:
+        from_timestamp = time.time()
         async with self.semaphore_manager.app_semaphore(app.name):
             async with helm_parallel_semaphore:
-                return await self._update_app_deployment(app)
+                try:
+                    return await self._update_app_deployment(app)
+                except Exception as e:
+                    # Isolate per-app failures so one broken app doesn't abort the
+                    # whole batch. Steps before the helm upgrade (e.g. cloning a
+                    # custom git chart from a branch that doesn't exist, or
+                    # `helm dependency build`) raise rather than returning a
+                    # non-zero result, and would otherwise propagate up through
+                    # asyncio.gather() and cancel every other app's deployment.
+                    logger.exception(f"Failed to deploy app {app.name!r}.")
+                    result = UpdateAppResult(
+                        app_name=app.name,
+                        slack_message="",
+                        exit_code=1,
+                        output=str(e),
+                    )
+                    await self.post_result(app=app, result=result, deployer=self, from_timestamp=from_timestamp)
+                    return result
 
     async def _update_app_deployment(self, app: App) -> UpdateAppResult | None:
         app.set_value("deployment.labels.gitops/deploy_id", self.deploy_id)
@@ -275,17 +293,25 @@ class Deployer:
 
     @tracer.start_as_current_span("post_result")
     async def post_result(self, app: App, result: UpdateAppResult, deployer: "Deployer", **kwargs: Any) -> None:
-        if result["exit_code"] != 0:
-            self.failed_apps.add(app.name)
-            deploy_result = await handle_failed_deploy(app, result, deployer, **kwargs)
-            message = (
-                deploy_result["slack_message"]
-                or f"Failed to deploy app `{result['app_name']}` for cluster `{settings.CLUSTER_NAME}`:\n>>>{result['output']}"
-            )
-            await slack.post_alert(message)
-        else:
-            self.successful_apps.add(app.name)
-            await handle_successful_deploy(app, result, deployer)
+        # Reporting a result makes Slack/GitHub network calls and runs inside the
+        # asyncio.gather() in deploy(). A failure here (e.g. a Slack or GitHub API
+        # error) must not propagate, or it would cancel every other app's
+        # deployment in the batch. The success/failure bookkeeping is recorded
+        # before any network call so it survives a notification failure.
+        try:
+            if result["exit_code"] != 0:
+                self.failed_apps.add(app.name)
+                deploy_result = await handle_failed_deploy(app, result, deployer, **kwargs)
+                message = (
+                    deploy_result["slack_message"]
+                    or f"Failed to deploy app `{result['app_name']}` for cluster `{settings.CLUSTER_NAME}`:\n>>>{result['output']}"
+                )
+                await slack.post_alert(message)
+            else:
+                self.successful_apps.add(app.name)
+                await handle_successful_deploy(app, result, deployer)
+        except Exception:
+            logger.exception(f"Failed to post deploy result for app {app.name!r}.")
 
         # TODO: Fix this in the future. We want to update the message with the latest status.
         # But we can't because of the messge length (when messaging > 4000 characters)

{gitops-1.6.0 → gitops-1.6.2}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "gitops"
-version = "1.6.0"
+version = "1.6.2"
 description = "Manage multiple apps across one or more k8s clusters."
 requires-python = ">=3.12"
 readme = "README.md"
@@ -15,6 +15,8 @@ dependencies = [
     "humanize>=3.5.0",
     "tabulate>=0.8.9",
     "packaging>=24.1",
+    # Transitive security pins
+    "urllib3>=2.7.0",
 ]
 
 [project.scripts]
@@ -23,13 +25,20 @@ gitops = "gitops.main:program.run"
 
 [project.optional-dependencies]
 server = [
-    "httpx>=0.23.0,<0.24.0",
+    "httpx>=0.27.0",
     "uvicorn>=0.34.0",
-    "fastapi==0.109.2",
+    "fastapi>=0.133.0",
     "kubernetes_asyncio>=25.1.2",
     "sentry-sdk>=1.3.0",
     "uptick-observability[fastapi]>=0.2.2",
     "slack-sdk>=3.33.5",
+    # Transitive security pins
+    "h11>=0.16.0",
+    "aiohttp>=3.14.0",
+    "starlette>=1.3.1",
+    "protobuf>=5.29.6",
+    "requests>=2.33.0",
+    "idna>=3.15",
 ]
 
 [build-system]
@@ -51,6 +60,12 @@ dev-dependencies = [
 
 
 [tool.uv.sources]
+uptick-observability = { index = "uptick" }
+
+[[tool.uv.index]]
+name = "uptick"
+url = "https://pypi.deployments.onuptick.com"
+explicit = true
 
 [tool.nitpick]
 # Generated by the 'nitpick init' command

{gitops-1.6.0 → gitops-1.6.2}/release-please-config.json

@@ -7,6 +7,13 @@
         "exclude-paths": [
             "tests/",
             "charts/gitops"
+        ],
+        "extra-files": [
+          {
+            "type": "toml",
+            "path": "uv.lock",
+            "jsonpath": "$.package[?(@.name.value=='gitops')].version"
+          }
         ]
       },
       "charts/gitops": {

{gitops-1.6.0 → gitops-1.6.2}/tests/test_deploy.py

@@ -145,6 +145,79 @@ class TestDeploy:
         )
         assert post_mock.call_count == 2
 
+    @patch("gitops_server.workers.deployer.deploy.run")
+    @patch("gitops_server.utils.slack.post")
+    @patch("gitops_server.workers.deployer.deploy.Deployer.post_result")
+    @patch("gitops_server.workers.deployer.deploy.load_app_definitions", mock_load_app_definitions)
+    @patch("gitops_server.workers.deployer.deploy.temp_repo")
+    async def test_one_app_failing_does_not_abort_the_batch(
+        self, temp_repo_mock, post_result_mock, post_mock, run_mock
+    ):
+        """A single app failing (e.g. cloning a custom chart from a branch that
+        doesn't exist) must not prevent the rest of the batch from deploying."""
+        run_mock.return_value = {"exit_code": 0, "output": ""}
+
+        class _FakeTempRepo:
+            async def __aenter__(self):
+                return "mock-repo"
+
+            async def __aexit__(self, *args):
+                return False
+
+        # SAMPLE_GITHUB_PAYLOAD deploys two apps. Make the first chart fetch blow
+        # up (as a non-existent git branch would), the second succeed.
+        calls = {"n": 0}
+
+        def temp_repo_side_effect(*args, **kwargs):
+            calls["n"] += 1
+            if calls["n"] == 1:
+                raise Exception("git clone failed: branch 'does-not-exist' not found")
+            return _FakeTempRepo()
+
+        temp_repo_mock.side_effect = temp_repo_side_effect
+
+        semaphore_manager = AppSemaphoreManager()
+        deployer = await Deployer.from_push_event(SAMPLE_GITHUB_PAYLOAD, semaphore_manager)
+
+        # Must not raise even though one app errors out.
+        await deployer.deploy()
+
+        # The surviving app still ran its full helm flow (dependency build + upgrade).
+        assert run_mock.call_count == 2
+        # post_result was called for both apps: one failure, one success.
+        assert post_result_mock.call_count == 2
+        exit_codes = sorted(call.kwargs["result"]["exit_code"] for call in post_result_mock.call_args_list)
+        assert exit_codes == [0, 1]
+
+    @patch("gitops_server.workers.deployer.deploy.handle_failed_deploy")
+    @patch("gitops_server.workers.deployer.deploy.handle_successful_deploy")
+    @patch("gitops_server.workers.deployer.deploy.load_app_definitions", mock_load_app_definitions)
+    async def test_post_result_swallows_reporting_failures(self, handle_success_mock, handle_failed_mock):
+        """Reporting a result makes Slack/GitHub network calls inside the gather()
+        in deploy(); a failure there must never propagate, or it would abort the
+        rest of the batch. post_result must swallow such errors itself, since it
+        is also invoked from places not wrapped by update_app_deployment's guard
+        (its own except handler and uninstall_app)."""
+        handle_success_mock.side_effect = Exception("slack/github exploded")
+        handle_failed_mock.side_effect = Exception("slack/github exploded")
+
+        semaphore_manager = AppSemaphoreManager()
+        deployer = await Deployer.from_push_event(SAMPLE_GITHUB_PAYLOAD, semaphore_manager)
+        app = App("some-app", path=create_test_yaml())
+
+        # Neither the success nor the failure reporting path may raise...
+        await deployer.post_result(
+            app, {"app_name": app.name, "slack_message": "", "exit_code": 0, "output": ""}, deployer
+        )
+        await deployer.post_result(
+            app, {"app_name": app.name, "slack_message": "", "exit_code": 1, "output": "boom"}, deployer
+        )
+
+        # ...but the success/failure bookkeeping is still recorded (it happens
+        # before the network call that blows up).
+        assert "some-app" in deployer.successful_apps
+        assert "some-app" in deployer.failed_apps
+
     @patch("gitops_server.workers.deployer.deploy.run")
     @patch("gitops_server.utils.slack.post")
     @patch("gitops_server.workers.deployer.deploy.load_app_definitions", mock_load_app_definitions)

{gitops-1.6.0 → gitops-1.6.2}/tests/test_gitops_server.py

@@ -22,12 +22,14 @@ def test_get_on_index_returns_200():
 
 @patch("gitops_server.main.settings.GITHUB_WEBHOOK_KEY", "test_key")
 def test_webhook_returns_200_if_hmac_is_correct():
-    sha_encoding = hmac.new(b"test_key", json.dumps(payload).encode(), hashlib.sha1).hexdigest()
+    body = json.dumps(payload).encode()
+    sha_encoding = hmac.new(b"test_key", body, hashlib.sha1).hexdigest()
     headers["X-Hub-Signature"] = f"sha1={sha_encoding}"
+    headers["Content-Type"] = "application/json"
 
     with patch.object(gitops_server.workers.DeployQueueWorker, "get_worker") as get_worker_mock:
         get_worker_mock.return_value = AsyncMock()
-        response = client.post("/webhook", headers=headers, json=payload)
+        response = client.post("/webhook", headers=headers, content=body)
 
         assert response.status_code == 200
         get_worker_mock.assert_called()