-
Notifications
You must be signed in to change notification settings - Fork 591
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/next' into feat/profiling_for_ki…
…c_2.0
- Loading branch information
Showing
11 changed files
with
239 additions
and
56 deletions.
There are no files selected for viewing
8 changes: 5 additions & 3 deletions
8
.github/workflows/docker-build-push.yaml → .github/workflows/1x-docker-build-push.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
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 |
|---|---|---|
| @@ -1,8 +1,38 @@ | ||
| name: Test | ||
| name: 1.x Integration Tests | ||
|
|
||
| on: [push] | ||
| on: | ||
| pull_request: | ||
| branches: | ||
| - 'main' | ||
| - 'next' | ||
| push: | ||
| branches: | ||
| - '*' | ||
| tags: | ||
| - '1.*' | ||
| - 'v1.*' | ||
|
|
||
| jobs: | ||
| # Golang Integration tests, using the legacy manager/1.x CLI | ||
| integration-test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: setup golang | ||
| uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: '^1.16' | ||
| - name: cache go modules | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: ~/go/pkg/mod | ||
| key: ${{ runner.os }}-build-codegen-${{ hashFiles('**/go.sum') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-go | ||
| - name: checkout repository | ||
| uses: actions/checkout@v2 | ||
| - name: run railgun integration tests on legacy KIC | ||
| run: make test.integration.legacy | ||
| working-directory: ./railgun | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
@@ -32,8 +62,8 @@ jobs: | |
| with: | ||
| name: image | ||
| path: image.tar | ||
|
|
||
| test-k8s: | ||
| # Bash-based integration tests | ||
| integration-test-legacy: | ||
| needs: build | ||
| runs-on: ubuntu-latest | ||
| env: | ||
|
|
||
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,80 @@ | ||
| name: Build and push 2.x images | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - 'main' | ||
| - 'next' | ||
| tags: | ||
| - '2.*' | ||
| - 'v2.*' | ||
|
|
||
| jobs: | ||
| docker: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Parse semver string | ||
| id: semver_parser | ||
| if: ${{ contains(github.ref, 'tags') }} | ||
| uses: booxmedialtd/ws-action-parse-semver@v1 | ||
| with: | ||
| input_string: ${{ github.ref }} | ||
| version_extractor_regex: 'refs\/tags\/(.*)$' | ||
| - name: Add Railgun standard tags | ||
| run: | | ||
| echo 'RAILGUN_STANDARD<<EOF' >> $GITHUB_ENV | ||
| echo 'type=ref,event=branch,suffix=-railgun' >> $GITHUB_ENV | ||
| echo 'type=semver,pattern={{version}}' >> $GITHUB_ENV | ||
| echo 'EOF' >> $GITHUB_ENV | ||
| - name: Add Railgun major.minor tag | ||
| if: ${{ steps.semver_parser.outputs.prerelease == '' }} | ||
| run: | | ||
| echo 'RAILGUN_SUPPLEMENTAL<<EOF' >> $GITHUB_ENV | ||
| echo "" >> $GITHUB_ENV | ||
| echo 'type=semver,pattern={{major}}.{{minor}}' >> $GITHUB_ENV | ||
| echo 'EOF' >> $GITHUB_ENV | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v1 | ||
| - name: Cache Docker layers | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: /tmp/.buildx-cache | ||
| key: ${{ runner.os }}-buildx-${{ github.sha }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-buildx- | ||
| - name: Login to DockerHub | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| username: ${{ secrets.DOCKER_USERNAME }} | ||
| password: ${{ secrets.DOCKER_TOKEN }} | ||
| - name: Docker meta (railgun) | ||
| id: meta_railgun | ||
| uses: docker/[email protected] | ||
| with: | ||
| images: kong/kubernetes-ingress-controller | ||
| flavor: | | ||
| latest=false | ||
| tags: ${{ env.RAILGUN_STANDARD }}${{ env.RAILGUN_SUPPLEMENTAL }} | ||
| - name: Build binary | ||
| env: | ||
| TAG: ${{ steps.meta_railgun.outputs.version }} | ||
| COMMIT: ${{ github.sha }} | ||
| REPO_INFO: https:/${{ github.repository }}.git | ||
| id: docker_build_binary | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| push: false | ||
| file: Dockerfile.railgun | ||
| cache-from: type=local,src=/tmp/.buildx-cache | ||
| cache-to: type=local,dest=/tmp/.buildx-cache | ||
| target: builder | ||
| - name: Build and push Railgun | ||
| id: docker_build_railgun | ||
| env: | ||
| TAG: ${{ steps.meta_railgun.outputs.version }} | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| push: true | ||
| file: Dockerfile.railgun | ||
| tags: ${{ steps.meta_railgun.outputs.tags }} | ||
| cache-from: type=local,src=/tmp/.buildx-cache |
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: Integration Tests | ||
| name: 2.x Integration Tests | ||
|
|
||
| on: | ||
| pull_request: | ||
|
|
@@ -7,10 +7,10 @@ on: | |
| - 'next' | ||
| push: | ||
| branches: | ||
| - 'main' | ||
| - 'next' | ||
| - '*' | ||
| tags: | ||
| - 'v*.*.*' | ||
| - '2.*' | ||
| - 'v2.*' | ||
|
|
||
| jobs: | ||
| integration-test-dbless: | ||
|
|
@@ -51,22 +51,3 @@ jobs: | |
| - name: run railgun integration tests | ||
| run: make test.integration.postgres | ||
| working-directory: ./railgun | ||
| integration-test-legacy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: setup golang | ||
| uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: '^1.16' | ||
| - name: cache go modules | ||
| uses: actions/[email protected] | ||
| with: | ||
| path: ~/go/pkg/mod | ||
| key: ${{ runner.os }}-build-codegen-${{ hashFiles('**/go.sum') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-go | ||
| - name: checkout repository | ||
| uses: actions/checkout@v2 | ||
| - name: run railgun integration tests on legacy KIC | ||
| run: make test.integration.legacy | ||
| working-directory: ./railgun | ||
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
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
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
Oops, something went wrong.