From d1c3a520e3b561a80f2b5de99ec61c997d19ec60 Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Fri, 18 Sep 2020 10:14:58 +0200 Subject: [PATCH] Project pod name as env var in our deployments - https://github.com/knative/pkg/pull/1714 Signed-off-by: Pierangelo Di Pilato --- config/brokers/mt-channel-broker/deployments/controller.yaml | 5 +++++ .../channels/in-memory-channel/deployments/controller.yaml | 5 +++++ .../channels/in-memory-channel/deployments/dispatcher.yaml | 5 +++++ config/core/deployments/controller.yaml | 4 ++++ config/core/deployments/pingsource-mt-adapter.yaml | 4 ++++ config/core/deployments/webhook.yaml | 4 ++++ config/sugar/500-controller.yaml | 5 +++++ 7 files changed, 32 insertions(+) diff --git a/config/brokers/mt-channel-broker/deployments/controller.yaml b/config/brokers/mt-channel-broker/deployments/controller.yaml index b8b23343be5..0d42ee56013 100644 --- a/config/brokers/mt-channel-broker/deployments/controller.yaml +++ b/config/brokers/mt-channel-broker/deployments/controller.yaml @@ -73,6 +73,11 @@ spec: - name: BROKER_INJECTION_DEFAULT value: "false" + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + securityContext: allowPrivilegeEscalation: false diff --git a/config/channels/in-memory-channel/deployments/controller.yaml b/config/channels/in-memory-channel/deployments/controller.yaml index 344f62647d4..cbeb15d1614 100644 --- a/config/channels/in-memory-channel/deployments/controller.yaml +++ b/config/channels/in-memory-channel/deployments/controller.yaml @@ -47,6 +47,11 @@ spec: fieldPath: metadata.namespace - name: DISPATCHER_IMAGE value: ko://knative.dev/eventing/cmd/in_memory/channel_dispatcher + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + securityContext: allowPrivilegeEscalation: false diff --git a/config/channels/in-memory-channel/deployments/dispatcher.yaml b/config/channels/in-memory-channel/deployments/dispatcher.yaml index 5718ad39a64..77a995856a9 100644 --- a/config/channels/in-memory-channel/deployments/dispatcher.yaml +++ b/config/channels/in-memory-channel/deployments/dispatcher.yaml @@ -45,6 +45,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + ports: - containerPort: 9090 name: metrics diff --git a/config/core/deployments/controller.yaml b/config/core/deployments/controller.yaml index 4279dddee2b..5c311a6daba 100644 --- a/config/core/deployments/controller.yaml +++ b/config/core/deployments/controller.yaml @@ -68,6 +68,10 @@ spec: # APIServerSource - name: APISERVER_RA_IMAGE value: ko://knative.dev/eventing/cmd/apiserver_receive_adapter + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name securityContext: allowPrivilegeEscalation: false diff --git a/config/core/deployments/pingsource-mt-adapter.yaml b/config/core/deployments/pingsource-mt-adapter.yaml index 98222228258..bbaf579e8ca 100644 --- a/config/core/deployments/pingsource-mt-adapter.yaml +++ b/config/core/deployments/pingsource-mt-adapter.yaml @@ -54,6 +54,10 @@ spec: value: '' - name: K_NO_SHUTDOWN_AFTER value: '' + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name ports: - containerPort: 9090 diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml index eebad41b7a1..a8dfef10bc4 100644 --- a/config/core/deployments/webhook.yaml +++ b/config/core/deployments/webhook.yaml @@ -82,6 +82,10 @@ spec: # The default is `exclusion`. - name: SINK_BINDING_SELECTION_MODE value: "exclusion" + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name securityContext: allowPrivilegeEscalation: false diff --git a/config/sugar/500-controller.yaml b/config/sugar/500-controller.yaml index ae48f416c13..5887a329d58 100644 --- a/config/sugar/500-controller.yaml +++ b/config/sugar/500-controller.yaml @@ -43,6 +43,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + securityContext: allowPrivilegeEscalation: false