gitops 0.12.0__tar.gz → 0.13.2__tar.gz

gitops-0.13.2/.github/workflows/publish.yml

@@ -0,0 +1,62 @@
+name: Release
+on:
+  release:
+    types: [published]
+  workflow_dispatch: {}
+
+
+permissions:
+  actions: read # Read the metrics
+  contents: write # to be able to publish a GitHub release
+  issues: write # to be able to comment on released issues
+  pull-requests: write # to be able to comment on released pull requests
+  id-token: write # to enable use of OIDC for npm provenance / AWS
+
+env:
+  MISE_PYTHON_COMPILE: false
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    name: Build and Push Docker Image
+    uses: uptick/actions/.github/workflows/ci.yaml@main
+    secrets:
+      SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
+    #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
+    with:
+      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
+      docker-enabled: true
+      docker-context: "."
+      docker-tag: ${{github.event.release.tag_name}}
+      docker-tag-latest: true
+      docker-image-platforms: linux/amd64
+      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      command: echo $SECRET_ENV | base64 -d > cluster.key
+
+  publish_helm_chart:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Publish Helm charts
+      uses: stefanprodan/helm-gh-pages@master
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  publish_to_pypi:
+    name: Publishes tag to pypi
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: jdx/mise-action@v2
+      with:
+        install: true
+        cache: true
+        experimental: true
+
+    - run: |
+        mise run build
+      shell: bash
+
+    - name: Publish Pypi Package
+      uses: pypa/gh-action-pypi-publish@release/v1

gitops-0.13.2/.github/workflows/release-please.yaml

