From 5ccf647bb72aefb0ccdf8c7c0302b562c26a75d4 Mon Sep 17 00:00:00 2001 From: NicoletaPopoviciu Date: Tue, 19 Jul 2022 23:40:21 +0000 Subject: [PATCH 1/5] backport of commit a87294bd7c67c39a5e3e22794fd7107026372bb1 --- website/content/docs/k8s/annotations-and-labels.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx index d08b82ee69c..ee0ddfa9c6b 100644 --- a/website/content/docs/k8s/annotations-and-labels.mdx +++ b/website/content/docs/k8s/annotations-and-labels.mdx @@ -221,6 +221,8 @@ The following Kubernetes resource annotations could be used on a pod to control - `consul.hashicorp.com/service-metrics-port` - Set the port where the Connect service exposes metrics. - `consul.hashicorp.com/service-metrics-path` - Set the path where the Connect service exposes metrics. - `consul.hashicorp.com/connect-inject-mount-volume` - Comma separated list of container names to mount the connect-inject volume into. The volume will be mounted at `/consul/connect-inject`. The connect-inject volume contains Consul internals data needed by the other sidecar containers, for example the `consul` binary, and the Pod's Consul ACL token. This data can be valuable for advanced use-cases, such as making requests to the Consul API from within application containers. +- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects that define Volumes to be added to the Envoy sidecar. +- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects that define VolumeMounts to be added to the Envoy sidecar. ## Labels From b4f6041a3658ff9340930a415558106e7319b04e Mon Sep 17 00:00:00 2001 From: NicoletaPopoviciu <87660255+NicoletaPopoviciu@users.noreply.github.com> Date: Thu, 21 Jul 2022 18:20:40 +0000 Subject: [PATCH 2/5] backport of commit c6cf5c03dba06e6532df5686abf7010dd5835237 --- website/content/docs/k8s/annotations-and-labels.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx index ee0ddfa9c6b..e998393c43a 100644 --- a/website/content/docs/k8s/annotations-and-labels.mdx +++ b/website/content/docs/k8s/annotations-and-labels.mdx @@ -221,8 +221,8 @@ The following Kubernetes resource annotations could be used on a pod to control - `consul.hashicorp.com/service-metrics-port` - Set the port where the Connect service exposes metrics. - `consul.hashicorp.com/service-metrics-path` - Set the path where the Connect service exposes metrics. - `consul.hashicorp.com/connect-inject-mount-volume` - Comma separated list of container names to mount the connect-inject volume into. The volume will be mounted at `/consul/connect-inject`. The connect-inject volume contains Consul internals data needed by the other sidecar containers, for example the `consul` binary, and the Pod's Consul ACL token. This data can be valuable for advanced use-cases, such as making requests to the Consul API from within application containers. -- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects that define Volumes to be added to the Envoy sidecar. -- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects that define VolumeMounts to be added to the Envoy sidecar. +- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects that define volumes to add to the Envoy sidecar. +- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects that define volumeMounts to add to the Envoy sidecar. ## Labels From 732d3f8454e7f61df25e73f572e60c1a1bdbcb74 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 22 Jul 2022 17:07:11 +0000 Subject: [PATCH 3/5] backport of commit 7e16739a90e890a98440e221ba2b88c15c493072 --- website/content/docs/k8s/annotations-and-labels.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx index e998393c43a..311e453b271 100644 --- a/website/content/docs/k8s/annotations-and-labels.mdx +++ b/website/content/docs/k8s/annotations-and-labels.mdx @@ -221,8 +221,8 @@ The following Kubernetes resource annotations could be used on a pod to control - `consul.hashicorp.com/service-metrics-port` - Set the port where the Connect service exposes metrics. - `consul.hashicorp.com/service-metrics-path` - Set the path where the Connect service exposes metrics. - `consul.hashicorp.com/connect-inject-mount-volume` - Comma separated list of container names to mount the connect-inject volume into. The volume will be mounted at `/consul/connect-inject`. The connect-inject volume contains Consul internals data needed by the other sidecar containers, for example the `consul` binary, and the Pod's Consul ACL token. This data can be valuable for advanced use-cases, such as making requests to the Consul API from within application containers. -- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects that define volumes to add to the Envoy sidecar. -- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects that define volumeMounts to add to the Envoy sidecar. +- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects as specified by the [Volume pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core), that define volumes to add to the Envoy sidecar. For example, the JSON object for a volume with the name `secrets-data` and the hostPath `/mnt/secrets-path` is as follows: `"[{\"name\": \"secrets-data\", \"hostPath\": "[{\"path\": \"/mnt/secrets-path\"}] "}]"` +- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects as specified by the [Volume mount pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core), that define volumeMounts to add to the Envoy sidecar. For example, the JSON object for a volume mount with the name `secrets-store-mount` and the mountPath `/mnt/secrets-store` is as follows: `"[{\"name\": \"secrets-store-mount\", \"mountPath\": \"/mnt/secrets-store\"}]"` ## Labels From a950a4ba407262e11e60f7b7117d0dc7686b460b Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 22 Jul 2022 17:17:21 +0000 Subject: [PATCH 4/5] backport of commit 7450414500eabd50aa07c26ccf6e8dc892bf0808 --- website/content/docs/k8s/annotations-and-labels.mdx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx index 311e453b271..df389821402 100644 --- a/website/content/docs/k8s/annotations-and-labels.mdx +++ b/website/content/docs/k8s/annotations-and-labels.mdx @@ -221,8 +221,16 @@ The following Kubernetes resource annotations could be used on a pod to control - `consul.hashicorp.com/service-metrics-port` - Set the port where the Connect service exposes metrics. - `consul.hashicorp.com/service-metrics-path` - Set the path where the Connect service exposes metrics. - `consul.hashicorp.com/connect-inject-mount-volume` - Comma separated list of container names to mount the connect-inject volume into. The volume will be mounted at `/consul/connect-inject`. The connect-inject volume contains Consul internals data needed by the other sidecar containers, for example the `consul` binary, and the Pod's Consul ACL token. This data can be valuable for advanced use-cases, such as making requests to the Consul API from within application containers. -- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects as specified by the [Volume pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core), that define volumes to add to the Envoy sidecar. For example, the JSON object for a volume with the name `secrets-data` and the hostPath `/mnt/secrets-path` is as follows: `"[{\"name\": \"secrets-data\", \"hostPath\": "[{\"path\": \"/mnt/secrets-path\"}] "}]"` -- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects as specified by the [Volume mount pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core), that define volumeMounts to add to the Envoy sidecar. For example, the JSON object for a volume mount with the name `secrets-store-mount` and the mountPath `/mnt/secrets-store` is as follows: `"[{\"name\": \"secrets-store-mount\", \"mountPath\": \"/mnt/secrets-store\"}]"` +- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects as specified by the [Volume pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core), that define volumes to add to the Envoy sidecar. For example, the JSON object for a volume with the name `secrets-data` and the hostPath `/mnt/secrets-path` is as follows: + ```yaml + annotations: + "consul.hashicorp.com/consul-sidecar-user-volume": "[{\"name\": \"secrets-data\", \"hostPath\": "[{\"path\": \"/mnt/secrets-path\"}] "}]" + ``` +- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects as specified by the [Volume mount pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core), that define volumeMounts to add to the Envoy sidecar. For example, the JSON object for a volume mount with the name `secrets-store-mount` and the mountPath `/mnt/secrets-store` is as follows: + ```yaml + annotations: + "consul.hashicorp.com/consul-sidecar-user-volume-mount": "[{\"name\": \"secrets-store-mount\", \"mountPath\": \"/mnt/secrets-store\"}]" + ``` ## Labels From 2e7472b70283ebab2867003b046afebe3ab42cb1 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 22 Jul 2022 19:49:45 +0000 Subject: [PATCH 5/5] backport of commit bd1e340805edd5273a34a78d1eaa91e5e2070e8e --- website/content/docs/k8s/annotations-and-labels.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx index df389821402..0d300427393 100644 --- a/website/content/docs/k8s/annotations-and-labels.mdx +++ b/website/content/docs/k8s/annotations-and-labels.mdx @@ -221,12 +221,12 @@ The following Kubernetes resource annotations could be used on a pod to control - `consul.hashicorp.com/service-metrics-port` - Set the port where the Connect service exposes metrics. - `consul.hashicorp.com/service-metrics-path` - Set the path where the Connect service exposes metrics. - `consul.hashicorp.com/connect-inject-mount-volume` - Comma separated list of container names to mount the connect-inject volume into. The volume will be mounted at `/consul/connect-inject`. The connect-inject volume contains Consul internals data needed by the other sidecar containers, for example the `consul` binary, and the Pod's Consul ACL token. This data can be valuable for advanced use-cases, such as making requests to the Consul API from within application containers. -- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects as specified by the [Volume pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core), that define volumes to add to the Envoy sidecar. For example, the JSON object for a volume with the name `secrets-data` and the hostPath `/mnt/secrets-path` is as follows: +- `consul.hashicorp.com/consul-sidecar-user-volume` - JSON objects as specified by the [Volume pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volume-v1-core), that define volumes to add to the Envoy sidecar. ```yaml annotations: - "consul.hashicorp.com/consul-sidecar-user-volume": "[{\"name\": \"secrets-data\", \"hostPath\": "[{\"path\": \"/mnt/secrets-path\"}] "}]" + "consul.hashicorp.com/consul-sidecar-user-volume": "[{\"name\": \"secrets-data\", \"hostPath\": "[{\"path\": \"/mnt/secrets-path\"}]"}]" ``` -- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects as specified by the [Volume mount pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core), that define volumeMounts to add to the Envoy sidecar. For example, the JSON object for a volume mount with the name `secrets-store-mount` and the mountPath `/mnt/secrets-store` is as follows: +- `consul.hashicorp.com/consul-sidecar-user-volume-mount` - JSON objects as specified by the [Volume mount pod spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core), that define volumeMounts to add to the Envoy sidecar. ```yaml annotations: "consul.hashicorp.com/consul-sidecar-user-volume-mount": "[{\"name\": \"secrets-store-mount\", \"mountPath\": \"/mnt/secrets-store\"}]"