Skip to content

Commit

Permalink
Merge branch 'main' into bump-kic-to-3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
pmalek authored Apr 23, 2024
2 parents cabd015 + 3f02a07 commit 90b7938
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/__build-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Configure Git for private repositories (temporary until making KGO public)
- name: Configure Git for private repositories (this is needed by repositories that include this workflow and have other private dependencies)
run: git config --global url."https://${{ secrets.gh-pat }}@github.com".insteadOf "https://github.com"

- name: Checkout KGO submodule
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Configure Git for private repositories (temporary until making KGO public)
- name: Configure Git for private repositories (this is needed by repositories that include this workflow and have other private dependencies)
run: git config --global url."https://${{ secrets.gh-pat }}@github.com".insteadOf "https://github.com"

- name: Checkout KGO submodule
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/__release-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ jobs:

test-integration-current-kubernetes:
runs-on: ubuntu-latest
needs: build-push-images
strategy:
fail-fast: true
matrix:
Expand All @@ -121,7 +120,7 @@ jobs:
with:
fetch-depth: 0

- name: Configure Git for private repositories (temporary until making KGO public)
- name: Configure Git for private repositories (this is needed by repositories that include this workflow and have other private dependencies)
run: git config --global url."https://${{ secrets.gh-pat }}@github.com".insteadOf "https://github.com"

- name: Checkout KGO submodule
Expand All @@ -132,6 +131,10 @@ jobs:
with:
go-version-file: go.mod

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

- name: integration tests
run: make test.integration
env:
Expand All @@ -149,7 +152,7 @@ jobs:
with:
fetch-depth: 0

- name: Configure Git for private repositories (temporary until making KGO public)
- name: Configure Git for private repositories (this is needed by repositories that include this workflow and have other private dependencies)
run: git config --global url."https://${{ secrets.gh-pat }}@github.com".insteadOf "https://github.com"

- name: Checkout KGO submodule
Expand All @@ -160,6 +163,10 @@ jobs:
with:
go-version-file: go.mod

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

- name: E2E Tests
run: make test.e2e
env:
Expand All @@ -184,7 +191,7 @@ jobs:
fetch-depth: 0
ref: main

- name: Configure Git for private repositories (temporary until making KGO public)
- name: Configure Git for private repositories (this is needed by repositories that include this workflow and have other private dependencies)
run: git config --global url."https://${{ secrets.gh-pat }}@github.com".insteadOf "https://github.com"

- name: Checkout KGO submodule
Expand All @@ -203,6 +210,10 @@ jobs:
echo "VERSION=${VERSION}" >> $GITHUB_ENV
echo ${VERSION} > VERSION
- uses: jdx/mise-action@v2
with:
install: false

# Generated manifests are part of the release PR.
- name: Generate manifests
if: ${{ inputs.regenerate-manifests }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Table of Contents

- [v1.2.2](#v122)
- [v1.2.1](#v121)
- [v1.2.0](#v120)
- [v1.1.0](#v101)
Expand All @@ -26,8 +27,12 @@
`apis` -> `api` and `controllers` -> `controller`.
[#84](https://github.com/Kong/gateway-operator/pull/84)

## [v1.2.2]

### Fixes

> Release date: 2024-04-22
- Fixes an issue where managed `Gateway`s controller wasn't able to reduce
the created `DataPlane` objects when too many have been created.
[#43](https://github.com/Kong/gateway-operator/pull/43)
Expand Down Expand Up @@ -624,6 +629,7 @@ leftovers from previous operator deployments in the cluster. The user needs to d
(clusterrole, clusterrolebinding, validatingWebhookConfiguration) before
re-installing the operator through the bundle.

[v1.2.2]: https://github.com/Kong/gateway-operator-archive/compare/v1.2.1..v1.2.2
[v1.2.1]: https://github.com/Kong/gateway-operator-archive/compare/v1.2.0..v1.2.1
[v1.2.0]: https://github.com/Kong/gateway-operator-archive/compare/v1.1.0..v1.2.0
[v1.1.0]: https://github.com/Kong/gateway-operator-archive/compare/v1.0.3..v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.2
2 changes: 1 addition & 1 deletion config/components/manager-image/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: Component
images:
- name: docker.io/kong/gateway-operator-oss
newName: docker.io/kong/gateway-operator-oss
newTag: 1.2.1
newTag: 1.2.2

0 comments on commit 90b7938

Please sign in to comment.