From 8c0c9e231c9003da1f09786bf3a96df6c8b3aa68 Mon Sep 17 00:00:00 2001 From: Matthew Elwell Date: Thu, 27 Mar 2025 12:07:40 +0000 Subject: [PATCH 1/8] Update docker proxy URL --- charts/flagsmith/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml index 780dbade..2bf62883 100644 --- a/charts/flagsmith/values.yaml +++ b/charts/flagsmith/values.yaml @@ -6,7 +6,7 @@ common: api: image: - repository: flagsmith.docker.scarf.sh/flagsmith/flagsmith-api + repository: docker.flagsmith.com/flagsmith/flagsmith-api tag: null # defaults to .Chart.AppVersion imagePullPolicy: IfNotPresent imagePullSecrets: [] @@ -95,7 +95,7 @@ frontend: # pointing at the single Docker image that serves both. enabled: true image: - repository: flagsmith.docker.scarf.sh/flagsmith/flagsmith-frontend + repository: docker.flagsmith.com/flagsmith/flagsmith-frontend tag: null # defaults to .Chart.AppVersion imagePullPolicy: IfNotPresent imagePullSecrets: [] From 879eaaac309fb4e710d6cf8fd33c6857eb60bc7d Mon Sep 17 00:00:00 2001 From: Matthew Elwell Date: Tue, 29 Apr 2025 16:20:28 +0100 Subject: [PATCH 2/8] Add test workflow to verify docker access --- .github/workflows/test.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 00000000..9d8ccef1 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,32 @@ +name: Testing docker.flagsmith.com access + +on: + pull_request: + +jobs: + foo: + runs-on: ubuntu-latest + steps: + - run: echo "Hello world" + + test: + runs-on: ubuntu-latest + + services: + flagsmith: + image: docker.flagsmith.com/flagsmith/flagsmith + ports: + - 8000:8000 + env: + DATABASE_URL: "postgresql://postgres:password@postgres:5432/postgres" + postgres: + image: postgres:14 + ports: + - 5432:5432 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + POSTGRES_DB: postgres + + steps: + - run: curl http://localhost:8000/version From ca3f5ca338a8ef0665da7d22ae34045652c9b150 Mon Sep 17 00:00:00 2001 From: Matthew Elwell Date: Tue, 29 Apr 2025 16:21:11 +0100 Subject: [PATCH 3/8] Replace image repository in test values --- charts/flagsmith/ci/e2e-test-values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/flagsmith/ci/e2e-test-values.yaml b/charts/flagsmith/ci/e2e-test-values.yaml index b131a30f..6f384e23 100644 --- a/charts/flagsmith/ci/e2e-test-values.yaml +++ b/charts/flagsmith/ci/e2e-test-values.yaml @@ -2,10 +2,14 @@ _destructiveTests: enabled: true frontend: + image: + repository: flagsmith/flagsmith-frontend extraEnv: SLACK_TOKEN: "${SLACK_TOKEN}" api: + image: + repository: flagsmith/flagsmith-api analytics: enabled: true extraEnv: From 3b541bfa075b87fc7f9110eae5e6053cc031182c Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Tue, 29 Apr 2025 16:56:56 +0100 Subject: [PATCH 4/8] debug --- .github/workflows/lint-test.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 7b68951f..b498f3ac 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -1,7 +1,5 @@ name: Lint and Test Charts - on: pull_request - jobs: lint-test: runs-on: ubuntu-latest @@ -10,7 +8,6 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Envsubst uses: danielr1996/envsubst-action@1.0.0 env: @@ -18,19 +15,15 @@ jobs: with: input: charts/flagsmith/ci/e2e-test-values.yaml output: charts/flagsmith/ci/e2e-test-values.yaml - - name: Set up Helm uses: azure/setup-helm@v4 with: version: v3.17.0 - - uses: actions/setup-python@v5 with: python-version: 3.11 - - name: Set up chart-testing uses: helm/chart-testing-action@v2.7.0 - - name: Run chart-testing (list-changed) id: list-changed run: | @@ -38,13 +31,10 @@ jobs: if [[ -n "$changed" ]]; then echo "::set-output name=changed::true" fi - - name: Run chart-testing (lint) run: ct lint --config ct.yaml --lint-conf lintconf.yaml --check-version-increment=false - - name: Create kind cluster uses: helm/kind-action@v1.2.0 if: steps.list-changed.outputs.changed == 'true' - - name: Run chart-testing (install) - run: ct install --config ct.yaml + run: ct install --config ct.yaml --debug From 9faaaf943e96a69afb1639d95245b24e1a62b4c1 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Tue, 29 Apr 2025 17:01:02 +0100 Subject: [PATCH 5/8] reduce timeout --- ct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index f5e4bdf5..5ea093a0 100644 --- a/ct.yaml +++ b/ct.yaml @@ -7,4 +7,4 @@ chart-repos: - kiwigrid=https://kiwigrid.github.io target-branch: main validate-maintainers: false -helm-extra-args: '--timeout 30m' +helm-extra-args: '--timeout 1m' From 8893b904987faf8bfc89f88fc24505510cf1dc09 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Tue, 29 Apr 2025 17:02:40 +0100 Subject: [PATCH 6/8] additional logging --- .github/workflows/lint-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index b498f3ac..41d3ccc9 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -37,4 +37,5 @@ jobs: uses: helm/kind-action@v1.2.0 if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) - run: ct install --config ct.yaml --debug + run: ct install --namespace flagsmith --config ct.yaml --debug + - run: kubectl --namespace flagsmith describe pods From a41291f3ba9e5e4b2864d18cb5b911c25cc6375c Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Tue, 29 Apr 2025 17:07:35 +0100 Subject: [PATCH 7/8] enable output --- .github/workflows/lint-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 41d3ccc9..d4e118d8 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -39,3 +39,4 @@ jobs: - name: Run chart-testing (install) run: ct install --namespace flagsmith --config ct.yaml --debug - run: kubectl --namespace flagsmith describe pods + if: failure() From eeb53a48cc552b1a969962c88309df51a6476826 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Tue, 29 Apr 2025 17:08:29 +0100 Subject: [PATCH 8/8] debug output --- .github/workflows/lint-test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index d4e118d8..20a2c5fc 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -38,5 +38,7 @@ jobs: if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) run: ct install --namespace flagsmith --config ct.yaml --debug - - run: kubectl --namespace flagsmith describe pods + - name: Debug Output + run: | + kubectl --namespace flagsmith describe pods if: failure()