From 0b3984a616208b15b7d5d8b36e38a90396575846 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:25:54 +0100 Subject: [PATCH 1/8] rename and add updatecli policies autodiscovery --- update-compose.yaml => updatecli-compose.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) rename update-compose.yaml => updatecli-compose.yaml (70%) diff --git a/update-compose.yaml b/updatecli-compose.yaml similarity index 70% rename from update-compose.yaml rename to updatecli-compose.yaml index d40020933..91bc4a599 100644 --- a/update-compose.yaml +++ b/updatecli-compose.yaml @@ -1,3 +1,5 @@ +# Config file for `updatecli compose ...`. +# https://www.updatecli.io/docs/core/compose/ policies: - name: Handle apm-data server specs policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-data-spec:0.2.0@sha256:7069c0773d44a74c4c8103b4d9957b468f66081ee9d677238072fe11c4d2197c @@ -16,3 +18,9 @@ policies: values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/apm-json-specs.yml + + - name: Update Updatecli policies + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.8.0@sha256:99e9e61b501575c2c176c39f2275998d198b590a3f6b1fe829f7315f8d457e7f + values: + - .ci/updatecli/values.d/scm.yml + - .ci/updatecli/values.d/update-compose.yml \ No newline at end of file From 4ab62144f04346882b6ea9b145798b54171ed4a4 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:27:35 +0100 Subject: [PATCH 2/8] bump versions and use latest updatecli version --- .github/workflows/updatecli.yml | 6 ++++++ updatecli-compose.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 4f7219c5e..27a7e8378 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -38,12 +38,18 @@ jobs: - uses: elastic/oblt-actions/updatecli/run@v1 with: command: --experimental compose diff + # TODO: update to the latest version so the policies can work as expected. + # latest changes in the policies require to use the dependson feature. + version: "v0.88.0" env: GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} - uses: elastic/oblt-actions/updatecli/run@v1 with: command: --experimental compose apply + # TODO: update to the latest version so the policies can work as expected. + # latest changes in the policies require to use the dependson feature. + version: "v0.88.0" env: GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index 91bc4a599..e27710ace 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -2,25 +2,25 @@ # https://www.updatecli.io/docs/core/compose/ policies: - name: Handle apm-data server specs - policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-data-spec:0.2.0@sha256:7069c0773d44a74c4c8103b4d9957b468f66081ee9d677238072fe11c4d2197c + policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-data-spec:0.6.0@sha256:c0bbdec23541bed38df1342c95aeb601530a113db1ff11715c1c7616ed5e9e8b values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/apm-data-spec.yml - name: Handle apm gherkin specs - policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-gherkin:0.2.0@sha256:26a30ad2b98a6e4cb17fb88a28fa3277ced8ca862d6388943afaafbf8ee96e7d + policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-gherkin:0.6.0@sha256:dbaf4d855c5c212c3b5a8d2cc98c243a2b769ac347198ae8814393a1a0576587 values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/apm-gherkin.yml - name: Handle apm json specs - policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-json-specs:0.2.0@sha256:969a6d21eabd6ebea66cb29b35294a273d6dbc0f7da78589c416aedf08728e78 + policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-json-specs:0.6.0@sha256:e5a74c159ceed02fd20515ea76fa25ff81e3ccf977e74e636f9973db86aa52a5 values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/apm-json-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.8.0@sha256:99e9e61b501575c2c176c39f2275998d198b590a3f6b1fe829f7315f8d457e7f + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.6.0@sha256:6bd6999620674b2fbb1d374f7a1a5e9740d042667f0592900b44259f3e1ae98f values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml \ No newline at end of file From 854dbb919f01c6ec1e530730603fbc38c6470b75 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:31:33 +0100 Subject: [PATCH 3/8] add missing --- .ci/updatecli/values.d/update-compose.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .ci/updatecli/values.d/update-compose.yml diff --git a/.ci/updatecli/values.d/update-compose.yml b/.ci/updatecli/values.d/update-compose.yml new file mode 100644 index 000000000..02df609f2 --- /dev/null +++ b/.ci/updatecli/values.d/update-compose.yml @@ -0,0 +1,3 @@ +spec: + files: + - "updatecli-compose.yaml" \ No newline at end of file From 3705097e4a77efd5d9f7672bba527f4fd9f80264 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:33:11 +0100 Subject: [PATCH 4/8] bump --- updatecli-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index e27710ace..ad984fcad 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -20,7 +20,7 @@ policies: - .ci/updatecli/values.d/apm-json-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.6.0@sha256:6bd6999620674b2fbb1d374f7a1a5e9740d042667f0592900b44259f3e1ae98f + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.8.0@sha256:99e9e61b501575c2c176c39f2275998d198b590a3f6b1fe829f7315f8d457e7f values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml \ No newline at end of file From 92d20b4e9a2e3555ae0d98ee04288eea03e30047 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:33:38 +0100 Subject: [PATCH 5/8] Revert "bump" This reverts commit 3705097e4a77efd5d9f7672bba527f4fd9f80264. --- updatecli-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index ad984fcad..e27710ace 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -20,7 +20,7 @@ policies: - .ci/updatecli/values.d/apm-json-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.8.0@sha256:99e9e61b501575c2c176c39f2275998d198b590a3f6b1fe829f7315f8d457e7f + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.6.0@sha256:6bd6999620674b2fbb1d374f7a1a5e9740d042667f0592900b44259f3e1ae98f values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml \ No newline at end of file From 46ecfbdd8875481548ab20001a7140d69b55ee56 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:34:36 +0100 Subject: [PATCH 6/8] rename --- .ci/updatecli/values.d/update-compose.yml | 2 +- updatecli-compose.yaml => update-compose.yaml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename updatecli-compose.yaml => update-compose.yaml (100%) diff --git a/.ci/updatecli/values.d/update-compose.yml b/.ci/updatecli/values.d/update-compose.yml index 02df609f2..8804f9661 100644 --- a/.ci/updatecli/values.d/update-compose.yml +++ b/.ci/updatecli/values.d/update-compose.yml @@ -1,3 +1,3 @@ spec: files: - - "updatecli-compose.yaml" \ No newline at end of file + - "update-compose.yaml" \ No newline at end of file diff --git a/updatecli-compose.yaml b/update-compose.yaml similarity index 100% rename from updatecli-compose.yaml rename to update-compose.yaml From dc89cfc7eefa46388d0059bc69cf369912f410cf Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:38:48 +0100 Subject: [PATCH 7/8] update values --- .ci/updatecli/values.d/scm.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.ci/updatecli/values.d/scm.yml b/.ci/updatecli/values.d/scm.yml index 876325fb5..948264b1d 100644 --- a/.ci/updatecli/values.d/scm.yml +++ b/.ci/updatecli/values.d/scm.yml @@ -2,6 +2,10 @@ scm: enabled: true owner: elastic repository: apm-agent-dotnet + apm_repository: apm branch: main - -signedcommit: true \ No newline at end of file + commitusingapi: true + # begin update-compose policy values + user: obltmachine + email: obltmachine@users.noreply.github.com + # end update-compose policy values From f0d8fb0225ce1921e7109ccb184a511660eb3bad Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Dec 2024 11:39:45 +0100 Subject: [PATCH 8/8] unrequired --- .ci/updatecli/values.d/scm.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/updatecli/values.d/scm.yml b/.ci/updatecli/values.d/scm.yml index 948264b1d..a24b052d7 100644 --- a/.ci/updatecli/values.d/scm.yml +++ b/.ci/updatecli/values.d/scm.yml @@ -2,7 +2,6 @@ scm: enabled: true owner: elastic repository: apm-agent-dotnet - apm_repository: apm branch: main commitusingapi: true # begin update-compose policy values