gitops 0.12.1__tar.gz → 0.14.0__tar.gz

gitops-0.14.0/.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::610829907584: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: "610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      command: echo $SECRET_ENV | base64 -d > cluster.key

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

@@ -0,0 +1,41 @@
+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::610829907584:role/default-github-actions-ci-role"
+      docker-enabled: true
+      docker-context: "."
+      docker-prefix: test
+      docker-tag-latest: false
+      docker-image-platforms: linux/amd64
+      docker-repository: "610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      command: echo $SECRET_ENV | base64 -d > cluster.key

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

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

gitops-0.14.0/CHANGELOG.md

@@ -0,0 +1,89 @@
+# Changelog
+
+## [0.14.0](https://github.com/uptick/gitops/compare/cli-v0.13.2...cli-v0.14.0) (2024-12-06)
+
+
+### Features
+
+* **server:** add an updating emoji during deployments ([002d160](https://github.com/uptick/gitops/commit/002d160daa4a90ebf158cd3e0fc224cb3854baba))
+
+## [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.1 → gitops-0.14.0}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.3
 Name: gitops
-Version: 0.12.1
+Version: 0.14.0
 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
@@ -18,6 +17,7 @@ Requires-Dist: fastapi==0.109.2; extra == 'server'
 Requires-Dist: httpx<0.24.0,>=0.23.0; extra == 'server'
 Requires-Dist: kubernetes-asyncio>=25.1.2; extra == 'server'
 Requires-Dist: sentry-sdk>=1.3.0; extra == 'server'
+Requires-Dist: slack-sdk>=3.33.5; extra == 'server'
 Requires-Dist: uptick-observability[fastapi]>=0.2.2; extra == 'server'
 Requires-Dist: uvicorn>=0.17.6; extra == 'server'
 Description-Content-Type: text/markdown

{gitops-0.12.1 → gitops-0.14.0}/charts/gitops/Chart.yaml

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

gitops-0.14.0/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.1 → gitops-0.14.0}/charts/gitops/templates/deployment.yml

@@ -39,18 +39,13 @@ spec:
         - containerPort: 8000
         resources:
           requests:
-            memory: "200Mi"
+            memory: "750Mi"
           limits:
-            memory: "1000Mi"
+            memory: "1500Mi"
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-environment
         env:
-          - name: SLACK_URL
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Release.Name }}-secret
-                key: SLACK_URL
           - name: SLACK_TOKEN
             valueFrom:
               secretKeyRef:

{gitops-0.12.1 → gitops-0.14.0}/charts/gitops/values.yaml

@@ -7,10 +7,11 @@ environment:
   CLUSTER_NAME: "test"
   # Specify the timezone for logging purposes. EG: Australia/Melbourne
   TZ: "UTC"
+  # The channel id to send slack messages to
+  SLACK_CHANNEL_ID: ""
 
 secrets:
   ACCOUNT_ID: ""
-  SLACK_URL: ""
   SLACK_TOKEN: ""
   GITHUB_OAUTH_TOKEN: ""
   GITHUB_WEBHOOK_KEY: ""

{gitops-0.12.1 → gitops-0.14.0}/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.1"
+__version__ = "0.14.0"
 
 
 # Checking gitops version matches cluster repo version.

{gitops-0.12.1 → gitops-0.14.0}/gitops/common/app.py

@@ -79,7 +79,10 @@ class App:
         def encode(value: str) -> str:
             return b64encode(str(value).encode()).decode() if self.encode_secrets else value
 
-        values = {**deployments, "secrets": {**{k: encode(v) for k, v in secrets.items()}}}
+        values = {
+            **deployments,
+            "secrets": {**{k: encode(v) for k, v in secrets.items()}},
+        }
 
         image = self._make_image(deployments)
         if image:
@@ -101,7 +104,7 @@ class App:
 
     @property
     def image(self) -> str:
-        """[305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:yoink-9f03ac80f3]"""
+        """[610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:yoink-9f03ac80f3]"""
         image = self.values.get("image", "")
         if isinstance(image, dict):
             return f"{image['repository']}:{image.get('tag','latest')}"
@@ -110,23 +113,23 @@ class App:
 
     @property
     def image_repository_name(self) -> str:
-        """305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/[uptick]:yoink-9f03ac80f3"""
+        """610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/[uptick]:yoink-9f03ac80f3"""
         return self.image.split(":")[0].split("/")[-1]
 
     @property
     def image_repository(self) -> str:
-        """[305686791668.dkr.ecr.ap-southeast-2.amazonaws.com]/uptick:yoink-9f03ac80f3"""
+        """[610829907584.dkr.ecr.ap-southeast-2.amazonaws.com]/uptick:yoink-9f03ac80f3"""
         return self.image.split("/")[0]
 
     @property
     def image_tag(self) -> str:
-        """305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink-9f03ac80f3]"""
+        """610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink-9f03ac80f3]"""
         return self.image.split(":")[-1]
 
     @property
     def image_prefix(self) -> str:
         """Gets the image prefix portion of {prefix}-{git hash}
-        305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink]-9f03ac80f3
+        610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink]-9f03ac80f3
 
         eg: qa-server-12345 -> qa-server
         """

{gitops-0.12.1 → gitops-0.14.0}/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.1 → gitops-0.14.0}/gitops/utils/images.py

