From bd2e9639ae1fb9543021106e80aa4abf1dbb21b9 Mon Sep 17 00:00:00 2001
From: Lionel Villard <villard@us.ibm.com>
Date: Mon, 22 Feb 2021 10:45:08 -0500
Subject: [PATCH] fix broken in-mem ns mode

---
 .../roles/controller-clusterrole.yaml                  |  8 ++++++++
 .../inmemorychannel/controller/resources/dispatcher.go | 10 ++++++++++
 .../controller/resources/dispatcher_test.go            | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/config/channels/in-memory-channel/roles/controller-clusterrole.yaml b/config/channels/in-memory-channel/roles/controller-clusterrole.yaml
index 89f9c139fba..5be89ecf087 100644
--- a/config/channels/in-memory-channel/roles/controller-clusterrole.yaml
+++ b/config/channels/in-memory-channel/roles/controller-clusterrole.yaml
@@ -35,6 +35,14 @@ rules:
       - inmemorychannels/finalizers
     verbs:
       - update
+  - apiGroups:
+      - messaging.knative.dev
+    resources:
+      - inmemorychannels/finalizers
+      - inmemorychannels/status
+      - inmemorychannels
+    verbs:
+      - patch
   - apiGroups:
       - ""
     resources:
diff --git a/pkg/reconciler/inmemorychannel/controller/resources/dispatcher.go b/pkg/reconciler/inmemorychannel/controller/resources/dispatcher.go
index 934135f0dd4..b053f752587 100644
--- a/pkg/reconciler/inmemorychannel/controller/resources/dispatcher.go
+++ b/pkg/reconciler/inmemorychannel/controller/resources/dispatcher.go
@@ -128,6 +128,16 @@ func makeEnv(dispatcherConfig config.EventDispatcherConfig) []corev1.EnvVar {
 				FieldPath: "metadata.namespace",
 			},
 		},
+	}, {
+		Name: "POD_NAME",
+		ValueFrom: &corev1.EnvVarSource{
+			FieldRef: &corev1.ObjectFieldSelector{
+				FieldPath: "metadata.name",
+			},
+		},
+	}, {
+		Name:  "CONTAINER_NAME",
+		Value: "dispatcher",
 	}, {
 		Name:  "MAX_IDLE_CONNS",
 		Value: strconv.Itoa(dispatcherConfig.MaxIdleConns),
diff --git a/pkg/reconciler/inmemorychannel/controller/resources/dispatcher_test.go b/pkg/reconciler/inmemorychannel/controller/resources/dispatcher_test.go
index 689f7b12550..97b4dbaf24d 100644
--- a/pkg/reconciler/inmemorychannel/controller/resources/dispatcher_test.go
+++ b/pkg/reconciler/inmemorychannel/controller/resources/dispatcher_test.go
@@ -102,6 +102,16 @@ func TestNewDispatcher(t *testing.T) {
 										FieldPath: "metadata.namespace",
 									},
 								},
+							}, {
+								Name: "POD_NAME",
+								ValueFrom: &corev1.EnvVarSource{
+									FieldRef: &corev1.ObjectFieldSelector{
+										FieldPath: "metadata.name",
+									},
+								},
+							}, {
+								Name:  "CONTAINER_NAME",
+								Value: "dispatcher",
 							}, {
 								Name:  "MAX_IDLE_CONNS",
 								Value: "2000",