Skip to content

rebase #1824 on 1.0.x #1829

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

Merged
thisisnotashwin merged 1 commit into from
Jan 13, 2023
Merged

rebase #1824 on 1.0.x #1829

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/constants/annotations_and_labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ const (
// e.g. consul.hashicorp.com/service-meta-foo:bar.
AnnotationMeta = "consul.hashicorp.com/service-meta-"

// 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"

// annotations for sidecar proxy resource limits.
AnnotationSidecarProxyCPULimit = "consul.hashicorp.com/sidecar-proxy-cpu-limit"
AnnotationSidecarProxyCPURequest = "consul.hashicorp.com/sidecar-proxy-cpu-request"
Expand Down
1 change: 1 addition & 0 deletions control-plane/connect-inject/webhook/consul_dataplane_sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func (w *MeshWebhook) consulDataplaneSidecar(namespace corev1.Namespace, pod cor
},
InitialDelaySeconds: 1,
}

container := corev1.Container{
Name: containerName,
Image: w.ImageConsulDataplane,
Expand Down