diff --git a/control-plane/api-gateway/controllers/gateway_controller_integration_test.go b/control-plane/api-gateway/controllers/gateway_controller_integration_test.go index ee8d8240f6..3c64f488c9 100644 --- a/control-plane/api-gateway/controllers/gateway_controller_integration_test.go +++ b/control-plane/api-gateway/controllers/gateway_controller_integration_test.go @@ -113,7 +113,9 @@ func TestControllerDoesNotInfinitelyReconcile(t *testing.T) { for name, tc := range testCases { t.Run(name, func(t *testing.T) { - k8sClient := registerFieldIndexersForTest(fake.NewClientBuilder().WithScheme(s)).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithStatusSubresource(&gwv1beta1.Gateway{}, &gwv1beta1.HTTPRoute{}, &gwv1alpha2.TCPRoute{}, &v1alpha1.RouteAuthFilter{}) + k8sClient := registerFieldIndexersForTest(fakeClient).Build() consulTestServerClient := test.TestServerWithMockConnMgrWatcher(t, nil) ctx, cancel := context.WithCancel(context.Background()) diff --git a/control-plane/api-gateway/controllers/gatewayclass_controller_test.go b/control-plane/api-gateway/controllers/gatewayclass_controller_test.go index 0eeaf4c1de..b7a9c657e4 100644 --- a/control-plane/api-gateway/controllers/gatewayclass_controller_test.go +++ b/control-plane/api-gateway/controllers/gatewayclass_controller_test.go @@ -243,7 +243,10 @@ func TestGatewayClassReconciler(t *testing.T) { objs = append(objs, tc.gatewayClass) } - fakeClient := registerFieldIndexersForTest(fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...)).Build() + fakeClient := registerFieldIndexersForTest( + fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(objs...). + WithStatusSubresource(&gwv1beta1.GatewayClass{})).Build() r := &GatewayClassController{ Client: fakeClient, diff --git a/control-plane/api-gateway/controllers/gatewayclassconfig_controller_test.go b/control-plane/api-gateway/controllers/gatewayclassconfig_controller_test.go index 40023d498f..41a9953822 100644 --- a/control-plane/api-gateway/controllers/gatewayclassconfig_controller_test.go +++ b/control-plane/api-gateway/controllers/gatewayclassconfig_controller_test.go @@ -56,6 +56,7 @@ func TestGatewayClassConfigReconcile(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "consul-api-gateway", DeletionTimestamp: &deletionTimestamp, + Finalizers: []string{gatewayClassConfigFinalizer}, }, } return []runtime.Object{&gatewayClassConfig} @@ -68,6 +69,7 @@ func TestGatewayClassConfigReconcile(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "consul-api-gateway", DeletionTimestamp: &deletionTimestamp, + Finalizers: []string{gatewayClassConfigFinalizer}, }, } gatewayClass := gwv1beta1.GatewayClass{ @@ -98,7 +100,10 @@ func TestGatewayClassConfigReconcile(t *testing.T) { require.NoError(t, gwv1beta1.Install(s)) require.NoError(t, v1alpha1.AddToScheme(s)) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(tt.k8sObjects()...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(tt.k8sObjects()...). + WithStatusSubresource(&v1alpha1.GatewayClassConfig{}). + Build() // Create the gateway class config controller. gcc := &GatewayClassConfigController{ diff --git a/control-plane/connect-inject/controllers/peering/peering_acceptor_controller_test.go b/control-plane/connect-inject/controllers/peering/peering_acceptor_controller_test.go index 9024e8ba4e..2ebba835e3 100644 --- a/control-plane/connect-inject/controllers/peering/peering_acceptor_controller_test.go +++ b/control-plane/connect-inject/controllers/peering/peering_acceptor_controller_test.go @@ -504,7 +504,10 @@ func TestReconcile_CreateUpdatePeeringAcceptor(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() // Create test consul server. testClient := test.TestServerWithMockConnMgrWatcher(t, nil) @@ -627,7 +630,10 @@ func TestReconcile_DeletePeeringAcceptor(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() // Create test consulServer server // Create test consul server. @@ -775,7 +781,10 @@ func TestReconcile_VersionAnnotation(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() // Create test consul server. testClient := test.TestServerWithMockConnMgrWatcher(t, nil) @@ -1089,7 +1098,10 @@ func TestAcceptorUpdateStatus(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() // Create the peering acceptor controller. pac := &AcceptorController{ Client: fakeClient, @@ -1202,7 +1214,10 @@ func TestAcceptorUpdateStatusError(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() // Create the peering acceptor controller. controller := &AcceptorController{ Client: fakeClient, @@ -1219,6 +1234,7 @@ func TestAcceptorUpdateStatusError(t *testing.T) { } err := fakeClient.Get(context.Background(), acceptorName, acceptor) require.NoError(t, err) + require.Len(t, acceptor.Status.Conditions, 1) require.Equal(t, tt.expStatus.Conditions[0].Message, acceptor.Status.Conditions[0].Message) }) @@ -1487,7 +1503,10 @@ func TestAcceptor_RequestsForPeeringTokens(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringAcceptor{}, &v1alpha1.PeeringAcceptorList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(tt.secret, &tt.acceptors).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(tt.secret, &tt.acceptors). + WithStatusSubresource(&v1alpha1.PeeringAcceptor{}). + Build() controller := AcceptorController{ Client: fakeClient, Log: logrtest.New(t), diff --git a/control-plane/connect-inject/controllers/peering/peering_dialer_controller_test.go b/control-plane/connect-inject/controllers/peering/peering_dialer_controller_test.go index df800c63bc..6026d1e534 100644 --- a/control-plane/connect-inject/controllers/peering/peering_dialer_controller_test.go +++ b/control-plane/connect-inject/controllers/peering/peering_dialer_controller_test.go @@ -321,7 +321,10 @@ func TestReconcile_CreateUpdatePeeringDialer(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() // Create the peering dialer controller controller := &PeeringDialerController{ @@ -537,7 +540,10 @@ func TestReconcile_VersionAnnotationPeeringDialer(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() // Create the peering dialer controller controller := &PeeringDialerController{ @@ -754,7 +760,10 @@ func TestReconcileDeletePeeringDialer(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() // Create test consul server. testClient := test.TestServerWithMockConnMgrWatcher(t, nil) @@ -897,7 +906,10 @@ func TestDialerUpdateStatus(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() // Create the peering dialer controller. controller := &PeeringDialerController{ Client: fakeClient, @@ -1010,7 +1022,11 @@ func TestDialerUpdateStatusError(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(k8sObjects...).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(k8sObjects...). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() + // Create the peering dialer controller. controller := &PeeringDialerController{ Client: fakeClient, @@ -1027,6 +1043,7 @@ func TestDialerUpdateStatusError(t *testing.T) { } err := fakeClient.Get(context.Background(), dialerName, dialer) require.NoError(t, err) + require.Len(t, dialer.Status.Conditions, 1) require.Equal(t, tt.expStatus.Conditions[0].Message, dialer.Status.Conditions[0].Message) }) @@ -1295,7 +1312,10 @@ func TestDialer_RequestsForPeeringTokens(t *testing.T) { s := runtime.NewScheme() corev1.AddToScheme(s) s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.PeeringDialer{}, &v1alpha1.PeeringDialerList{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(tt.secret, &tt.dialers).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s). + WithRuntimeObjects(tt.secret, &tt.dialers). + WithStatusSubresource(&v1alpha1.PeeringDialer{}). + Build() controller := PeeringDialerController{ Client: fakeClient, Log: logrtest.New(t), diff --git a/control-plane/controllers/configentries/configentry_controller_test.go b/control-plane/controllers/configentries/configentry_controller_test.go index faa153c323..d65d02603c 100644 --- a/control-plane/controllers/configentries/configentry_controller_test.go +++ b/control-plane/controllers/configentries/configentry_controller_test.go @@ -548,7 +548,7 @@ func TestConfigEntryControllers_createsConfigEntry(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResource) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.configEntryResource).WithStatusSubresource(c.configEntryResource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1075,7 +1075,7 @@ func TestConfigEntryControllers_updatesConfigEntry(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResource) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.configEntryResource).WithStatusSubresource(c.configEntryResource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1506,7 +1506,7 @@ func TestConfigEntryControllers_deletesConfigEntry(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResourceWithDeletion) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResourceWithDeletion).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.configEntryResourceWithDeletion).WithStatusSubresource(c.configEntryResourceWithDeletion).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1567,7 +1567,7 @@ func TestConfigEntryControllers_errorUpdatesSyncStatus(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(svcDefaults).WithStatusSubresource(svcDefaults).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1640,7 +1640,7 @@ func TestConfigEntryControllers_setsSyncedToTrue(t *testing.T) { s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults) // The config entry exists in kube but its status will be nil. - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(svcDefaults).WithStatusSubresource(svcDefaults).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1712,7 +1712,7 @@ func TestConfigEntryControllers_doesNotCreateUnownedConfigEntry(t *testing.T) { }, } s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(svcDefaults).WithStatusSubresource(svcDefaults).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1796,7 +1796,7 @@ func TestConfigEntryControllers_doesNotDeleteUnownedConfig(t *testing.T) { }, } s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaultsWithDeletion) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaultsWithDeletion).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(svcDefaultsWithDeletion).WithStatusSubresource(svcDefaultsWithDeletion).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -1878,7 +1878,7 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) { }, } - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(defaults, splitter).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(defaults, splitter).WithStatusSubresource(defaults, splitter).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) @@ -2010,7 +2010,7 @@ func TestConfigEntryController_Migration(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.ServiceDefaults{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(&c.KubeResource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(&c.KubeResource).WithStatusSubresource(&c.KubeResource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForServiceIntentions(t) consulClient := testClient.APIClient @@ -2291,7 +2291,7 @@ func TestConfigEntryControllers_assignServiceVirtualIP(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResource) s.AddKnownTypes(schema.GroupVersion{Group: "", Version: "v1"}, &corev1.Service{}) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(&c.service, c.configEntryResource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(&c.service, c.configEntryResource).WithStatusSubresource(&c.service, c.configEntryResource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, nil) testClient.TestServer.WaitForLeader(t) diff --git a/control-plane/controllers/resources/api-gateway-controller_test.go b/control-plane/controllers/resources/api-gateway-controller_test.go index 6b907647ec..d8e4fb3a48 100644 --- a/control-plane/controllers/resources/api-gateway-controller_test.go +++ b/control-plane/controllers/resources/api-gateway-controller_test.go @@ -8,15 +8,16 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/consul-k8s/control-plane/api/mesh/v2beta1" - "github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants" - "github.com/hashicorp/consul-k8s/control-plane/helper/test" pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" "github.com/hashicorp/consul/sdk/testutil" "github.com/stretchr/testify/require" "google.golang.org/protobuf/testing/protocmp" + "github.com/hashicorp/consul-k8s/control-plane/api/mesh/v2beta1" + "github.com/hashicorp/consul-k8s/control-plane/connect-inject/constants" + "github.com/hashicorp/consul-k8s/control-plane/helper/test" + logrtest "github.com/go-logr/logr/testr" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -65,7 +66,7 @@ func TestAPIGatewayController_ReconcileResourceExists(t *testing.T) { }, } - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(apiGW).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(apiGW).WithStatusSubresource(apiGW).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} diff --git a/control-plane/controllers/resources/consul_resource_controller_test.go b/control-plane/controllers/resources/consul_resource_controller_test.go index cb8c1cf6bd..5de53a5b22 100644 --- a/control-plane/controllers/resources/consul_resource_controller_test.go +++ b/control-plane/controllers/resources/consul_resource_controller_test.go @@ -139,7 +139,7 @@ func TestConsulResourceController_CreatesConsulResource(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v2beta1.AuthGroupVersion, c.resource) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.resource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.resource).WithStatusSubresource(c.resource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -277,7 +277,7 @@ func TestConsulResourceController_UpdatesConsulResource(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v1alpha1.GroupVersion, c.resource) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.resource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.resource).WithStatusSubresource(c.resource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -392,7 +392,7 @@ func TestConsulResourceController_DeletesConsulResource(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v2beta1.AuthGroupVersion, c.resource) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.resource).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(c.resource).WithStatusSubresource(c.resource).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -458,7 +458,7 @@ func TestConsulResourceController_ErrorUpdatesSyncStatus(t *testing.T) { s := runtime.NewScheme() s.AddKnownTypes(v2beta1.AuthGroupVersion, trafficpermissions) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(trafficpermissions).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(trafficpermissions).WithStatusSubresource(trafficpermissions).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -537,7 +537,7 @@ func TestConsulResourceController_SetsSyncedToTrue(t *testing.T) { s.AddKnownTypes(v2beta1.AuthGroupVersion, trafficpermissions) // The config entry exists in kube but its status will be nil. - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(trafficpermissions).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(trafficpermissions).WithStatusSubresource(trafficpermissions).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -610,7 +610,7 @@ func TestConsulResourceController_DoesNotCreateUnownedResource(t *testing.T) { }, } s.AddKnownTypes(v2beta1.AuthGroupVersion, trafficpermissions) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(trafficpermissions).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(trafficpermissions).WithStatusSubresource(trafficpermissions).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} @@ -711,7 +711,7 @@ func TestConsulResourceController_doesNotDeleteUnownedConfig(t *testing.T) { }, } s.AddKnownTypes(v2beta1.AuthGroupVersion, trafficpermissionsWithDeletion) - fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(trafficpermissionsWithDeletion).Build() + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(trafficpermissionsWithDeletion).WithStatusSubresource(trafficpermissionsWithDeletion).Build() testClient := test.TestServerWithMockConnMgrWatcher(t, func(c *testutil.TestServerConfig) { c.Experiments = []string{"resource-apis"} diff --git a/control-plane/controllers/resources/mesh_gateway_controller_test.go b/control-plane/controllers/resources/mesh_gateway_controller_test.go index 63f38624f0..cd3f590deb 100644 --- a/control-plane/controllers/resources/mesh_gateway_controller_test.go +++ b/control-plane/controllers/resources/mesh_gateway_controller_test.go @@ -33,7 +33,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { testCases := []struct { name string // k8sObjects is the list of Kubernetes resources that will be present in the cluster at runtime - k8sObjects []runtime.Object + k8sObjects []client.Object // request is the request that will be provided to MeshGatewayController.Reconcile request ctrl.Request // expectedErr is the error we expect MeshGatewayController.Reconcile to return @@ -46,7 +46,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { // ServiceAccount { name: "MeshGateway created with no existing ServiceAccount", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "consul", @@ -79,7 +79,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing ServiceAccount not owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -115,7 +115,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { // Role { name: "MeshGateway created with no existing Role", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "consul", @@ -148,7 +148,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Role not owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -183,7 +183,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Role owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -226,7 +226,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { // RoleBinding { name: "MeshGateway created with no existing RoleBinding", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "consul", @@ -259,7 +259,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing RoleBinding not owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -294,7 +294,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing RoleBinding owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -337,7 +337,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { // Deployment { name: "MeshGateway created with no existing Deployment", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "consul", @@ -370,7 +370,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Deployment not owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -405,7 +405,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Deployment owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -448,7 +448,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { // Service { name: "MeshGateway created with no existing Service", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "consul", @@ -481,7 +481,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Service not owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -516,7 +516,7 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { }, { name: "MeshGateway created with existing Service owned by gateway", - k8sObjects: []runtime.Object{ + k8sObjects: []client.Object{ &v2beta1.MeshGateway{ ObjectMeta: metav1.ObjectMeta{ Namespace: "default", @@ -571,7 +571,8 @@ func TestMeshGatewayController_Reconcile(t *testing.T) { require.NoError(t, v2beta1.AddMeshToScheme(s)) s.AddKnownTypes(v2beta1.MeshGroupVersion, &v2beta1.MeshGateway{}, &v2beta1.GatewayClass{}, &v2beta1.GatewayClassConfig{}) fakeClient := fake.NewClientBuilder().WithScheme(s). - WithRuntimeObjects(testCase.k8sObjects...). + WithObjects(testCase.k8sObjects...). + WithStatusSubresource(testCase.k8sObjects...). Build() controller := MeshGatewayController{