gitops 1.1.0__tar.gz → 1.1.2__tar.gz

{gitops-1.1.0 → gitops-1.1.2}/.github/workflows/release-please.yaml

@@ -22,7 +22,6 @@ jobs:
       cli-release-created: ${{ steps.release.outputs['release_created'] }}
       server-release-created: ${{ steps.release.outputs['release_created'] }}
       helm-release-created: ${{ steps.release.outputs['charts/gitops--release_created'] }}
-      cli-version: ${{ steps.release.outputs['tag_name'] }}
       server-version: ${{ steps.release.outputs['tag_name'] }}
       helm-version: ${{ steps.release.outputs['charts/gitops--tag_name'] }}
       sha: ${{ steps.release.outputs.sha }}
@@ -67,7 +66,7 @@ jobs:
     name: Build and Push Docker Image
     uses: uptick/actions/.github/workflows/ci.yaml@main
     needs: release-please
-    if: ${{ needs.release-please.outputs.server-version }}
+    if: ${{ needs.release-please.outputs.server-release-created}}
     secrets:
       SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
     #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml

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

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

{gitops-1.1.0 → gitops-1.1.2}/CHANGELOG.md

@@ -1,49 +1,18 @@
 # Changelog
 
-## [1.1.0](https://github.com/uptick/gitops/compare/cli-v1.0.1...cli-v1.1.0) (2025-01-23)
-
-
-### Features
-
-* bump to 1.1 please ([4ed8ed3](https://github.com/uptick/gitops/commit/4ed8ed38ae94103c559caed9054e8dcc2ddd7868))
-* maybe we can just modify the release-please-manifest ([e374d14](https://github.com/uptick/gitops/commit/e374d14982f073fb4f776295a6975ef0714d501e))
+## [1.1.2](https://github.com/uptick/gitops/compare/gitops-v1.1.1...gitops-v1.1.2) (2025-02-14)
 
 
 ### Bug Fixes
 
-* bumping gitops_server ([b6a1d19](https://github.com/uptick/gitops/commit/b6a1d194a5900db0eacb1650c799ead24e5be981))
-* fix broken gitops server release process by merging with regular gitops cli release ([739ead0](https://github.com/uptick/gitops/commit/739ead04ac77d5d2798d4d243aee2d90cffeb645))
-* trigger build ([7afa38f](https://github.com/uptick/gitops/commit/7afa38f2cda0260cee0d28224c20d02baa3461a1))
-* trigger gitops build ([0345a3b](https://github.com/uptick/gitops/commit/0345a3be7db914ca6e6499c4b7aa737c13fd112c))
-
-
-### Miscellaneous Chores
-
-* trigger release for [gitops_server] ([8ec041a](https://github.com/uptick/gitops/commit/8ec041a8f7d20916e84bce04d6e9669ec07829e7))
-* trigger release for [gitops_server] ([1389531](https://github.com/uptick/gitops/commit/13895316fb92b837e08c6b591cc420ec46a79ca3))
+* **helm:** if a roll back is required; rollback before upgrading ([762cdb3](https://github.com/uptick/gitops/commit/762cdb388162c6b8645ec01f0d1c94c20d948b9f))
 
-## [1.0.1](https://github.com/uptick/gitops/compare/cli-v1.0.1...cli-v1.0.1) (2025-01-23)
+## [1.1.1](https://github.com/uptick/gitops/compare/gitops-v1.1.0...gitops-v1.1.1) (2025-01-24)
 
 
 ### Bug Fixes
 
-* bumping gitops_server ([b6a1d19](https://github.com/uptick/gitops/commit/b6a1d194a5900db0eacb1650c799ead24e5be981))
-* fix broken gitops server release process by merging with regular gitops cli release ([739ead0](https://github.com/uptick/gitops/commit/739ead04ac77d5d2798d4d243aee2d90cffeb645))
-* trigger build ([7afa38f](https://github.com/uptick/gitops/commit/7afa38f2cda0260cee0d28224c20d02baa3461a1))
-* trigger gitops build ([0345a3b](https://github.com/uptick/gitops/commit/0345a3be7db914ca6e6499c4b7aa737c13fd112c))
-
-
-### Miscellaneous Chores
-
-* trigger release for [gitops_server] ([8ec041a](https://github.com/uptick/gitops/commit/8ec041a8f7d20916e84bce04d6e9669ec07829e7))
-* trigger release for [gitops_server] ([1389531](https://github.com/uptick/gitops/commit/13895316fb92b837e08c6b591cc420ec46a79ca3))
-
-## [1.0.1](https://github.com/uptick/gitops/compare/cli-v1.0.1...cli-v1.0.1) (2025-01-23)
-
-
-### Miscellaneous Chores
-
-* trigger release for [gitops_server] ([1389531](https://github.com/uptick/gitops/commit/13895316fb92b837e08c6b591cc420ec46a79ca3))
+* releases should be dot formatted ([d1469e8](https://github.com/uptick/gitops/commit/d1469e8cdbded06dbd5194e9ca7f0b2f52d7ff3e))
 
 ## [1.0.1](https://github.com/uptick/gitops/compare/cli-v1.0.0...cli-v1.0.1) (2025-01-23)
 

{gitops-1.1.0 → gitops-1.1.2}/PKG-INFO

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

{gitops-1.1.0 → gitops-1.1.2}/charts/gitops/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.1.2](https://github.com/uptick/gitops/compare/helm-v1.1.1...helm-v1.1.2) (2025-02-14)
+
+
+### Bug Fixes
+
+* remove gitops resource limits ([fcd9680](https://github.com/uptick/gitops/commit/fcd9680f6e94e5cb7a286c269aeaa1626c95a181))
+
+## [1.1.1](https://github.com/uptick/gitops/compare/helm-v1.1.0...helm-v1.1.1) (2025-01-24)
+
+
+### Bug Fixes
+
+* Release-As: 1.1.1 ([1543396](https://github.com/uptick/gitops/commit/1543396593d14ead283e8d1f7a60eca9f36d3e57))
+
 ## [1.1.0](https://github.com/uptick/gitops/compare/helm-v0.13.3...helm-v1.1.0) (2025-01-23)
 
 

{gitops-1.1.0 → gitops-1.1.2}/charts/gitops/Chart.yaml

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

{gitops-1.1.0 → gitops-1.1.2}/charts/gitops/templates/deployment.yml

@@ -40,8 +40,6 @@ spec:
         resources:
           requests:
             memory: "750Mi"
-          limits:
-            memory: "1500Mi"
 
         envFrom:
         - configMapRef:

{gitops-1.1.0 → gitops-1.1.2}/gitops/__init__.py

@@ -6,7 +6,7 @@ from gitops.utils.apps import App, get_app_details, get_apps
 
 from .utils.cli import success, warning
 
-__version__ = "1.1.0"
+__version__ = "1.1.2"
 
 
 # Checking gitops version matches cluster repo version.

gitops-1.1.2/gitops_server/version.py

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

{gitops-1.1.0 → gitops-1.1.2}/gitops_server/workers/deployer/deploy.py

@@ -11,7 +11,7 @@ from opentelemetry import trace
 
 from gitops.common.app import App
 from gitops_server import settings
-from gitops_server.types import AppDefinitions, UpdateAppResult
+from gitops_server.types import AppDefinitions, RunOutput, UpdateAppResult
 from gitops_server.utils import get_repo_name_from_url, github, run, slack
 from gitops_server.utils.git import temp_repo
 
@@ -133,6 +133,17 @@ class Deployer:
                 )
             return update_result
 
+    async def rollback_deployment(self, app: App) -> None:
+        with tracer.start_as_current_span("rollback_deployment", attributes={"app": app.name}):
+            logger.warning(
+                "Rolling back %s deployment due to previous failed helm install",
+                app.name,
+            )
+            await run(
+                f"helm rollback --namespace={app.namespace} {app.name}",
+                suppress_errors=True,
+            )
+
     async def update_app_deployment(self, app: App) -> UpdateAppResult | None:
         app.set_value("deployment.labels.gitops/deploy_id", self.deploy_id)
         app.set_value("deployment.labels.gitops/status", github.STATUSES.in_progress)
@@ -155,6 +166,40 @@ class Deployer:
                             os.fsync(cfg.fileno())
 
                             with tracer.start_as_current_span("helm_upgrade"):
+
+                                async def upgrade_helm_git() -> RunOutput:
+                                    result = await run(
+                                        "helm secrets upgrade --create-namespace"
+                                        f" --history-max {MAX_HELM_HISTORY}"
+                                        " --install"
+                                        " --timeout=600s"
+                                        f"{' --set skip_migrations=true' if self.skip_migrations else ''}"
+                                        f" -f {cfg.name}"
+                                        f" --namespace={app.namespace}"
+                                        f" {app.name}"
+                                        f" {chart_folder_path}",
+                                        suppress_errors=True,
+                                    )
+                                    return result
+
+                                result = await upgrade_helm_git()
+                                if result["exit_code"] != 0 and "is in progress" in result["output"]:
+                                    await self.rollback_deployment(app)
+                                    result = await upgrade_helm_git()
+
+                elif app.chart.type == "helm":
+                    span.set_attribute("gitops.chart.type", "helm")
+                    with tempfile.NamedTemporaryFile(suffix=".yml") as cfg:
+                        cfg.write(json.dumps(app.values).encode())
+                        cfg.flush()
+                        os.fsync(cfg.fileno())
+                        chart_version_arguments = f" --version={app.chart.version}" if app.chart.version else ""
+                        with tracer.start_as_current_span("helm_repo_add"):
+                            await run(f"helm repo add {app.chart.helm_repo} {app.chart.helm_repo_url}")
+
+                        with tracer.start_as_current_span("helm_upgrade"):
+
+                            async def upgrade_helm_chart() -> RunOutput:
                                 result = await run(
                                     "helm secrets upgrade --create-namespace"
                                     f" --history-max {MAX_HELM_HISTORY}"
@@ -164,32 +209,15 @@ class Deployer:
                                     f" -f {cfg.name}"
                                     f" --namespace={app.namespace}"
                                     f" {app.name}"
-                                    f" {chart_folder_path}",
+                                    f" {app.chart.helm_chart} {chart_version_arguments}",
                                     suppress_errors=True,
                                 )
-                elif app.chart.type == "helm":
-                    span.set_attribute("gitops.chart.type", "helm")
-                    with tempfile.NamedTemporaryFile(suffix=".yml") as cfg:
-                        cfg.write(json.dumps(app.values).encode())
-                        cfg.flush()
-                        os.fsync(cfg.fileno())
-                        chart_version_arguments = f" --version={app.chart.version}" if app.chart.version else ""
-                        with tracer.start_as_current_span("helm_repo_add"):
-                            await run(f"helm repo add {app.chart.helm_repo} {app.chart.helm_repo_url}")
+                                return result
 
-                        with tracer.start_as_current_span("helm_upgrade"):
-                            result = await run(
-                                "helm secrets upgrade --create-namespace"
-                                f" --history-max {MAX_HELM_HISTORY}"
-                                " --install"
-                                " --timeout=600s"
-                                f"{' --set skip_migrations=true' if self.skip_migrations else ''}"
-                                f" -f {cfg.name}"
-                                f" --namespace={app.namespace}"
-                                f" {app.name}"
-                                f" {app.chart.helm_chart} {chart_version_arguments}",
-                                suppress_errors=True,
-                            )
+                            result = await upgrade_helm_chart()
+                            if result["exit_code"] != 0 and "is in progress" in result["output"]:
+                                await self.rollback_deployment(app)
+                                result = await upgrade_helm_chart()
                 else:
                     logger.warning("Local is not implemented yet")
                     return None

{gitops-1.1.0 → gitops-1.1.2}/pyproject.toml

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

{gitops-1.1.0 → gitops-1.1.2}/release-please-config.json

@@ -1,7 +1,7 @@
 {
     "packages": {
       ".": {
-        "package-name": "cli",
+        "package-name": "gitops",
         "release-type": "python",
         "changelog-path": "CHANGELOG.md",
         "exclude-paths": [

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

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

gitops-1.1.0/gitops_server/version.py

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