From 8609c2a35ce1f4913e957b9390650e76a0e0d89b Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 2 Jan 2024 00:09:34 +0200 Subject: [PATCH] chore(tests): fix image reference in ci tests (#674) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- .github/workflows/common_library_tests.yaml | 14 +++++++------- library/common-test/ci/autopermissions-values.yaml | 5 ----- library/common-test/ci/init-values.yaml | 9 ++------- library/common-test/ci/persistence-values.yaml | 5 ----- library/common/values.yaml | 8 ++------ 5 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.github/workflows/common_library_tests.yaml b/.github/workflows/common_library_tests.yaml index 9410008bf..d36f358df 100644 --- a/.github/workflows/common_library_tests.yaml +++ b/.github/workflows/common_library_tests.yaml @@ -208,14 +208,14 @@ jobs: - name: Add Dependencies run: | if [[ "${{ matrix.values }}" =~ (metrics|cnpg).*-values.yaml ]]; then - helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait + helm install prometheus-operator oci://tccr.io/truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait fi if [[ "${{ matrix.values }}" =~ cnpg.*-values.yaml ]]; then - helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait + helm install cloudnative-pg oci://tccr.io/truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait fi if [[ "${{ matrix.values }}" =~ ingress.*-values.yaml ]]; then - helm install cert-manager truecharts/cert-manager --namespace cert-manager --create-namespace --wait - helm install traefik truecharts/traefik --namespace traefik --create-namespace --wait + helm install cert-manager oci://tccr.io/truecharts/cert-manager --namespace cert-manager --create-namespace --wait + helm install traefik oci://tccr.io/truecharts/traefik --namespace traefik --create-namespace --wait fi - name: Run chart-testing (install) @@ -340,9 +340,9 @@ jobs: # helm repo update # - name: Add Dependencies # run: | -# helm install prometheus-operator truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait -# helm install cloudnative-pg truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait -# helm install traefik truecharts/traefik --namespace traefik --create-namespace --wait +# helm install prometheus-operator oci://tccr.io/truecharts/prometheus-operator --namespace prometheus-operator --create-namespace --wait +# helm install cloudnative-pg oci://tccr.io/truecharts/cloudnative-pg --namespace cloudnative-pg --create-namespace --wait +# helm install traefik oci://tccr.io/truecharts/traefik --namespace traefik --create-namespace --wait # # - name: Checkout # uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 diff --git a/library/common-test/ci/autopermissions-values.yaml b/library/common-test/ci/autopermissions-values.yaml index bc35ca93e..fed24c3a0 100644 --- a/library/common-test/ci/autopermissions-values.yaml +++ b/library/common-test/ci/autopermissions-values.yaml @@ -1,8 +1,3 @@ -image: - repository: tccr.io/truecharts/whoami - pullPolicy: IfNotPresent - tag: 1.8.7@sha256:8c61f0ca92fd806fcb4ed1465cb793c05443f37951554b105b0f2dc686a95772 - service: main: enabled: true diff --git a/library/common-test/ci/init-values.yaml b/library/common-test/ci/init-values.yaml index 1d5965d79..4ecd2a4bf 100644 --- a/library/common-test/ci/init-values.yaml +++ b/library/common-test/ci/init-values.yaml @@ -1,8 +1,3 @@ -initImage: - repository: tccr.io/truecharts/alpine - tag: v3.17.0@sha256:f8607e14a5e456c1b8fe50b7f0c9371b4aae543d23080f5e2fe0bdbb06d2413b - pullPolicy: IfNotPresent - workload: main: enabled: true @@ -33,14 +28,14 @@ workload: init-cont: enabled: true type: init - imageSelector: initImage + imageSelector: alpineImage args: - echo - "Hello World" install-cont: enabled: true type: install - imageSelector: initImage + imageSelector: alpineImage args: - echo - "Hello World" diff --git a/library/common-test/ci/persistence-values.yaml b/library/common-test/ci/persistence-values.yaml index b6c904584..8f426f459 100644 --- a/library/common-test/ci/persistence-values.yaml +++ b/library/common-test/ci/persistence-values.yaml @@ -1,8 +1,3 @@ -image: - repository: tccr.io/truecharts/whoami - pullPolicy: IfNotPresent - tag: 1.8.7@sha256:8c61f0ca92fd806fcb4ed1465cb793c05443f37951554b105b0f2dc686a95772 - service: main: enabled: true diff --git a/library/common/values.yaml b/library/common/values.yaml index 62543c359..50aaad4ff 100644 --- a/library/common/values.yaml +++ b/library/common/values.yaml @@ -80,14 +80,10 @@ fallbackDefaults: # -- Explicitly set a namespace for this chart only namespace: "" -# -- Image values image: - # -- Image repository - repository: tccr.io/tccr/whoami - # -- Image tag - tag: v1.10.1@sha256:36d22e4b8a154919b819bd7283531783eca9076972e8fc631649bb7eade770d9 - # -- Image pull policy + repository: traefik/whoami pullPolicy: IfNotPresent + tag: v1.10.1@sha256:6bebf84c091b5da4d4228bf8905436e33ca371afc6f3bd52b1682b40d76b23de chartContext: APPURL: ""