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

Jump to bottom

Create mesh webhook to support v2 resources #2930

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Create mesh webhook to support v2 resources #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a75c62a
mesh webhook v2
thisisnotashwin Sep 8, 2023
0a8bb71
Make changes based on review feedback.
thisisnotashwin Sep 11, 2023
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
6 changes: 6 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 @@ -229,6 +229,12 @@ const (
// ManagedByPodValue is used in Consul metadata to identify the manager
// of resources.
ManagedByPodValue = "consul-k8s-pod-controller"

// AnnotationMeshDestinations is a list of upstreams to register with the
// proxy. The service name should map to a Consul service namd and the local
// port is the local port in the pod that the listener will bind to. It can
// be a named port.
AnnotationMeshDestinations = "consul.hashicorp.com/mesh-service-destinations"
)

// Annotations used by Prometheus.
Expand Down
3 changes: 2 additions & 1 deletion control-plane/connect-inject/metrics/metrics_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"fmt"
"strconv"

corev1 "k8s.io/api/core/v1"

"github.com/hashicorp/consul-k8s/control-plane/connect-inject/common"
"github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants"
corev1 "k8s.io/api/core/v1"
)

// Config represents configuration common to connect-inject components related to metrics.
Expand Down
Loading