diff --git a/graduated/gitops-argocd-sync/CHANGELOG.md b/graduated/gitops-argocd-sync/CHANGELOG.md index 867867a20..ff05c20dc 100644 --- a/graduated/gitops-argocd-sync/CHANGELOG.md +++ b/graduated/gitops-argocd-sync/CHANGELOG.md @@ -1,4 +1,12 @@ # Changelog +## [1.5.1] - 2026-11-13 +### Fixed +- Rebase the image on Python 3.14.10 (GA). The previous base, 3.13.0a5, was an alpha build +- Pin all Python dependencies, including anyio. Unpinned anyio 4.11+ crashed on import under 3.13.0a5 +- Update certifi to 2026.10.23 and refresh requests, urllib3, idna and the other pins +- Fix NameError on start (undefined NAMESPACE) and the get_app_status query variable, both from 1.5.0 +- Default IMAGE_TAG to 1.5.1, so APP_NAMESPACE is no longer ignored by the 1.4.5 image + ## [1.5.0] - 2025-01-29 ### Changed - Add APP_NAMESPACE option (supported from app-proxy v1.2600.1) diff --git a/graduated/gitops-argocd-sync/Dockerfile b/graduated/gitops-argocd-sync/Dockerfile index 65426bec2..cc277de20 100644 --- a/graduated/gitops-argocd-sync/Dockerfile +++ b/graduated/gitops-argocd-sync/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13.0a5-bookworm +FROM python:3.14.10-slim-trixie # USER codefresh @@ -6,7 +6,7 @@ RUN useradd -d /home/codefresh -m -s /usr/bin/bash codefresh USER codefresh WORKDIR /home/codefresh -ENV PYTHONPATH /home/codefresh/.local/lib/python3.13/site-packages/ +ENV PYTHONPATH=/home/codefresh/.local/lib/python3.14/site-packages/ COPY --chown=codefresh requirements.txt requirements.txt RUN pip3 install --upgrade pip diff --git a/graduated/gitops-argocd-sync/argocd_sync.py b/graduated/gitops-argocd-sync/argocd_sync.py index 28efc3a8e..defd8a0a4 100644 --- a/graduated/gitops-argocd-sync/argocd_sync.py +++ b/graduated/gitops-argocd-sync/argocd_sync.py @@ -51,7 +51,7 @@ def main(): logging.debug("RUNTIME: %s", RUNTIME) logging.debug("APPLICATION: %s", APPLICATION) - logging.debug("NAMESPACE: %s", NAMESPACE) + logging.debug("APP_NAMESPACE: %s", APP_NAMESPACE) logging.debug("WAIT: %s", WAIT_HEALTHY) logging.debug("INTERVAL: %d", INTERVAL) logging.debug("MAX CHECKS: %s", MAX_CHECKS) @@ -361,7 +361,7 @@ def application_autosync(ingress_host): logging.debug("Application Sync policy result: %s", err) sys.exit(1) - logging.debug("App sync Policy: ", result['applicationProxyQuery']['spec']['syncPolicy']['automated']) + logging.debug("App sync Policy: %s", result['applicationProxyQuery']['spec']['syncPolicy']['automated']) if result['applicationProxyQuery']['spec']['syncPolicy']['automated'] == None: return False else: diff --git a/graduated/gitops-argocd-sync/queries/get_app_status.graphql b/graduated/gitops-argocd-sync/queries/get_app_status.graphql index 9d470143e..7dd563bc4 100644 --- a/graduated/gitops-argocd-sync/queries/get_app_status.graphql +++ b/graduated/gitops-argocd-sync/queries/get_app_status.graphql @@ -1,6 +1,6 @@ -query appstatus ($name: String!, $applicationNamespace: String) { +query appstatus ($applicationName: String!, $applicationNamespace: String) { applicationProxyQuery( - name: $name, + name: $applicationName, appNamespace: $applicationNamespace ){ metadata { diff --git a/graduated/gitops-argocd-sync/requirements.txt b/graduated/gitops-argocd-sync/requirements.txt index ca8a59832..997c96eac 100644 --- a/graduated/gitops-argocd-sync/requirements.txt +++ b/graduated/gitops-argocd-sync/requirements.txt @@ -1,11 +1,14 @@ +anyio==4.16.0 backoff==2.2.1 -certifi==2024.2.2 -charset-normalizer==3.3.2 -gql==3.5.0 -graphql-core==3.2.3 -idna==3.6 -multidict==6.0.5 -requests==2.31.0 +certifi==2026.10.23 +charset-normalizer==3.5.2 +gql==3.5.3 +graphql-core==3.2.6 +idna==3.20 +multidict==7.2.1 +propcache==0.5.4 +requests==2.34.2 requests-toolbelt==1.0.0 -urllib3==2.2.1 -yarl==1.9.4 +typing_extensions==4.16.0 +urllib3==2.8.0 +yarl==1.25.1 diff --git a/graduated/gitops-argocd-sync/step.yaml b/graduated/gitops-argocd-sync/step.yaml index 1a818d700..1733ad7d6 100644 --- a/graduated/gitops-argocd-sync/step.yaml +++ b/graduated/gitops-argocd-sync/step.yaml @@ -1,7 +1,7 @@ kind: step-type metadata: name: gitops-argocd-sync - version: 1.5.0 + version: 1.5.1 isPublic: true description: Syncs Argo CD apps managed by our GitOps Runtimes sources: @@ -125,7 +125,7 @@ spec: }, "IMAGE_TAG": { "type": "string", - "default": "1.4.5", + "default": "1.5.1", "description": "OPTIONAL - To overwrite the tag to use" } }