Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-observability-collector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Validate collector configuration
run: docker run --rm --env OBSERVABILITY_PROJECT_ID="${OBSERVABILITY_PROJECT_ID}" --env OBSERVABILITY_METRIC_LOCATION="${OBSERVABILITY_METRIC_LOCATION}" --volume "${PWD}/gcp/observability/collector/config.yaml:/etc/otelcol-google/config.yaml:ro" us-docker.pkg.dev/cloud-ops-agents-artifacts/google-cloud-opentelemetry-collector/otelcol-google:0.160.0 validate --config=/etc/otelcol-google/config.yaml
run: docker run --rm --env OBSERVABILITY_PROJECT_ID="${OBSERVABILITY_PROJECT_ID}" --env OBSERVABILITY_METRIC_LOCATION="${OBSERVABILITY_METRIC_LOCATION}" --volume "${PWD}/gcp/observability/collector/config.yaml:/etc/otelcol-google/config.yaml:ro" us-docker.pkg.dev/cloud-ops-agents-artifacts/google-cloud-opentelemetry-collector/otelcol-google:0.163.1 validate --config=/etc/otelcol-google/config.yaml
- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
with:
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Set up uv
uses: astral-sh/setup-uv@v6
with:
version: "0.12.1"
version: "0.13.4"
- name: Build and deploy collector
id: collector
run: bash .github/scripts/deploy_observability_collector.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Setup uv
uses: astral-sh/setup-uv@v6
with:
version: "0.12.1"
version: "0.13.4"
- name: Install changelog tool
run: pip install towncrier
- name: Bump project version
Expand Down
1 change: 1 addition & 0 deletions changelog.d/emudhra-ca-trust-update.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Stop trusting the compromised eMudhra (emSign) intermediate certificate authorities: upgrade certifi to 2026.10.19, refresh the Cloud Run image's operating-system CA bundle and point gRPC clients at it instead of the CA list bundled in grpcio, and raise uv to 0.13.4 and the observability collector image to 0.163.1.
7 changes: 4 additions & 3 deletions gcp/cloud_run/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
FROM python:3.12-slim

COPY --from=ghcr.io/astral-sh/uv:0.12.1 /uv /uvx /bin/
COPY --from=ghcr.io/astral-sh/uv:0.13.4 /uv /uvx /bin/

RUN apt-get update \
&& apt-get install -y --no-install-recommends build-essential \
&& apt-get install -y --no-install-recommends build-essential ca-certificates \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1 \
UV_PROJECT_ENVIRONMENT=/opt/venv \
PATH="/opt/venv/bin:${PATH}"
PATH="/opt/venv/bin:${PATH}" \
GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=/etc/ssl/certs/ca-certificates.crt

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion gcp/observability/collector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us-docker.pkg.dev/cloud-ops-agents-artifacts/google-cloud-opentelemetry-collector/otelcol-google:0.160.0
FROM us-docker.pkg.dev/cloud-ops-agents-artifacts/google-cloud-opentelemetry-collector/otelcol-google:0.163.1

COPY config.yaml /etc/otelcol-google/config.yaml

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_alembic_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_versioning_refreshes_the_lock_after_bumping_the_project_version():
changelog_target = makefile[makefile.index("changelog:") :]

assert "uses: astral-sh/setup-uv@v6" in versioning_job
assert 'version: "0.12.1"' in versioning_job
assert 'version: "0.13.4"' in versioning_job
assert versioning_job.index("python .github/bump_version.py") < (
versioning_job.index("uv lock")
)
Expand Down
8 changes: 4 additions & 4 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading