Skip to content

Commit

Permalink
chore: backport missing 3.2 commits (#6196)
Browse files Browse the repository at this point in the history
* chore(release): prepare 3.2 release (#6190)

* ci: add missing GOCACHE and GOPATH in release worflow (#6192)

* chore(ci): add mise install step to conformance tests report (#6194)

---------

Co-authored-by: Patryk Małek <patryk.malek@konghq.com>
  • Loading branch information
czeslavo and pmalek committed Jun 12, 2024
1 parent 6cf7279 commit 02c4599
Show file tree
Hide file tree
Showing 11 changed files with 13,697 additions and 27,007 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/conformance_tests_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
fetch-tags: true
ref: ${{ github.event.inputs.tag }}

- uses: jdx/mise-action@v2
with:
install: false

- name: setup golang
uses: actions/setup-go@v5
with:
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ jobs:
echo "" >> $GITHUB_ENV
echo 'type=raw,value=${{ steps.semver_parser.outputs.major }}.${{ steps.semver_parser.outputs.minor }}' >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
# Setup Golang to use go pkg cache which is utilized in Dockerfile's cache mount.
- name: Setup golang
uses: actions/setup-go@v5
with:
go-version-file: go.mod
- run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
- run: echo "GOCACHE=$(go env GOCACHE)" >> $GITHUB_ENV
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Cache Docker layers
Expand Down Expand Up @@ -117,6 +124,8 @@ jobs:
TAG=${{ steps.meta.outputs.version }}
COMMIT=${{ github.sha }}
REPO_INFO=https://github.com/${{ github.repository }}.git
GOPATH=${{ env.GOPATH}}
GOCACHE=${{ env.GOCACHE}}
- name: Build and push distroless image to DockerHub
id: docker_build
uses: docker/build-push-action@v5
Expand All @@ -131,6 +140,8 @@ jobs:
TAG=${{ steps.meta.outputs.version }}
COMMIT=${{ github.sha }}
REPO_INFO=https://github.com/${{ github.repository }}.git
GOPATH=${{ env.GOPATH}}
GOCACHE=${{ env.GOCACHE}}
test-e2e:
needs: [verify-manifest-tag, build-push-images]
Expand Down
40,673 changes: 13,674 additions & 26,999 deletions LICENSES

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/image/oss/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ images:
newTag: '3.7' # renovate: datasource=docker versioning=docker depName=kong@regenerate packageName=kong
- name: kic-placeholder
newName: kong/kubernetes-ingress-controller
newTag: '3.1' # renovate: datasource=docker versioning=docker depName=kong/kubernetes-ingress-controller@regenerate packageName=kong/kubernetes-ingress-controller
newTag: '3.2' # renovate: datasource=docker versioning=docker depName=kong/kubernetes-ingress-controller@regenerate packageName=kong/kubernetes-ingress-controller
2 changes: 1 addition & 1 deletion test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/manifests/all-in-one-dbless-konnect.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/manifests/all-in-one-dbless.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/manifests/all-in-one-postgres-enterprise.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/manifests/all-in-one-postgres.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 02c4599

Please sign in to comment.