From 82473f0d3f7bbb09543a0b0572b002ca8f091636 Mon Sep 17 00:00:00 2001 From: Michal Hucko Date: Fri, 11 Oct 2024 13:08:01 +0200 Subject: [PATCH 1/2] Pin otel controller image (#232) --- charms/knative-operator/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charms/knative-operator/config.yaml b/charms/knative-operator/config.yaml index ee8bc057..1660be3d 100644 --- a/charms/knative-operator/config.yaml +++ b/charms/knative-operator/config.yaml @@ -2,6 +2,6 @@ # See LICENSE file for licensing details. options: otel-collector-image: - default: "otel/opentelemetry-collector:latest" + default: "otel/opentelemetry-collector:0.110.0" type: string description: Image to use by the otel collector Deployment. From f1019ca77f68cf738d73a170aca90fb9e7abe383 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:08:17 +0000 Subject: [PATCH 2/2] chore(deps): update canonical/charming-actions action to v2.6.3 --- .github/workflows/publish.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5765f962..0dc92213 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -58,7 +58,7 @@ jobs: ref: ${{ inputs.source_branch }} - name: Select charmhub channel - uses: canonical/charming-actions/channel@2.6.2 + uses: canonical/charming-actions/channel@2.6.3 id: select-channel if: ${{ inputs.destination_channel == '' }} @@ -84,7 +84,7 @@ jobs: echo "::set-output name=tag_prefix::$tag_prefix" - name: Upload charm to charmhub - uses: canonical/charming-actions/upload-charm@2.6.2 + uses: canonical/charming-actions/upload-charm@2.6.3 with: credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }} github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 57fc88dc..38c4ed1b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Release charm to channel - uses: canonical/charming-actions/release-charm@2.6.2 + uses: canonical/charming-actions/release-charm@2.6.3 with: credentials: ${{ secrets.CHARMCRAFT_CREDENTIALS }} github-token: ${{ secrets.GITHUB_TOKEN }}