chore: resolve conflict

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
kumahq · Jul 6, 2023 · c14219f · c14219f
1 parent 53008e8
commit c14219f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 49 deletions.
diff --git a/pkg/xds/context/mesh_context_builder.go b/pkg/xds/context/mesh_context_builder.go
@@ -402,15 +402,11 @@ func (m *meshContextBuilder) resolveTLSReadiness(mesh *core_mesh.MeshResource, s
 	}
 
 	for svc, insight := range serviceInsights.Items[0].Spec.GetServices() {
-<<<<<<< HEAD
-		tlsReady[svc] = insight.IssuedBackends[backend.Name] == insight.Dataplanes.Total
-=======
 		if insight.ServiceType == mesh_proto.ServiceInsight_Service_external {
 			tlsReady[svc] = true
 		} else {
-			tlsReady[svc] = insight.IssuedBackends[backend.Name] == (insight.Dataplanes.Offline + insight.Dataplanes.Online)
+			tlsReady[svc] = insight.IssuedBackends[backend.Name] == insight.Dataplanes.Total
 		}
->>>>>>> 6e228b7e5 (fix(kuma-cp): handle external services with permissive mtls (#7179))
 	}
 	return tlsReady
 }
diff --git a/test/e2e_env/kubernetes/externalservices/permissive_mtls.go b/test/e2e_env/kubernetes/externalservices/permissive_mtls.go
@@ -4,11 +4,11 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/kumahq/kuma/test/framework/envs/kubernetes"
+
 	. "github.com/kumahq/kuma/test/framework"
 	"github.com/kumahq/kuma/test/framework/client"
-	"github.com/kumahq/kuma/test/framework/deployments/democlient"
 	"github.com/kumahq/kuma/test/framework/deployments/testserver"
-	"github.com/kumahq/kuma/test/framework/envs/kubernetes"
 )
 
 func PermissiveMTLS() {
@@ -57,7 +57,7 @@ spec:
 			Install(YamlK8s(tlsExternalService)).
 			Install(Namespace(namespace)).
 			Install(NamespaceWithSidecarInjection(clientNamespace)).
-			Install(democlient.Install(democlient.WithNamespace(clientNamespace), democlient.WithMesh(meshName))).
+			Install(DemoClientK8s(meshName, clientNamespace)).
 			Install(testserver.Install(
 				testserver.WithNamespace(namespace),
 				testserver.WithEchoArgs("--tls", "--crt=/kuma/server.crt", "--key=/kuma/server.key"),

diff --git a/test/e2e_env/kubernetes/kubernetes_suite_test.go b/test/e2e_env/kubernetes/kubernetes_suite_test.go
@@ -95,7 +95,6 @@ var _ = SynchronizedBeforeSuite(
 // Otherwise, we would close port-forward to the CP and remaining tests executed in different processes may fail.
 var _ = SynchronizedAfterSuite(func() {}, func() {})
 
-<<<<<<< HEAD
 var _ = Describe("Virtual Probes", healthcheck.VirtualProbes, Ordered)
 var _ = Describe("Gateway", gateway.Gateway, Ordered)
 var _ = Describe("Gateway - Cross-mesh", gateway.CrossMeshGatewayOnKubernetes, Ordered)
@@ -116,46 +115,7 @@ var _ = Describe("K8S API Bypass", k8s_api_bypass.K8sApiBypass, Ordered)
 var _ = Describe("Reachable Services", reachableservices.ReachableServices, Ordered)
 var _ = Describe("Defaults", defaults.Defaults, Ordered)
 var _ = Describe("External Services", externalservices.ExternalServices, Ordered)
+var _ = Describe("External Services Permissive MTLS", externalservices.PermissiveMTLS, Ordered)
 var _ = Describe("Virtual Outbound", virtualoutbound.VirtualOutbound, Ordered)
 var _ = Describe("Kong Ingress Controller", Label("arm-not-supported"), kic.KICKubernetes, Ordered)
 var _ = Describe("MeshTrafficPermission API", meshtrafficpermission.API, Ordered)
-=======
-var (
-	_ = Describe("Virtual Probes", healthcheck.VirtualProbes, Ordered)
-	_ = Describe("Gateway", gateway.Gateway, Ordered)
-	_ = Describe("Gateway - Cross-mesh", gateway.CrossMeshGatewayOnKubernetes, Ordered)
-	_ = Describe("Gateway - Gateway API", gateway.GatewayAPI, Ordered)
-	_ = Describe("Gateway - mTLS", gateway.Mtls, Ordered)
-	_ = Describe("Gateway - Resources", gateway.Resources, Ordered)
-	_ = Describe("Graceful", graceful.Graceful, Ordered)
-	_ = Describe("Eviction", graceful.Eviction, Ordered)
-	_ = Describe("Jobs", jobs.Jobs)
-	_ = Describe("Membership", membership.Membership, Ordered)
-	_ = Describe("Container Patch", container_patch.ContainerPatch, Ordered)
-	_ = Describe("Metrics", observability.ApplicationsMetrics, Ordered)
-	_ = Describe("Tracing", observability.Tracing, Ordered)
-	_ = Describe("MeshTrace", observability.PluginTest, Ordered)
-	_ = Describe("Traffic Log", trafficlog.TCPLogging, Ordered)
-	_ = Describe("Inspect", inspect.Inspect, Ordered)
-	_ = Describe("K8S API Bypass", k8s_api_bypass.K8sApiBypass, Ordered)
-	_ = Describe("Reachable Services", reachableservices.ReachableServices, Ordered)
-	_ = Describe("Defaults", defaults.Defaults, Ordered)
-	_ = Describe("External Services", externalservices.ExternalServices, Ordered)
-	_ = Describe("External Services Permissive MTLS", externalservices.PermissiveMTLS, Ordered)
-	_ = Describe("Virtual Outbound", virtualoutbound.VirtualOutbound, Ordered)
-	_ = Describe("Kong Ingress Controller", Label("arm-not-supported"), kic.KICKubernetes, Ordered)
-	_ = Describe("MeshTrafficPermission API", meshtrafficpermission.API, Ordered)
-	_ = Describe("MeshRateLimit API", meshratelimit.API, Ordered)
-	_ = Describe("MeshTimeout API", meshtimeout.MeshTimeout, Ordered)
-	_ = Describe("MeshHealthCheck API", meshhealthcheck.API, Ordered)
-	_ = Describe("MeshCircuitBreaker API", meshcircuitbreaker.API, Ordered)
-	_ = Describe("MeshCircuitBreaker", meshcircuitbreaker.MeshCircuitBreaker, Ordered)
-	_ = Describe("MeshRetry", meshretry.API, Ordered)
-	_ = Describe("MeshProxyPatch", meshproxypatch.MeshProxyPatch, Ordered)
-	_ = Describe("MeshFaultInjection", meshfaultinjection.API, Ordered)
-	_ = Describe("MeshHTTPRoute", meshhttproute.Test, Ordered)
-	_ = Describe("MeshTCPRoute", meshtcproute.Test, Ordered)
-	_ = Describe("Apis", api.Api, Ordered)
-	_ = Describe("Connectivity - Headless Services", connectivity.HeadlessServices, Ordered)
-)
->>>>>>> 6e228b7e5 (fix(kuma-cp): handle external services with permissive mtls (#7179))