From 116cf35adff51f5035a8780ff064e21e8eaf6a6f Mon Sep 17 00:00:00 2001 From: Lionel Villard Date: Mon, 11 May 2020 13:16:18 -0400 Subject: [PATCH] Revert "add owner ref to mtping deployment (#3040)" This reverts commit 004ebd45161f783c18b4d64aea90a840421d7cae. --- config/core/deployments/controller.yaml | 8 -------- pkg/reconciler/pingsource/controller.go | 4 ---- pkg/reconciler/pingsource/controller_test.go | 12 ------------ .../pingsource/resources/mt_receive_adapter.go | 16 +--------------- .../resources/mt_receive_adapter_test.go | 10 ---------- 5 files changed, 1 insertion(+), 49 deletions(-) diff --git a/config/core/deployments/controller.yaml b/config/core/deployments/controller.yaml index ae620e127d0..ffa1b6c8971 100644 --- a/config/core/deployments/controller.yaml +++ b/config/core/deployments/controller.yaml @@ -47,14 +47,6 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: CONTROLLER_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: CONTROLLER_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - name: CONFIG_LOGGING_NAME value: config-logging - name: CONFIG_OBSERVABILITY_NAME diff --git a/pkg/reconciler/pingsource/controller.go b/pkg/reconciler/pingsource/controller.go index 571d8141430..e0f41c2002d 100644 --- a/pkg/reconciler/pingsource/controller.go +++ b/pkg/reconciler/pingsource/controller.go @@ -43,10 +43,6 @@ import ( type envConfig struct { Image string `envconfig:"PING_IMAGE" required:"true"` MTImage string `envconfig:"MT_PING_IMAGE" required:"true"` - - // Add this for validation purpose only of validation. - ControllerName string `envconfig:"CONTROLLER_NAME" required:"true"` - ControllerUID string `envconfig:"CONTROLLER_UID" required:"true"` } // NewController initializes the controller and is called by the generated code diff --git a/pkg/reconciler/pingsource/controller_test.go b/pkg/reconciler/pingsource/controller_test.go index 80c9e678ee8..6c8e3e6991f 100644 --- a/pkg/reconciler/pingsource/controller_test.go +++ b/pkg/reconciler/pingsource/controller_test.go @@ -47,12 +47,6 @@ func TestNew(t *testing.T) { if err := os.Setenv("PING_IMAGE", "anything"); err != nil { t.Fatalf("Failed to set env var: %v", err) } - if err := os.Setenv("CONTROLLER_NAME", "anything"); err != nil { - t.Fatalf("Failed to set env var: %v", err) - } - if err := os.Setenv("CONTROLLER_UID", "anything"); err != nil { - t.Fatalf("Failed to set env var: %v", err) - } if err := os.Setenv("MT_PING_IMAGE", "anything"); err != nil { t.Fatalf("Failed to set env var: %v", err) } @@ -60,12 +54,6 @@ func TestNew(t *testing.T) { if err := os.Unsetenv("PING_IMAGE"); err != nil { t.Fatalf("Failed to unset env var: %v", err) } - if err := os.Unsetenv("CONTROLLER_NAME"); err != nil { - t.Fatalf("Failed to unset env var: %v", err) - } - if err := os.Unsetenv("CONTROLLER_UID"); err != nil { - t.Fatalf("Failed to unset env var: %v", err) - } if err := os.Unsetenv("MT_PING_IMAGE"); err != nil { t.Fatalf("Failed to unset env var: %v", err) } diff --git a/pkg/reconciler/pingsource/resources/mt_receive_adapter.go b/pkg/reconciler/pingsource/resources/mt_receive_adapter.go index c5bb48c64b7..f15f8bf7fea 100644 --- a/pkg/reconciler/pingsource/resources/mt_receive_adapter.go +++ b/pkg/reconciler/pingsource/resources/mt_receive_adapter.go @@ -17,13 +17,11 @@ limitations under the License. package resources import ( - "os" - v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" + "knative.dev/pkg/system" ) @@ -43,8 +41,6 @@ type MTArgs struct { // MakeMTReceiveAdapter generates the mtping deployment for pingsources func MakeMTReceiveAdapter(args MTArgs) *v1.Deployment { replicas := int32(1) - blockOwnerDeletion := true - isController := true return &v1.Deployment{ TypeMeta: metav1.TypeMeta{ @@ -54,16 +50,6 @@ func MakeMTReceiveAdapter(args MTArgs) *v1.Deployment { ObjectMeta: metav1.ObjectMeta{ Namespace: system.Namespace(), Name: args.MTAdapterName, - OwnerReferences: []metav1.OwnerReference{ - { - APIVersion: v1.SchemeGroupVersion.String(), - Kind: "Deployment", - Name: os.Getenv("CONTROLLER_NAME"), // guarantee to be non-empty - UID: types.UID(os.Getenv("CONTROLLER_UID")), // guarantee to be non-empty - Controller: &isController, - BlockOwnerDeletion: &blockOwnerDeletion, - }, - }, }, Spec: v1.DeploymentSpec{ Replicas: &replicas, diff --git a/pkg/reconciler/pingsource/resources/mt_receive_adapter_test.go b/pkg/reconciler/pingsource/resources/mt_receive_adapter_test.go index 5856e07b901..758f62c97cc 100644 --- a/pkg/reconciler/pingsource/resources/mt_receive_adapter_test.go +++ b/pkg/reconciler/pingsource/resources/mt_receive_adapter_test.go @@ -30,8 +30,6 @@ import ( func TestMakeMTPingAdapter(t *testing.T) { replicas := int32(1) - blockOwnerDeletion := true - isController := true args := MTArgs{ ServiceAccountName: "test-sa", @@ -47,14 +45,6 @@ func TestMakeMTPingAdapter(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Namespace: system.Namespace(), Name: args.MTAdapterName, - OwnerReferences: []metav1.OwnerReference{ - { - APIVersion: "apps/v1", - Kind: "Deployment", - Controller: &isController, - BlockOwnerDeletion: &blockOwnerDeletion, - }, - }, }, Spec: v1.DeploymentSpec{ Replicas: &replicas,