forked from matrix-org/dendrite
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🔄 Merge remote-tracking branch 'origin' into release/upstream-v0.13.6-17
- Loading branch information
Showing
161 changed files
with
2,841 additions
and
6,446 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| steps: | ||
| - name: gcr.io/cloud-builders/docker | ||
| args: ['build', '--build-arg', 'BUILDPLATFORM=${_BUILD_PLATFORM}', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA', '-f', 'Dockerfile', '.'] | ||
| - name: gcr.io/cloud-builders/kubectl | ||
| args: ['-n', 'dendrite', 'set', 'image', 'deployment/dendrite', 'dendrite=gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA'] | ||
| env: | ||
| - CLOUDSDK_CORE_PROJECT=globekeeper-development | ||
| - CLOUDSDK_COMPUTE_ZONE=europe-west2-a | ||
| - CLOUDSDK_CONTAINER_CLUSTER=synapse | ||
| substitutions: | ||
| _BUILD_PLATFORM: linux/amd64 # default | ||
| images: | ||
| - gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA | ||
| timeout: 480s |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| steps: | ||
| - name: gcr.io/cloud-builders/docker | ||
| args: ['build', '--build-arg', 'BUILDPLATFORM=${_BUILD_PLATFORM}', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME', '-f', 'Dockerfile', '.'] | ||
| - name: gcr.io/cloud-builders/kubectl | ||
| args: ['set', 'image', 'deployment/dendrite', 'dendrite=gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME'] | ||
| env: | ||
| - CLOUDSDK_CORE_PROJECT=globekeeper-production | ||
| - CLOUDSDK_COMPUTE_ZONE=europe-west2-a | ||
| - CLOUDSDK_CONTAINER_CLUSTER=synapse-production | ||
| substitutions: | ||
| _BUILD_PLATFORM: linux/amd64 # default | ||
| images: | ||
| - gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME | ||
| timeout: 480s |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,52 +40,53 @@ jobs: | |
| run: ct lint --config helm/ct.yaml | ||
|
|
||
| # only bother to run if lint step reports a change to the helm chart | ||
| install: | ||
| needs: | ||
| - lint | ||
| if: ${{ needs.lint.outputs.changed == 'true' }} | ||
| name: Install Helm charts | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| ref: ${{ inputs.checkoutCommit }} | ||
| - name: Install Kubernetes tools | ||
| uses: yokawasa/[email protected] | ||
| with: | ||
| setup-tools: | | ||
| helmv3 | ||
| helm: "3.10.3" | ||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: "3.10" | ||
| - name: Set up chart-testing | ||
| uses: helm/[email protected] | ||
| - name: Create k3d cluster | ||
| uses: nolar/setup-k3d-k3s@v1 | ||
| with: | ||
| version: v1.28 | ||
| - name: Remove node taints | ||
| run: | | ||
| kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true | ||
| - name: Run chart-testing (install) | ||
| run: ct install --config helm/ct.yaml | ||
| # GlobeKeeper: Skipping this as it not needed for now and it is failing due to env. | ||
| # install: | ||
| # needs: | ||
| # - lint | ||
| # if: ${{ needs.lint.outputs.changed == 'true' }} | ||
| # name: Install Helm charts | ||
| # runs-on: ubuntu-latest | ||
| # steps: | ||
| # - name: Checkout | ||
| # uses: actions/checkout@v3 | ||
| # with: | ||
| # fetch-depth: 0 | ||
| # ref: ${{ inputs.checkoutCommit }} | ||
| # - name: Install Kubernetes tools | ||
| # uses: yokawasa/[email protected] | ||
| # with: | ||
| # setup-tools: | | ||
| # helmv3 | ||
| # helm: "3.10.3" | ||
| # - uses: actions/setup-python@v4 | ||
| # with: | ||
| # python-version: "3.10" | ||
| # - name: Set up chart-testing | ||
| # uses: helm/[email protected] | ||
| # - name: Create k3d cluster | ||
| # uses: nolar/setup-k3d-k3s@v1 | ||
| # with: | ||
| # version: v1.21 | ||
| # - name: Remove node taints | ||
| # run: | | ||
| # kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true | ||
| # - name: Run chart-testing (install) | ||
| # run: ct install --config helm/ct.yaml | ||
|
|
||
| # Install the chart using helm directly and test with create-account | ||
| - name: Install chart | ||
| run: | | ||
| helm install --values helm/dendrite/ci/ct-postgres-sharedsecret-values.yaml dendrite helm/dendrite | ||
| - name: Wait for Postgres and Dendrite to be up | ||
| run: | | ||
| kubectl wait --for=condition=ready --timeout=90s pod -l app.kubernetes.io/name=postgresql || kubectl get pods -A | ||
| kubectl wait --for=condition=ready --timeout=90s pod -l app.kubernetes.io/name=dendrite || kubectl get pods -A | ||
| kubectl get pods -A | ||
| kubectl get services | ||
| kubectl get ingress | ||
| kubectl logs -l app.kubernetes.io/name=dendrite | ||
| - name: Run create account | ||
| run: | | ||
| podName=$(kubectl get pods -l app.kubernetes.io/name=dendrite -o name) | ||
| kubectl exec "${podName}" -- /usr/bin/create-account -username alice -password somerandompassword | ||
| # # Install the chart using helm directly and test with create-account | ||
| # - name: Install chart | ||
| # run: | | ||
| # helm install --values helm/dendrite/ci/ct-postgres-sharedsecret-values.yaml dendrite helm/dendrite | ||
| # - name: Wait for Postgres and Dendrite to be up | ||
| # run: | | ||
| # kubectl wait --for=condition=ready --timeout=90s pod -l app.kubernetes.io/name=postgresql || kubectl get pods -A | ||
| # kubectl wait --for=condition=ready --timeout=90s pod -l app.kubernetes.io/name=dendrite || kubectl get pods -A | ||
| # kubectl get pods -A | ||
| # kubectl get services | ||
| # kubectl get ingress | ||
| # kubectl logs -l app.kubernetes.io/name=dendrite | ||
| # - name: Run create account | ||
| # run: | | ||
| # podName=$(kubectl get pods -l app.kubernetes.io/name=dendrite -o name) | ||
| # kubectl exec "${podName}" -- /usr/bin/create-account -username alice -password somerandompassword | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "configurations": [ | ||
| { | ||
| "name": "Launch Package", | ||
| "type": "go", | ||
| "request": "launch", | ||
| "mode": "auto", | ||
| "program": "${workspaceFolder}/cmd/dendrite", | ||
| "args": [ | ||
| "-really-enable-open-registration", | ||
| "-config", | ||
| "../../../adminas/.ci/config/dendrite-local/dendrite.yaml" | ||
| ], | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "go.lintTool": "golangci-lint", | ||
| "go.testEnvVars": { | ||
| "POSTGRES_HOST": "localhost", | ||
| "POSTGRES_USER": "postgres", | ||
| "POSTGRES_PASSWORD": "foobar", | ||
| "POSTGRES_DB": "postgres" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.