Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into 3.x RC #1094

Merged
merged 80 commits into from
Jun 24, 2024
Merged

Merge main into 3.x RC #1094

merged 80 commits into from
Jun 24, 2024

Conversation

rainest
Copy link
Contributor

@rainest rainest commented Jun 17, 2024

Merge main into the #921 3.x branch and update various things that touch templates modified for #947. Part of #921.

Commits since fd06beb are the non-merge fixes. I don't think there's any immediately obvious way to separate the diffs from the merge and the fixes in GitHub views. git diff 5b969dec59ac146713f4eeed58bdfdd5964c0e37 will show the additional changes since the merge.

The admission webhook template has gotten rather complicated. We may want to simplify it by removing all the cases for KIC 2.x. I think limiting support to KIC 3.x+ is reasonable, but this would mean LTS support would have to be handled via additional chart 2.x releases.

Next steps will be to figure out how to port over the additional changes from #976 and any additional stuff after.

czeslavo and others added 30 commits December 9, 2023 00:27
…detected (#974)

* fix(kong): add RBAC rules for listing namespaces when gateway API is detected

* kong: add watch permissions to ClusterRole
Add envFrom and ingressController.envFrom values. These populate the
standard container envFrom field, which contains a list of ConfigMap or
Secret refs. Keys and values from the referenced resources are set as
environment variables in the containers.
* feat(listens) support multiple addresses and IPv6

Configure default IPv6 listens for Kong listeners by default. The
controller defaults are unchanged as the controller settings do not
support multiple listen addresses.

Replace the hidden .address service setting with a new hidden .addresses
setting. The new setting is a list whereas the old setting was a single
string.

Honor address overrides for the admin listen. It previously forced you
to the default 0.0.0.0 address or 127.0.0.1 when disabled.

* chore(*) release kong 2.34.0
Bumps [golang.stackrox.io/kube-linter](https://github.com/stackrox/kube-linter) from 0.6.5 to 0.6.6.
- [Release notes](https://github.com/stackrox/kube-linter/releases)
- [Changelog](https://github.com/stackrox/kube-linter/blob/main/RELEASE.md)
- [Commits](stackrox/kube-linter@v0.6.5...v0.6.6)

---
updated-dependencies:
- dependency-name: golang.stackrox.io/kube-linter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.stackrox.io/kube-linter](https://github.com/stackrox/kube-linter) from 0.6.6 to 0.6.7.
- [Release notes](https://github.com/stackrox/kube-linter/releases)
- [Changelog](https://github.com/stackrox/kube-linter/blob/main/RELEASE.md)
- [Commits](stackrox/kube-linter@v0.6.6...v0.6.7)

---
updated-dependencies:
- dependency-name: golang.stackrox.io/kube-linter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…olang.stackrox.io/kube-linter-0.6.7

chore(deps): bump golang.stackrox.io/kube-linter from 0.6.6 to 0.6.7 in /third_party
Do not set KONG_PLUGINS if no plugins are configured.

Release 2.35.1.
* Update default timeouts for .github/workflows/release-push.yaml [skip ci]

* Apply suggestions from code review

---------

Co-authored-by: Travis Raines <[email protected]>
* Update default timeouts for .github/workflows/release-pr.yaml [skip ci]

* Apply suggestions from code review

---------

Co-authored-by: Travis Raines <[email protected]>
…1008)

After #989 both containers in the deployment were
using a named port `status` which was defined to be scraped in the ServiceMonitor
which resulted in scraping both containers which was not desired.

Co-authored-by: Grzegorz Burzyński <[email protected]>
Co-authored-by: Travis Raines <[email protected]>
* Update default timeouts for .github/workflows/master-mirrors-main.yaml [skip ci]

* Update .github/workflows/master-mirrors-main.yaml

---------

Co-authored-by: Travis Raines <[email protected]>
Allow setting `SVC.tls.appProtocol` and `SVC.http.appProtocol` to set Kuberntes Services
HTTP and TLS ports' `appProtocols` to custom values.

Co-authored-by: Grzegorz Burzyński <[email protected]>
@rainest rainest changed the title Attempt main merge into old 3.x RC Merge main into 3.x RC Jun 19, 2024
@rainest rainest marked this pull request as ready for review June 20, 2024 20:14
@rainest rainest requested a review from a team as a code owner June 20, 2024 20:14
@rainest rainest merged commit e6561d3 into release/kong-3.x Jun 24, 2024
33 checks passed
@rainest rainest deleted the wip/3-x-merge branch June 24, 2024 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.