Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

Release 0.5.2 Staging #522

Merged
merged 91 commits into from
Feb 28, 2023
Merged

Release 0.5.2 Staging #522

merged 91 commits into from
Feb 28, 2023

Conversation

andrewstucki
Copy link
Contributor

@andrewstucki andrewstucki commented Feb 28, 2023 •
edited
Loading

Changes proposed in this PR:

This is just a merge from main into our release branch (to account for all of the dependency updates and changes we didn't backport) + revving the version in the version.go file.

Checklist:

  • Tests added
  • CHANGELOG entry added

    Run make changelog-entry for guidance in authoring a changelog entry, and
    commit the resulting file, which should have a name matching your PR number.
    Entries should use imperative present tense (e.g. Add support for...)

Andrew Stucki and others added 30 commits November 18, 2022 15:38
Add fix for when we need to use the system-wide trusted CAs (#459)
2b681c6 
* Add fix for when we need to use the system-wide trusted CAs

* Add changelog entry
@dependabot
build(deps): bump github.com/hashicorp/consul/api from 1.15.3 to 1.17…
9465b5d 
….0 (#463)

Bumps [github.com/hashicorp/consul/api](https://github.com/hashicorp/consul) from 1.15.3 to 1.17.0.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@api/v1.15.3...api/v1.17.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump google.golang.org/grpc from 1.50.1 to 1.51.0 (#462)
ca999ea 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.50.1 to 1.51.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.50.1...v1.51.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nathancoleman
Support routing to Consul services imported from a peer (#406)
3fa4a6f 
* Stub func for finding service imported from peer

* Add peerName to MeshService CRD, fork service lookup when specified

* Use "Peer" instead of "PeerName" for consistency

* Add changelog entry

* Return Consul resolution error when no matching service name from peer

* Add unit test coverage for resolving of imported service from peer

* Remove unnecessary mock generation target

* go mod tidy

* Consume latest tag of consul/api containing dependencies

* Resolve dependency issues from merge

* Add Peerings to Consul client interface

* Adjust testing strategy to account for hot swap of Consul client
@mikemorris
ci: set imageEnvoy flag correctly on v1.0.0+ Consul Helm chart (#458)
cb8253f 
* ci: update to Envoy v1.24 for conformance tests with Consul v1.14 and later

* ci: fixup conformance test name to drop -dev from consul@v1.14

* ci: bump to consul-k8s@v1.0.1
@dependabot
build(deps): bump golang.org/x/net from 0.2.0 to 0.3.0 (#471)
0346df2 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump golang.org/x/tools from 0.3.0 to 0.4.0 (#473)
68d2ef4 
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.3.0...v0.4.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump golang.org/x/net from 0.3.0 to 0.4.0 (#472)
c959e62 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.3.0...v0.4.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/hashicorp/consul/api from 1.17.0 to 1.18…
6950c2a 
….0 (#468)

Bumps [github.com/hashicorp/consul/api](https://github.com/hashicorp/consul) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@api/v1.17.0...api/v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/hashicorp/consul/proto-public (#469)
21bfe7e 
Bumps [github.com/hashicorp/consul/proto-public](https://github.com/hashicorp/consul) from 0.1.0 to 0.2.1.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@v0.1.0...v0.2.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/proto-public
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mikemorris
deps: bump containerd indirect dep (#400)
1d7ea8e
@dependabot
build(deps): bump github.com/hashicorp/go-hclog from 1.3.1 to 1.4.0 (#…
c38ef8c 
…475)

Bumps [github.com/hashicorp/go-hclog](https://github.com/hashicorp/go-hclog) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/hashicorp/go-hclog/releases)
- [Commits](hashicorp/go-hclog@v1.3.1...v1.4.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/go-hclog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@hashicorp-copywrite @nathancoleman
[COMPLIANCE] Add Copyright and License Headers (#470)
b678b66 
* [COMPLIANCE] Add Copyright and License Headers

* Modify status and error code generators to include copyright header

* Add .copywrite.hcl ignoring generated files, remove header from generated files

Our CI process will regenerate these files and fail since the generated version does not contain a copyright header.
In the future, we may use a more robust process to ignore the headers in the `git diff` that our CI process does, but this change enables the initial set of copyright header additions to merge.

* Add changelog entry

* Add license + copyright_year to project config

Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com>
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
@CalebAlbers
Fix copyright year attribute (#477)
e268364 
This project was originally created in 2021
@mikemorris
go: bump to Go 1.19.4 (#474)
fc3a7d6 
* go: bump to Go 1.19.4

* changelog: add entry for Go v1.19.4 bump
@mikemorris
k8s/controller: always map "default" Consul namespace to empty string (…
874f324 
…#483)

* k8s/controller: always map "default" Consul namespace to empty string

* e2e: add test for Consul destination namespace without k8s namespace mirroring

* add changelog entry
@mikemorris
e2e: increase regex max program size
24e4ad9 
in Envoy mesh service bootstrap template, to accomodate XFCC logic
@mikemorris
e2e: make HTTP route flattening tests more exhaustive
890bcb4
@mikemorris
Merge pull request #487 from hashicorp/e2e/xfcc-re2-max-program-size
357e411 
e2e: increase RegEx max program size in Envoy mesh service bootstrap template
@mikemorris
deps: update consul-server-connection-manager to v0.1.1
71375ab 
removes the custom balancer impl and switches to default pick_first
@mikemorris
consul: remove globalWatcherMutex for consul-server-connection-manager
bb81b1f
@mikemorris
consul: remove context cancellation from client.WatchServers
9c5f806 
this caused a data race and was already handled by the caller
@mikemorris
consul: remove stop method from Consul client interface
fe6505c
@mikemorris
Merge pull request #484 from hashicorp/deps/cscm-default-pickfirst
663a745 
deps: update consul-server-connection-manager
@dependabot @mikemorris
build(deps): bump github.com/docker/docker from 20.10.21+incompatible…
4c186a7 
… to 20.10.23+incompatible (#486)

* build(deps): bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.21+incompatible to 20.10.23+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v20.10.21...v20.10.23)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* deps: update docker/distribution

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com>
@dependabot
build(deps): bump sigs.k8s.io/controller-runtime from 0.13.1 to 0.14.2 (
6b1a9ee 
#488)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.13.1 to 0.14.2.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.13.1...v0.14.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump golang.org/x/net from 0.4.0 to 0.5.0 (#492)
19a1760 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/hashicorp/vault/api from 1.8.2 to 1.8.3 (#…
9b97183 
…490)

Bumps [github.com/hashicorp/vault/api](https://github.com/hashicorp/vault) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/hashicorp/vault/releases)
- [Changelog](https://github.com/hashicorp/vault/blob/main/CHANGELOG.md)
- [Commits](hashicorp/vault@v1.8.2...v1.8.3)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/vault/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @mikemorris
build(deps): bump sigs.k8s.io/controller-tools from 0.10.0 to 0.11.2 (#…
d1a5680 
…491)

* build(deps): bump sigs.k8s.io/controller-tools from 0.10.0 to 0.11.2

Bumps [sigs.k8s.io/controller-tools](https://github.com/kubernetes-sigs/controller-tools) from 0.10.0 to 0.11.2.
- [Release notes](https://github.com/kubernetes-sigs/controller-tools/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-tools/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/controller-tools@v0.10.0...v0.11.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* crd: update kubebuilder annotations

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com>
@dependabot @mikemorris
build(deps): bump github.com/vladimirvivien/gexe from 0.1.1 to 0.2.0 (#…
c136597 
…435)

* build(deps): bump github.com/vladimirvivien/gexe from 0.1.1 to 0.2.0

Bumps [github.com/vladimirvivien/gexe](https://github.com/vladimirvivien/gexe) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/vladimirvivien/gexe/releases)
- [Commits](vladimirvivien/gexe@v0.1.1...v0.2.0)

---
updated-dependencies:
- dependency-name: github.com/vladimirvivien/gexe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* deps: bump sigs.k8s.io/e2e-framework from 0.0.8 to 0.1.0

for compatibility with github.com/vladimirvivien/gexe v0.2.0

* deps: add indirect dep for moby/spdystream

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Morris <mikemorris@users.noreply.github.com>
jm96441n and others added 19 commits February 22, 2023 10:49
@jm96441n
Merge pull request #505 from hashicorp/fix-bug-with-cross-namespace-p…
f78ec58 
…olicy

Fix bug with cross namespace policy
@dependabot
build(deps): bump github.com/hashicorp/consul/sdk from 0.13.0 to 0.13…
7e5c258 
….1 (#517)

Bumps [github.com/hashicorp/consul/sdk](https://github.com/hashicorp/consul) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@sdk/v0.13.0...sdk/v0.13.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/hashicorp/consul/api from 1.18.0 to 1.19…
2a3f024 
….1 (#518)

Bumps [github.com/hashicorp/consul/api](https://github.com/hashicorp/consul) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@api/v1.18.0...api/v1.19.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jm96441n
Update ACL token for e2e tests
e19d735
@jm96441n
WIP: creating new token
57f5929
@jm96441n
WIP: update agent acl token
d4e6cb0
@jm96441n
Fixing token usage, cleaning up permsisions on tokens
66be906
@jm96441n
Fix ACL policy of gateway for enterprise testing
92eb5c8
@jm96441n
Use non-deprecated method to update agent acl token
1fee49d
@jm96441n
Bump default envoy image version to be compatible with consul 1.15
f8bbcd7
@jm96441n
Regen golden files after change to envoy image in tests
a08579c
@jm96441n
Fix default envoy image used for e2e testing for gateways
97b52c5
@jm96441n
Fix golden files for envoy image
7bb5cc8
@dependabot
build(deps): bump github.com/hashicorp/consul/proto-public (#519)
a9b05f2 
Bumps [github.com/hashicorp/consul/proto-public](https://github.com/hashicorp/consul) from 0.2.1 to 0.3.0.
- [Release notes](https://github.com/hashicorp/consul/releases)
- [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md)
- [Commits](hashicorp/consul@v0.2.1...v0.3.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/consul/proto-public
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/stretchr/testify from 1.8.1 to 1.8.2 (#520)
12e1ba9 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jm96441n
Merge pull request #516 from hashicorp/update-acl-token-for-e2e-tests
87c7391 
Update ACL token for e2e tests
@jm96441n
Bump default envoy image (#521)
64a6875 
* Updated default envoy image and regenerated golden files

* Added changelog entry

* Fix changelog from 'bug' to 'enhancement'
Merge branch 'main' of https://github.com/hashicorp/polar into releas…
520f8a0 
…e-0.5.2-staging
Rev version
73315b7
@andrewstucki andrewstucki added the pr/no-changelog Skip the CI check that requires a changelog entry label Feb 28, 2023
mikemorris
mikemorris approved these changes Feb 28, 2023
View reviewed changes
Copy link
Contributor

@mikemorris mikemorris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from two notes on dependency bumps, LGTM

go.mod Show resolved Hide resolved
go.mod Show resolved Hide resolved
@andrewstucki andrewstucki merged commit 0f4bb5d into release/0.5.x Feb 28, 2023
@andrewstucki andrewstucki deleted the release-0.5.2-staging branch February 28, 2023 18:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mikemorris mikemorris mikemorris approved these changes

@alvin-huang alvin-huang alvin-huang approved these changes

@smacfarlane smacfarlane Awaiting requested review from smacfarlane

@emilymianeil emilymianeil Awaiting requested review from emilymianeil

Assignees
No one assigned
Labels
pr/no-changelog Skip the CI check that requires a changelog entry
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@andrewstucki @mikemorris @alvin-huang @nathancoleman @CalebAlbers @jm96441n