Fix TestAPIGateway_GatewayClassConfig (#2631)

* Fix TestAPIGateway_GatewayClassConfig
* Remove stray files from bad merge

acceptance/tests/api-gateway/api_gateway_gatewayclassconfig_test.go

@@ -63,22 +63,6 @@ func TestAPIGateway_GatewayClassConfig(t *testing.T) {
 
 	k8sClient := ctx.ControllerRuntimeClient(t)
 
-	//create clean namespace
-	err = k8sClient.Create(context.Background(), &corev1.Namespace{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: namespace,
-		},
-	})
-	require.NoError(t, err)
-	helpers.Cleanup(t, cfg.NoCleanupOnFailure, cfg.NoCleanup, func() {
-		logger.Log(t, "deleting gateway namesapce")
-		k8sClient.Delete(context.Background(), &corev1.Namespace{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: namespace,
-			},
-		})
-	})
-
 	// create a GatewayClassConfig with configuration set
 	gatewayClassConfigName := "gateway-class-config"
 	gatewayClassConfig := &v1alpha1.GatewayClassConfig{
@@ -144,10 +128,6 @@ func TestAPIGateway_GatewayClassConfig(t *testing.T) {
 	logger.Log(t, "creating controlled gateway")
 	gateway := createGateway(t, k8sClient, gatewayName, namespace, gatewayClassName, certificateName)
 
-	// make sure it exists
-	logger.Log(t, "checking that gateway one is synchronized to Consul")
-	checkConsulExists(t, consulClient, api.APIGateway, gatewayName)
-
 	helpers.Cleanup(t, cfg.NoCleanupOnFailure, cfg.NoCleanup, func() {
 		logger.Log(t, "deleting all gateways")
 		k8sClient.DeleteAllOf(context.Background(), &gwv1beta1.Gateway{}, client.InNamespace(namespace))