diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 7b68951f..20a2c5fc 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,14 @@ 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 --namespace flagsmith --config ct.yaml --debug + - name: Debug Output + run: | + kubectl --namespace flagsmith describe pods + if: failure() 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 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: diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml index 408dbd75..5caf3d7e 100644 --- a/charts/flagsmith/values.yaml +++ b/charts/flagsmith/values.yaml @@ -31,7 +31,7 @@ serviceMonitor: api: image: - repository: flagsmith.docker.scarf.sh/flagsmith/flagsmith-api + repository: docker.flagsmith.com/flagsmith/flagsmith-api tag: "" # defaults to .Chart.AppVersion imagePullPolicy: "" imagePullSecrets: [] @@ -133,7 +133,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: "" # defaults to .Chart.AppVersion imagePullPolicy: "" imagePullSecrets: [] 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'