Skip to content

Revert "add owner ref to mtping deployment" #3128

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

Merged
knative-prow-robot merged 1 commit into from
May 11, 2020
Merged

Revert "add owner ref to mtping deployment" #3128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions config/core/deployments/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions pkg/reconciler/pingsource/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions pkg/reconciler/pingsource/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,13 @@ 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)
}
defer func() {
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)
}
Expand Down
16 changes: 1 addition & 15 deletions pkg/reconciler/pingsource/resources/mt_receive_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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{
Expand All @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions pkg/reconciler/pingsource/resources/mt_receive_adapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ import (

func TestMakeMTPingAdapter(t *testing.T) {
replicas := int32(1)
blockOwnerDeletion := true
isController := true

args := MTArgs{
ServiceAccountName: "test-sa",
Expand All @@ -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,
Expand Down