@@ -28,7 +28,7 @@ def get_image(tag: str) -> str:
 def get_latest_image(repository_name: str, prefix: str, ecr_repository: str | None = None) -> str | None:  # noqa:C901
     """Finds latest image in ECR with the given prefix and returns the image tag
 
-    param ecr_repository is expected in this format: 305686791668.dkr.ecr.ap-southeast-2.amazonaws.com
+    param ecr_repository is expected in this format: 610829907584.dkr.ecr.ap-southeast-2.amazonaws.com
     """
     describe_image_args = {}
     region_name = None

gitops-0.14.0/gitops_server/gitops_server/CHANGELOG.md

@@ -0,0 +1,55 @@
+# Changelog
+
+## [0.15.0](https://github.com/uptick/gitops/compare/server-v0.14.0...server-v0.15.0) (2024-12-06)
+
+
+### Features
+
+* **server:** add an updating emoji during deployments ([002d160](https://github.com/uptick/gitops/commit/002d160daa4a90ebf158cd3e0fc224cb3854baba))
+
+## [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.14.0/gitops_server/settings.py

@@ -0,0 +1,15 @@
+import os
+
+CLUSTER_NAME = os.getenv("CLUSTER_NAME", "")
+# Namespace to search/deploy into
+CLUSTER_NAMESPACE = os.getenv("CLUSTER_NAMESPACE", "")
+ACCOUNT_ID = os.getenv("ACCOUNT_ID", "")
+GITHUB_WEBHOOK_KEY = os.getenv("GITHUB_WEBHOOK_KEY", "")
+
+SLACK_API_USERS_URL = os.environ.get("SLACK_API_USERS_URL", "https://slack.com/api/users.list")
+SLACK_TOKEN = os.environ.get("SLACK_TOKEN")
+# The slack channel ID starts with C
+SLACK_CHANNEL_ID = os.environ.get("SLACK_CHANNEL_ID", "")
+
+# How many parallel deploys can be done at once
+GITOPS_MAX_PARALLEL_DEPLOYS = os.environ.get("GITOPS_MAX_PARALLEL_DEPLOYS", "5")

{gitops-0.12.1 → gitops-0.14.0}/gitops_server/utils/slack.py

@@ -1,15 +1,14 @@
 import dataclasses
 import logging
-import os
 from collections.abc import Iterable
 
 import httpx
+import slack_sdk
 
-logger = logging.getLogger("gitops")
+from gitops_server import settings
 
-SLACK_URL = os.environ.get("SLACK_URL")
-SLACK_API_USERS_URL = os.environ.get("SLACK_API_USERS_URL", "https://slack.com/api/users.list")
-SLACK_TOKEN = os.environ.get("SLACK_TOKEN")
+logger = logging.getLogger("gitops")
+client = slack_sdk.WebClient(token=settings.SLACK_TOKEN)
 
 
 @dataclasses.dataclass
@@ -28,31 +27,43 @@ class SlackGroup(SlackUser):
         return f"<!subteam^{self.id}|{self.name}>"
 
 
-async def post(message: str) -> None:
-    """Post a message to a slack channel
+async def post(message: str) -> str | None:
+    """Post a message to a slack channel"""
+    logger.info("POSTING TO SLACK")
+    if settings.SLACK_TOKEN and settings.SLACK_CHANNEL_ID:
+        response = client.chat_postMessage(channel=settings.SLACK_CHANNEL_ID, text=message)
+        if response.status_code >= 300:
+            logger.warning("Failed to post a message to slack (see below):")
+            logger.error(f"{message}", exc_info=True)
+        else:
+            return response.data["ts"]  # type: ignore
+    return None
+
 
-    Uses the environment variable `SLACK_URL` to know which channel to post to.
-    This URL is obtained by registering an integration with Slack.
+async def update(*, ts: str, message: str) -> str | None:
+    """Update an existing  message to a slack channel
+
+    https://api.slack.com/methods/chat.update
     """
-    logger.info("POSTING TO SLACK")
-    data = {"text": message}
-    async with httpx.AsyncClient() as client:
-        if SLACK_URL:
-            response = await client.post(SLACK_URL, json=data)
-            if response.status_code >= 300:
-                logger.warning("Failed to post a message to slack (see below):")
-                logger.error(f"{message}", exc_info=True)
+    if settings.SLACK_TOKEN and settings.SLACK_CHANNEL_ID:
+        response = client.chat_update(channel=settings.SLACK_CHANNEL_ID, ts=ts, text=message)
+        if response.status_code >= 300:
+            logger.warning("Failed to post a message to slack (see below):")
+            logger.error(f"{message}", exc_info=True)
+        else:
+            return response.data["ts"]  # type: ignore
+    return None
 
 
 async def find_commiter_slack_user(name: str, email: str) -> SlackUser | None:
     """Find a slack user by name or email using the slack API"""
-    if not SLACK_TOKEN:
+    if not settings.SLACK_TOKEN:
         return None
 
     async with httpx.AsyncClient() as client:
         response = await client.get(
-            f"{SLACK_API_USERS_URL}?limit=5&pretty=1",
-            headers={"Authorization": f"Bearer {SLACK_TOKEN}"},
+            f"{settings.SLACK_API_USERS_URL}?limit=5&pretty=1",
+            headers={"Authorization": f"Bearer {settings.SLACK_TOKEN}"},
             params={"name": name, "email": email},
         )
         data = response.json()