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.

Sign up for GitHub

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

rebase #1824 on 0.49.x #1830

Merged
merged 1 commit into from
Jan 13, 2023
Merged

rebase #1824 on 0.49.x #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
IMPROVEMENTS:
* Helm:
* Add a `global.extraLabels` stanza to allow setting global Kubernetes labels for all components deployed by the `consul-k8s` Helm chart. [[GH-1778](https://github.com/hashicorp/consul-k8s/pull/1778)]
* Control-Plane
* Add support for the annotation `consul.hashicorp.com/use-proxy-health-check`. [[GH-1824](https://github.com/hashicorp/consul-k8s/pull/1824)]

BUG FIXES:
* Control Plane
Expand Down
5 changes: 5 additions & 0 deletions control-plane/connect-inject/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ const (
// Deprecated: This annotation is no longer supported.
annotationSyncPeriod = "consul.hashicorp.com/connect-sync-period"

// annotationUseProxyHealthCheck creates a readiness listener on the sidecar proxy and
// queries this instead of the application health check for the status of the application.
// Enable this only if the application does not support health checks.
annotationUseProxyHealthCheck = "consul.hashicorp.com/use-proxy-health-check"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This PR was only to backport this annotation. I will add explicit PRs on this branch that will actually use this annotation but cannot be backported because the solution is tied to 0.49.x

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, that seems to be why the pipeline is failing, if that's the case I'll approve it and you can fix it in your next PR

Copy link
Contributor

Choose a reason for hiding this comment

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

I would just message in the channel that the pipeline may be momentarily broken while you create the other PR

Copy link
Contributor

Choose a reason for hiding this comment

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

or just add the change to this PR? I'll leave it up to you

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The pipeline is failing? i should have PRs for them real soon. I'm surprised though given none of the other pipelines were failing when I created this PR 🤔


// annotations for sidecar proxy resource limits.
annotationSidecarProxyCPULimit = "consul.hashicorp.com/sidecar-proxy-cpu-limit"
annotationSidecarProxyCPURequest = "consul.hashicorp.com/sidecar-proxy-cpu-request"
Expand Down