From c8c8f6d0f4a8ac4ff4ad7d1a84b27e1aa7ebf9b4 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Wed, 16 Dec 2020 09:01:41 -0500
Subject: [PATCH] bring selflinks back for 4.7, they will be removed in 4.8

---
 config/v1/types_feature.go       |  1 +
 config/v1/types_features_test.go | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
index 7cb30c5d340..0145b82c6db 100644
--- a/config/v1/types_feature.go
+++ b/config/v1/types_feature.go
@@ -129,6 +129,7 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
 	},
 	Disabled: []string{
 		"LegacyNodeRoleBehavior", // sig-scheduling, ccoleman
+		"RemoveSelfLink",         // kuryr needs updating, deads2k will personally remove in 4.8
 	},
 }
 
diff --git a/config/v1/types_features_test.go b/config/v1/types_features_test.go
index ddd71857417..a0ab6724177 100644
--- a/config/v1/types_features_test.go
+++ b/config/v1/types_features_test.go
@@ -29,6 +29,7 @@ func TestFeatureBuilder(t *testing.T) {
 				},
 				Disabled: []string{
 					"LegacyNodeRoleBehavior",
+					"RemoveSelfLink",
 					"SCTPSupport",
 				},
 			},
@@ -46,7 +47,9 @@ func TestFeatureBuilder(t *testing.T) {
 					"SCTPSupport",
 					"LegacyNodeRoleBehavior",
 				},
-				Disabled: []string{},
+				Disabled: []string{
+					"RemoveSelfLink",
+				},
 			},
 		},
 		{
@@ -62,6 +65,7 @@ func TestFeatureBuilder(t *testing.T) {
 				},
 				Disabled: []string{
 					"LegacyNodeRoleBehavior",
+					"RemoveSelfLink",
 					"SCTPSupport",
 					"other",
 				},
@@ -81,7 +85,9 @@ func TestFeatureBuilder(t *testing.T) {
 					"LegacyNodeRoleBehavior",
 					"other",
 				},
-				Disabled: []string{},
+				Disabled: []string{
+					"RemoveSelfLink",
+				},
 			},
 		},
 	}