@@ -0,0 +1,82 @@
+name: Release Please
+on:
+  push:
+    branches:
+      - develop
+
+permissions:
+  actions: read # Read the metrics
+  contents: write # to be able to publish a GitHub release
+  issues: write # to be able to comment on released issues
+  pull-requests: write # to be able to comment on released pull requests
+  id-token: write # to enable use of OIDC for npm provenance / AWS
+
+env:
+  MISE_PYTHON_COMPILE: false
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    outputs:
+      cli-release-created: ${{ steps.release.outputs['release_created'] }}
+      server-release-created: ${{ steps.release.outputs['gitops_server--release_created'] }}
+      helm-release-created: ${{ steps.release.outputs['charts/gitops--release_created'] }}
+      cli-version: ${{ steps.release.outputs['tag_name'] }}
+      server-version: ${{ steps.release.outputs['gitops_server--tag_name'] }}
+      helm-version: ${{ steps.release.outputs['charts/gitops--tag_name'] }}
+      sha: ${{ steps.release.outputs.sha }}
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with: {}
+
+  publish_helm_chart:
+    runs-on: ubuntu-latest
+    needs: release-please
+    if: ${{ needs.release-please.outputs.server-version }} || ${{ needs.release-please.outputs.helm-version }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish Helm charts
+        uses: helm/chart-releaser-action@v1.6.0
+        with:
+          charts_dir: charts/gitops
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  publish_to_pypi:
+    name: Publishes tag to pypi
+    runs-on: ubuntu-latest
+    needs: release-please
+    if: ${{ needs.release-please.outputs.cli-release-created}}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: jdx/mise-action@v2
+        with:
+          install: true
+          cache: true
+          experimental: true
+
+      - run: |
+          mise run build
+        shell: bash
+
+      - name: Publish Pypi Package
+        uses: pypa/gh-action-pypi-publish@release/v1
+  publish_docker_image:
+    name: Build and Push Docker Image
+    uses: uptick/actions/.github/workflows/ci.yaml@main
+    needs: release-please
+    if: ${{ needs.release-please.outputs.server-version }}
+    secrets:
+      SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
+    #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
+    with:
+      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
+      docker-enabled: true
+      docker-context: "."
+      docker-tag: "${{ needs.release-please.outputs.server-version }}"
+      docker-tag-latest: true
+      docker-image-platforms: linux/amd64
+      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      command: echo $SECRET_ENV | base64 -d > cluster.key

gitops-0.13.2/.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Test
+on:
+  push:
+    branches:
+    - develop
+  pull_request: ~
+
+permissions:
+  actions: read # Read the metrics
+  contents: write # to be able to publish a GitHub release
+  issues: write # to be able to comment on released issues
+  pull-requests: write # to be able to comment on released pull requests
+  id-token: write # to enable use of OIDC for npm provenance / AWS
+
+jobs:
+  ci:
+    uses: uptick/actions/.github/workflows/ci.yaml@main
+    secrets: inherit
+    with:
+      praise-on-fix: false
+      python-version: 3.12
+      mise: true
+      mise-install: true
+      command: |
+        mise run install
+        mise run ci
+  build:
+    name: Build and Push Docker Image
+    uses: uptick/actions/.github/workflows/ci.yaml@main
+    secrets:
+      SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
+    #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
+    with:
+      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
+      docker-enabled: true
+      docker-context: "."
+      docker-prefix: test
+      docker-tag-latest: false
+      docker-image-platforms: linux/amd64
+      docker-push: false
+      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      command: echo $SECRET_ENV | base64 -d > cluster.key
+

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

@@ -0,0 +1,5 @@
+{
+    ".": "0.13.2",
+    "gitops_server": "0.14.0",
+    "charts/gitops": "0.13.0"
+}

gitops-0.13.2/CHANGELOG.md

@@ -0,0 +1,82 @@
+# Changelog
+
+## [0.13.2](https://github.com/uptick/gitops/compare/cli-v0.13.1...cli-v0.13.2) (2024-12-05)
+
+
+### Bug Fixes
+
+* fix release-please pipeline for cli ([823eed7](https://github.com/uptick/gitops/commit/823eed79a8654f91f0bf521f70a63ae31d09e228))
+
+## [0.13.1](https://github.com/uptick/gitops/compare/cli-v0.13.0...cli-v0.13.1) (2024-12-05)
+
+
+### Bug Fixes
+
+* fix gitops bump for cross account ([d3394e3](https://github.com/uptick/gitops/commit/d3394e3214d104c323fb397d885c118a36075b5b))
+
+## [0.13.0](https://github.com/uptick/gitops/compare/cli-v0.12.1...cli-v0.13.0) (2024-11-15)
+
+
+### Features
+
+* **0.8.1:** ADded gitops db.wipe-db to delete a tenant db ([d585cf3](https://github.com/uptick/gitops/commit/d585cf357818007d27cd9e7284ba7677404cc200))
+* **0.8.5:** Added a confirmation to gitops bash/sp when run against production environment ([f65057e](https://github.com/uptick/gitops/commit/f65057ef337a6fe34f3510c889c2284c1fdb7218))
+* **0.9.7:** Bump other repos ([45bc035](https://github.com/uptick/gitops/commit/45bc0359d090897e2c99b7dbb650392d37069086))
+* Add ability to gitops bash with a serviceAccount ([c305e03](https://github.com/uptick/gitops/commit/c305e03a253786cc9eed12b116af4f844e7161bc))
+* Add gitops.db-pgcli as a command ([665bcae](https://github.com/uptick/gitops/commit/665bcae9a2018d2c7c108d14a9958501040d23af))
+* Adds sentry alerting to gitops_server ([3416398](https://github.com/uptick/gitops/commit/34163988e24bc8b679f1561bbdc8a32a82624677))
+* allow gitops db.proxy to work with RDS IAM Access ([0e91586](https://github.com/uptick/gitops/commit/0e9158690f0299bd9171648486d6ce3152c411cc))
+* Be able to bump other repos ([3b8a79e](https://github.com/uptick/gitops/commit/3b8a79e138609361b6d1b8af6b4b1e2154ad2ca1))
+* Bump the version to 0.9.8 in the __init__.py file ([f0a91de](https://github.com/uptick/gitops/commit/f0a91decb6776c2b64d42855ef5e9c0cf6d96633))
+* Bump version number to 0.8.7 ([dad4a3b](https://github.com/uptick/gitops/commit/dad4a3baee106bb82801de596c4de70e5a06f3cf))
+* **bump:** When bumping --push, pull first ([5df0ee0](https://github.com/uptick/gitops/commit/5df0ee03ecd9ba67e97d09a16fcee7d18eea4ad6))
+* **cli:** Added --cpu and --memory to bash/command/shell_plus to specify container resources ([93ae33c](https://github.com/uptick/gitops/commit/93ae33ccb0c2b3b4a356d55efb6a01ddd081d05e))
+* **cli:** efficiently find latest image using prefix search for latest image tag ([a6d8be1](https://github.com/uptick/gitops/commit/a6d8be1eb5db2dcae2527b8e07cc71e993d8c7ec))
+* **cli:** Enforce namespace as a required param for App ([28ee089](https://github.com/uptick/gitops/commit/28ee0891ae864faf907038c0a8052d96f16371b3))
+* **cli:** Update commands to use the apps namespace ([38cecf7](https://github.com/uptick/gitops/commit/38cecf7a4ff6be270a6fa37e920bcf3df73d84e8))
+* **db:** Add gb.rds-logs to fetch rds logs ([604aa73](https://github.com/uptick/gitops/commit/604aa73a5d176badd07d4a2146aa81a261cc304c))
+* Gitops bump works for repos without a prefix ([d417e61](https://github.com/uptick/gitops/commit/d417e61fd165276991bd8f28dd5b070f357296a2))
+* **gitops_server:** Update github deployment status ([fbe8811](https://github.com/uptick/gitops/commit/fbe88119814ffd49b7713487dddb85b99e63f94e))
+* **gitops-0.10.5:** add --create-namespace during install/upgrades ([c97b386](https://github.com/uptick/gitops/commit/c97b3868a67df40b2a6b312aae80d9361257ae1b))
+* **gitops-cli:** Add a minimum gitops version check ([5cff7ae](https://github.com/uptick/gitops/commit/5cff7aeb60edcc6a2413361ac6c7b5dd46c8de79))
+* **gitops:** expose App, get_app_details, get_apps as top level interfaces ([626466a](https://github.com/uptick/gitops/commit/626466a5034c532995e41b0cf476f182bb3679f0))
+* **gitops:** makes gitops db.pgcli more robust ([fb4fbcb](https://github.com/uptick/gitops/commit/fb4fbcb38166bdef1d119c2ecbebf61592f4f79d))
+* **helm:** Add service account to helm chart ([86d5361](https://github.com/uptick/gitops/commit/86d5361e5cd908be486dcfe238a2f8f8282e3a86))
+* **helm:** Modified chart to allow specifying subdomain ([63ed12e](https://github.com/uptick/gitops/commit/63ed12eeb389be9bbdb230f0586b2f4340402c8e))
+* release version 0.9.20 ([9793aea](https://github.com/uptick/gitops/commit/9793aea22877ecac49a9aee1815dc0b9923fad40))
+* **slack:** use external tickforge slack api to find slack user if provided ([862de0f](https://github.com/uptick/gitops/commit/862de0fcd0ab881d5c8154c530584e2c7fc5f2aa))
+* **status-updater:** catch the exception around self.process_work... ([726cc05](https://github.com/uptick/gitops/commit/726cc05160b6cb1eb1cb36bb5e4555ba6bb0589f))
+* swap project to uv ([91e5530](https://github.com/uptick/gitops/commit/91e5530240a344018bfa42749fe0ac8235799609))
+* Use helm-secrets for extra decryption ([025fcc7](https://github.com/uptick/gitops/commit/025fcc7996ac1f01aededf1a721cb6297b89872e))
+* Use release-please ([0324a14](https://github.com/uptick/gitops/commit/0324a148d3b7c1df47cadf8345dd42dd20906914))
+
+
+### Bug Fixes
+
+* :art: Fix linting ([e31ae69](https://github.com/uptick/gitops/commit/e31ae693687871a00959463586ff1e6924897b77))
+* :bug: Fix issue [#64](https://github.com/uptick/gitops/issues/64) ([e1f3b45](https://github.com/uptick/gitops/commit/e1f3b45d0b82ab71f009eea5f9da6c8ad34adbc5))
+* **0.9.1:** Fix slack token injection ([bd1e270](https://github.com/uptick/gitops/commit/bd1e27093a2346cae648bcb1ced492ed102e9a63))
+* async run should not default to exit code of 1 ([3495a72](https://github.com/uptick/gitops/commit/3495a7214c39f948bcef1b9577fbfb03a15ae887))
+* **bump:** exclude only if the image tag ends with -latest ([742ccd3](https://github.com/uptick/gitops/commit/742ccd349fc8c0cb1812c41b374aa1ceda4cb8cd))
+* **cli:** Fixed bump --push command being broken ([2d264d7](https://github.com/uptick/gitops/commit/2d264d7e082261cf3ce6a08593e53ceeb4149c65))
+* **cli:** Fixed mcommand not working ([565ccb2](https://github.com/uptick/gitops/commit/565ccb2c7a72268a98b95594885146221a30a92b))
+* **cli:** Rename gitops db.rds-logs to gitops db.logs ([4104059](https://github.com/uptick/gitops/commit/4104059a8b1a90a394d0a218581bd7474c91f95b))
+* correctly inject the availability zone for db commands ([db4610d](https://github.com/uptick/gitops/commit/db4610d75df1cb6520add97d43a946957b808495))
+* correctly use NetworkingV1Api ([fc76338](https://github.com/uptick/gitops/commit/fc76338a94d349eacecc07d2d8ca543929e6d966))
+* **db-proxy:** Db proxy fixed for database urls without ports ([fb20f96](https://github.com/uptick/gitops/commit/fb20f9691acbfd68abff653af532d1b86fd9baf7))
+* **deploy:** Fix httpx post request ([ba34cf4](https://github.com/uptick/gitops/commit/ba34cf4076b32f8246445cc58b4335d40a03ea60))
+* fix unsetenv to tolerate `environment: null` ([cb21e26](https://github.com/uptick/gitops/commit/cb21e268d1a80d47bdb62c439be558c9f39fbe3d))
+* **gitop-server:** Use json patch to update deployment status ([df69596](https://github.com/uptick/gitops/commit/df695968a1327da77e70cda0330364e08889fa25))
+* **gitops_cli:** Removed more usages of App as a dict ([ffa6529](https://github.com/uptick/gitops/commit/ffa65293edae9d33100aceb4c6fa6b1fc011d801))
+* **gitops-cli:** Fixed bump to select the correct image tag ([0c93664](https://github.com/uptick/gitops/commit/0c93664f8978d58f4179f770aedfeb2e3ece15c6))
+* **gitops-cli:** make error message more useful ([41b3777](https://github.com/uptick/gitops/commit/41b37770dae923b577dc226f22e49daf97a49957))
+* **gitops-cli:** Output warning message to stderr ([f09e588](https://github.com/uptick/gitops/commit/f09e588af2ca5f9c853ed7301b9b9ece83722ac1))
+* **gitops-cli:** prevent bumping to non-existent image prefix ([5c27edf](https://github.com/uptick/gitops/commit/5c27edfdce86d1da61ed0a99ce6c3b5f86eab6ff))
+* **gitops-server:** Don't raise exception if deployment doesn't exist ([91f11b8](https://github.com/uptick/gitops/commit/91f11b859e67074c8066470e3ab9b981f5816f00))
+* **server:** fix checking out branch refs for charts ([35c0fb4](https://github.com/uptick/gitops/commit/35c0fb448480306dad153f6c7dd1c889469241b9))
+
+
+### Dependencies
+
+* Added black and updated lockfile ([62367fa](https://github.com/uptick/gitops/commit/62367fab35f502a3205bccf7fcc1c565d9a51613))
+* Bumped uvicorn and mypy ([be74598](https://github.com/uptick/gitops/commit/be74598a5c34c67d006613ae033910e763522be3))

{gitops-0.12.0 → gitops-0.13.2}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.3
 Name: gitops
-Version: 0.12.0
+Version: 0.13.2
 Summary: Manage multiple apps across one or more k8s clusters.
 Author-email: Jarek Głowacki <jarekwg@gmail.com>
-License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: boto3==1.35.4
 Requires-Dist: colorama>=0.4.4

{gitops-0.12.0 → gitops-0.13.2}/charts/gitops/Chart.yaml

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

gitops-0.13.2/charts/gitops/charts/gitops/CHANGELOG.md

@@ -0,0 +1,30 @@
+# Changelog
+
+## [0.13.0](https://github.com/uptick/gitops/compare/helm-v0.12.1...helm-v0.13.0) (2024-11-15)
+
+
+### Features
+
+* Adds sentry alerting to gitops_server ([3416398](https://github.com/uptick/gitops/commit/34163988e24bc8b679f1561bbdc8a32a82624677))
+* Bump version number to 0.8.7 ([dad4a3b](https://github.com/uptick/gitops/commit/dad4a3baee106bb82801de596c4de70e5a06f3cf))
+* **cli:** Added --cpu and --memory to bash/command/shell_plus to specify container resources ([93ae33c](https://github.com/uptick/gitops/commit/93ae33ccb0c2b3b4a356d55efb6a01ddd081d05e))
+* **gitops_server:** Update github deployment status ([fbe8811](https://github.com/uptick/gitops/commit/fbe88119814ffd49b7713487dddb85b99e63f94e))
+* **gitops-0.10.5:** add --create-namespace during install/upgrades ([c97b386](https://github.com/uptick/gitops/commit/c97b3868a67df40b2a6b312aae80d9361257ae1b))
+* **helm:** Add liveness probe to helm chart ([4cec510](https://github.com/uptick/gitops/commit/4cec5100a3549c5b2562ccfc5ce09decb45c95e2))
+* **helm:** Add service account to helm chart ([86d5361](https://github.com/uptick/gitops/commit/86d5361e5cd908be486dcfe238a2f8f8282e3a86))
+* **helm:** Added sample values to values.yaml ([ab05d17](https://github.com/uptick/gitops/commit/ab05d1720143884db11701048217a25046c41002))
+* **helm:** Modified chart to allow specifying subdomain ([63ed12e](https://github.com/uptick/gitops/commit/63ed12eeb389be9bbdb230f0586b2f4340402c8e))
+* release version 0.9.20 ([9793aea](https://github.com/uptick/gitops/commit/9793aea22877ecac49a9aee1815dc0b9923fad40))
+* **slack:** use external tickforge slack api to find slack user if provided ([862de0f](https://github.com/uptick/gitops/commit/862de0fcd0ab881d5c8154c530584e2c7fc5f2aa))
+* **status-updater:** catch the exception around self.process_work... ([726cc05](https://github.com/uptick/gitops/commit/726cc05160b6cb1eb1cb36bb5e4555ba6bb0589f))
+* swap project to uv ([91e5530](https://github.com/uptick/gitops/commit/91e5530240a344018bfa42749fe0ac8235799609))
+
+
+### Bug Fixes
+
+* :bug: Fix ingrss spec ([d585a3c](https://github.com/uptick/gitops/commit/d585a3c4783eb3a9dd4285682a2839d81f3bc531))
+* **0.9.1:** Fix slack token injection ([bd1e270](https://github.com/uptick/gitops/commit/bd1e27093a2346cae648bcb1ced492ed102e9a63))
+* **cli:** Fixed mcommand not working ([565ccb2](https://github.com/uptick/gitops/commit/565ccb2c7a72268a98b95594885146221a30a92b))
+* correctly use NetworkingV1Api ([fc76338](https://github.com/uptick/gitops/commit/fc76338a94d349eacecc07d2d8ca543929e6d966))
+* **gitops-cli:** Fixed bump to select the correct image tag ([0c93664](https://github.com/uptick/gitops/commit/0c93664f8978d58f4179f770aedfeb2e3ece15c6))
+* **gitops-cli:** prevent bumping to non-existent image prefix ([5c27edf](https://github.com/uptick/gitops/commit/5c27edfdce86d1da61ed0a99ce6c3b5f86eab6ff))

{gitops-0.12.0 → gitops-0.13.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__ = "0.12.0"
+__version__ = "0.13.2"
 
 
 # Checking gitops version matches cluster repo version.

{gitops-0.12.0 → gitops-0.13.2}/gitops/core.py

@@ -81,7 +81,7 @@ def bump(  # noqa: C901
                 new_image_prefix = app.image_prefix
             else:
                 new_image_prefix = prefix
-            new_image_tag = get_latest_image(app.image_repository_name, new_image_prefix)
+            new_image_tag = get_latest_image(app.image_repository_name, new_image_prefix, app.image_repository)
         else:
             new_image_tag = image_tag
 

{gitops-0.12.0 → gitops-0.13.2}/gitops/utils/images.py

@@ -46,13 +46,17 @@ def get_latest_image(repository_name: str, prefix: str, ecr_repository: str | No
     image_tag = f"{prefix}-latest" if prefix else "latest"
 
     def add_image_to_results(image: "ImageDetailTypeDef") -> None:
+        """This function adds the image to the results list if it matches the prefix and is not the latest image.
+
+        We want to ignore the latest image tag otherwise we will never diff anything other than `develop-latest` etc.
+        """
         if prefix != "":
             if prefix_tags := [
-                tag for tag in image["imageTags"] if tag.startswith(prefix + "-") and "latest" not in tag
+                tag for tag in image["imageTags"] if tag.startswith(prefix + "-") and not tag.endswith("latest")
             ]:
                 results.append((prefix_tags[0], image["imagePushedAt"]))
         else:
-            if prefix_tags := [tag for tag in image["imageTags"] if "-" not in tag and "latest" not in tag]:
+            if prefix_tags := [tag for tag in image["imageTags"] if "-" not in tag and not tag.endswith("latest")]:
                 results.append((prefix_tags[0], image["imagePushedAt"]))
 
     try:

gitops-0.13.2/gitops_server/gitops_server/CHANGELOG.md

@@ -0,0 +1,48 @@
+# Changelog
+
+## [0.14.0](https://github.com/uptick/gitops/compare/server-v0.13.0...server-v0.14.0) (2024-11-26)
+
+
+### Features
+
+* **server:** update deploy failed messages to point to grafana ([b6a90b8](https://github.com/uptick/gitops/commit/b6a90b8e4845982a71c49b3203103f55e8332e24))
+
+## [0.13.0](https://github.com/uptick/gitops/compare/server-v0.12.1...server-v0.13.0) (2024-11-15)
+
+
+### Features
+
+* Add slack user name shaming to slack hook ([0561e29](https://github.com/uptick/gitops/commit/0561e29addb532c32d8fc9bcc623b189542c311e))
+* Adds sentry alerting to gitops_server ([3416398](https://github.com/uptick/gitops/commit/34163988e24bc8b679f1561bbdc8a32a82624677))
+* Continue even if sha is not found ([c450eae](https://github.com/uptick/gitops/commit/c450eaebc438ffd7028aff6ced683060e54d19a6))
+* Fix startup for python 3.10 ([938f8a4](https://github.com/uptick/gitops/commit/938f8a413cd350258bb893bf4356f193447bad6e))
+* **gitops_server:** Update github deployment status ([fbe8811](https://github.com/uptick/gitops/commit/fbe88119814ffd49b7713487dddb85b99e63f94e))
+* **gitops-0.10.5:** add --create-namespace during install/upgrades ([c97b386](https://github.com/uptick/gitops/commit/c97b3868a67df40b2a6b312aae80d9361257ae1b))
+* **healthcheck:** Add health check endpoint which doesn't show up in logs ([07335f0](https://github.com/uptick/gitops/commit/07335f01ac9b2d3df75ebf5f4ff7dbc5ce39cb40))
+* Limit helm history to 3 ([5d2856c](https://github.com/uptick/gitops/commit/5d2856c7af35b0ce5a66f26a5ad44e5b0b2d3a95))
+* **logs:** Add timestamps to logs ([0f3f09d](https://github.com/uptick/gitops/commit/0f3f09dddd4d6287d2ed8ddcbea316c0cbe92bc7))
+* **server:** Deploy servers into specific namespaces ([1fed618](https://github.com/uptick/gitops/commit/1fed6186a1d47a19faf93ba8848a52a000c7e1a6))
+* **slack:** use external tickforge slack api to find slack user if provided ([862de0f](https://github.com/uptick/gitops/commit/862de0fcd0ab881d5c8154c530584e2c7fc5f2aa))
+* **status-updater:** catch the exception around self.process_work... ([726cc05](https://github.com/uptick/gitops/commit/726cc05160b6cb1eb1cb36bb5e4555ba6bb0589f))
+* Use helm-secrets for extra decryption ([025fcc7](https://github.com/uptick/gitops/commit/025fcc7996ac1f01aededf1a721cb6297b89872e))
+
+
+### Bug Fixes
+
+* **0.9.1:** Fix slack token injection ([bd1e270](https://github.com/uptick/gitops/commit/bd1e27093a2346cae648bcb1ced492ed102e9a63))
+* async run should not default to exit code of 1 ([3495a72](https://github.com/uptick/gitops/commit/3495a7214c39f948bcef1b9577fbfb03a15ae887))
+* correctly use NetworkingV1Api ([fc76338](https://github.com/uptick/gitops/commit/fc76338a94d349eacecc07d2d8ca543929e6d966))
+* **deploy:** Fix httpx post request ([ba34cf4](https://github.com/uptick/gitops/commit/ba34cf4076b32f8246445cc58b4335d40a03ea60))
+* fix broken semaphore env parsing ([cad0239](https://github.com/uptick/gitops/commit/cad0239128fb4867e0567783df868ad0bf86e091))
+* **gitop-server:** Use json patch to update deployment status ([df69596](https://github.com/uptick/gitops/commit/df695968a1327da77e70cda0330364e08889fa25))
+* gitops ingress update for eks 1.22+ ([d23dc35](https://github.com/uptick/gitops/commit/d23dc35bad0ab6b1d6faa93f97e3a18f1c2db973))
+* **gitops_server:** Fix uninstall not removing apps ([f30e90e](https://github.com/uptick/gitops/commit/f30e90e961386d4f46257ac572ced6eacae5883c))
+* **gitops_server:** treat suspended servers as removed ([743abaa](https://github.com/uptick/gitops/commit/743abaa231817de2903ec7a6e7c03be68a0ddfea))
+* **gitops-server:** Don't raise exception if deployment doesn't exist ([91f11b8](https://github.com/uptick/gitops/commit/91f11b859e67074c8066470e3ab9b981f5816f00))
+* **server:** fix checking out branch refs for charts ([35c0fb4](https://github.com/uptick/gitops/commit/35c0fb448480306dad153f6c7dd1c889469241b9))
+* **slack:** forgot to await slack user ([f9b923f](https://github.com/uptick/gitops/commit/f9b923f3a8716e5523d8fb3654bcee8e1b21d515))
+
+
+### Dependencies
+
+* Bumped uvicorn and mypy ([be74598](https://github.com/uptick/gitops/commit/be74598a5c34c67d006613ae033910e763522be3))

{gitops-0.12.0 → gitops-0.13.2}/gitops_server/workers/deployer/deploy.py

@@ -3,6 +3,7 @@ import json
 import logging
 import os
 import tempfile
+import time
 import uuid
 
 from opentelemetry import trace
@@ -40,7 +41,7 @@ async def post_init_summary(source, username, added_apps, updated_apps, removed_
 @tracer.start_as_current_span("post_result")
 async def post_result(app: App, result: UpdateAppResult, deployer: "Deployer", **kwargs):
     if result["exit_code"] != 0:
-        deploy_result = await handle_failed_deploy(app, result, deployer)
+        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']}"
@@ -170,6 +171,7 @@ class Deployer:
 
             async with self.semaphore:
                 logger.info(f"Deploying app {app.name!r}.")
+                from_timestamp = time.time()
                 if app.chart.type == "git":
                     span.set_attribute("gitops.chart.type", "git")
                     assert app.chart.git_repo_url
@@ -224,7 +226,7 @@ class Deployer:
 
                 update_result = UpdateAppResult(app_name=app.name, slack_message="", **result)
 
-                await post_result(app=app, result=update_result, deployer=self)
+                await post_result(app=app, result=update_result, deployer=self, from_timestamp=from_timestamp)
             return update_result
 
     def calculate_app_deltas(self):

{gitops-0.12.0 → gitops-0.13.2}/gitops_server/workers/deployer/hooks.py

@@ -2,6 +2,8 @@
 
 import logging
 import os
+import time
+from typing import Any
 
 import httpx
 from opentelemetry import trace
@@ -17,10 +19,7 @@ tracer = trace.get_tracer(__name__)
 logger = logging.getLogger(__name__)
 
 
-async def update_issue_from_deployment_url(
-    app: App,
-    deployment_url: str,
-) -> None:
+async def update_issue_from_deployment_url(app: App, deployment_url: str, **kwargs: Any) -> None:
     async with httpx.AsyncClient() as client:
         headers = github.get_headers()
         deployment_response = await client.get(deployment_url, headers=headers)
@@ -35,10 +34,12 @@ async def update_issue_from_deployment_url(
         try:
             response = await client.post(issue_url + "/labels", json={"labels": ["NODEPLOY"]}, headers=headers)
             response.raise_for_status()
+            dashboard_url = get_dashboard_url(
+                workspace_name=app.name, from_timestamp=kwargs.get("from_timestamp"), to_timestamp=time.time()
+            )
             comment = (
                 ":poop: Failed to deploy :poop:\n Applying `NODEPLOY` label to shutdown the server"
-                " and prevent deploys until it has been fixed.\nCheck migration logs at"
-                f" https://my.papertrailapp.com/systems/{app.name}-migration/events"
+                f" and prevent deploys until it has been fixed.\nCheck migration logs at {dashboard_url}"
             )
             response = await client.post(issue_url + "/comments", json={"body": comment}, headers=headers)
             response.raise_for_status()
@@ -47,11 +48,7 @@ async def update_issue_from_deployment_url(
             return
 
 
-async def handle_successful_deploy(
-    app: App,
-    result,
-    deployer,
-) -> UpdateAppResult:
+async def handle_successful_deploy(app: App, result, deployer, **kwargs) -> UpdateAppResult:
     github_deployment_url = str(app.values.get("github/deployment_url", ""))
     await github.update_deployment(
         github_deployment_url,
@@ -64,7 +61,27 @@ async def handle_successful_deploy(
 DEFAULT_USER_GROUP = SlackGroup("devops", "", "devops", os.environ.get("DEFAULT_SLACK_USER_GROUP_ID", "S5KVCGSGP"))
 
 
-async def handle_failed_deploy(app: App, result: UpdateAppResult, deployer) -> UpdateAppResult:
+def get_dashboard_url(
+    workspace_name: str, from_timestamp: float | None = None, to_timestamp: float | None = None
+) -> str:
+    DASHBOARD_URL = "https://grafana.onuptick.com/d/workforce-failed-deploys/workforce-failed-deploys?from={from_timestamp}&to={to_timestamp}&var-workspace={workspace_name}"
+
+    if from_timestamp:
+        from_timestamp_grafana = str(int(from_timestamp * 1000))
+    else:
+        from_timestamp_grafana = "now-6h"
+
+    if to_timestamp:
+        to_timestamp_grafana = str(int(to_timestamp * 1000))
+    else:
+        to_timestamp_grafana = "now"
+
+    return DASHBOARD_URL.format(
+        workspace_name=workspace_name, from_timestamp=from_timestamp_grafana, to_timestamp=to_timestamp_grafana
+    )
+
+
+async def handle_failed_deploy(app: App, result: UpdateAppResult, deployer, **kwargs) -> UpdateAppResult:
     github_deployment_url = str(app.values.get("github/deployment_url", ""))
     if github_deployment_url:
         await github.update_deployment(
@@ -72,7 +89,7 @@ async def handle_failed_deploy(app: App, result: UpdateAppResult, deployer) -> U
             status=github.STATUSES.failure,
             description=f"Failed to deploy app. {result['output']}",
         )
-        await update_issue_from_deployment_url(app, github_deployment_url)
+        await update_issue_from_deployment_url(app, github_deployment_url, **kwargs)
 
     email = deployer.author_email
 
@@ -83,7 +100,7 @@ async def handle_failed_deploy(app: App, result: UpdateAppResult, deployer) -> U
             await find_commiter_slack_user(name=deployer.author_name, email=deployer.author_email) or DEFAULT_USER_GROUP
         )
     slack_user_msg = f" {slack_user} " if slack_user else ""
-    log_msg = f"<https://my.papertrailapp.com/systems/{app.name}-migration/events|(Migration Logs)>"
+    log_msg = f"<{get_dashboard_url(workspace_name=app.name, from_timestamp=kwargs.get("from_timestamp"), to_timestamp=time.time())}|(Deployment Logs)>"
     result["slack_message"] = (
         f"Failed to deploy app `{result['app_name']}` for cluster"
         f" `{settings.CLUSTER_NAME}` :rotating_light:"

{gitops-0.12.0 → gitops-0.13.2}/pyproject.toml

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

gitops-0.13.2/release-please-config.json

@@ -0,0 +1,31 @@
+{
+    "packages": {
+      ".": {
+        "package-name": "cli",
+        "release-type": "python",
+        "changelog-path": "CHANGELOG.md",
+        "exclude-paths": [
+            "tests/",
+            "charts/gitops",
+            "gitops_server/"
+        ]
+      },
+      "gitops_server": {
+        "package-name": "server",
+        "release-type": "python",
+        "changelog-path": "gitops_server/CHANGELOG.md",
+        "extra-files": [
+            {
+              "type": "yaml",
+              "path": "charts/gitops/Chart.yaml",
+              "jsonpath": "$.appVersion"
+            }
+        ]
+      },
+      "charts/gitops": {
+        "package-name": "helm",
+        "release-type": "helm",
+        "changelog-path": "charts/gitops/CHANGELOG.md"
+      }
+    }
+}

{gitops-0.12.0 → gitops-0.13.2}/ruff.toml

@@ -35,6 +35,4 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
-line-ending = "auto"
-docstring-code-format = false
-docstring-code-line-length = "dynamic"
+line-ending = "auto"

gitops-0.12.0/.github/workflows/publish.yml

@@ -1,77 +0,0 @@
-name: Release
-on:
-  release:
-    types: [published]
-  workflow_dispatch: {}
-
-
-permissions:
-  actions: read # Read the metrics
-  contents: write # to be able to publish a GitHub release
-  issues: write # to be able to comment on released issues
-  pull-requests: write # to be able to comment on released pull requests
-  id-token: write # to enable use of OIDC for npm provenance / AWS
-
-env:
-  MISE_PYTHON_COMPILE: false
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: ap-southeast-2
-
-    - name: Docker Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
-
-    - name: Check out the repo
-      uses: actions/checkout@v3
-
-    - name: Pull latest image. Build docker image and publish it.
-      env:
-        latest_image: 305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops:latest
-        current_image: 305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops:${{github.event.release.tag_name}}
-      run: |
-        echo ${{secrets.CLUSTER_KEY}} | base64 -d > cluster.key
-        docker pull $latest_image
-        docker build -t $latest_image --cache-from $latest_image .
-        docker push $latest_image
-        docker tag  $latest_image $current_image
-        docker push $current_image
-        echo "Published image at: $current_image"
-
-  publish_helm_chart:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Publish Helm charts
-      uses: stefanprodan/helm-gh-pages@master
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-  publish_to_pypi:
-    name: Publishes tag to pypi
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: jdx/mise-action@v2
-      with:
-        install: true
-        cache: true
-        experimental: true
-
-    - run: |
-        mise run build
-      shell: bash
-
-    - name: Publish Pypi Package
-      uses: pypa/gh-action-pypi-publish@release/v1

gitops-0.12.0/.github/workflows/test.yml

@@ -1,26 +0,0 @@
-name: Test
-on:
-  push:
-    branches:
-    - develop
-  pull_request: ~
-
-permissions:
-  actions: read # Read the metrics
-  contents: write # to be able to publish a GitHub release
-  issues: write # to be able to comment on released issues
-  pull-requests: write # to be able to comment on released pull requests
-  id-token: write # to enable use of OIDC for npm provenance / AWS
-
-jobs:
-  ci:
-    uses: uptick/actions/.github/workflows/ci.yaml@main
-    secrets: inherit
-    with:
-      praise-on-fix: false
-      python-version: 3.12
-      mise: true
-      mise-install: true
-      command: |
-        mise run install
-        mise run ci