diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java index 7da77c1174..535caa5e9d 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java @@ -23,8 +23,8 @@ import io.fabric8.kubernetes.api.model.apps.DaemonSet; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.ReplicaSet; import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.Job; +import io.fabric8.kubernetes.api.model.batch.v1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.Template; import java.util.Collection; diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java index 1ac8578e4a..7d63d4fda0 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java @@ -113,7 +113,7 @@ public class CertificateProvisioner implements ConfigurationProvisioner prefs = new HashMap<>(); @@ -205,7 +205,6 @@ public class KubernetesNamespaceFactoryTest { } @Test( - enabled = false, expectedExceptions = ValidationException.class, expectedExceptionsMessageRegExp = "User defined namespaces are not allowed. Only the default namespace 'jondoe-che' is available.") @@ -231,7 +230,6 @@ public class KubernetesNamespaceFactoryTest { } @Test( - enabled = false, expectedExceptions = ConfigurationException.class, expectedExceptionsMessageRegExp = "che.infra.kubernetes.namespace.default must be configured") public void shouldThrowExceptionIfNoDefaultNamespaceIsConfigured() { @@ -251,7 +249,7 @@ public class KubernetesNamespaceFactoryTest { pool); } - @Test(enabled = false) + @Test public void shouldReturnPreparedNamespacesWhenFound() throws InfrastructureException { // given List namespaces = @@ -311,7 +309,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(availableNamespaces.get(1).getName(), "ns2"); } - @Test(enabled = false) + @Test public void shouldNotThrowAnExceptionWhenNotAllowedToListNamespaces() throws Exception { // given Namespace ns = @@ -351,7 +349,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(availableNamespaces.get(0).getName(), "ns1"); } - @Test(enabled = false, expectedExceptions = InfrastructureException.class) + @Test(expectedExceptions = InfrastructureException.class) public void throwAnExceptionWhenErrorListingNamespaces() throws Exception { // given doThrow(new KubernetesClientException("Not allowed.", 500, new Status())) @@ -379,7 +377,7 @@ public class KubernetesNamespaceFactoryTest { // then throw } - @Test(enabled = false) + @Test public void shouldReturnDefaultNamespaceWhenItExists() throws Exception { prepareNamespaceToBeFoundByName( "jondoe-che", @@ -414,7 +412,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(defaultNamespace.getAttributes().get(PHASE_ATTRIBUTE), "Active"); } - @Test(enabled = false) + @Test public void shouldReturnDefaultNamespaceWhenItDoesNotExistAndUserDefinedIsNotAllowed() throws Exception { prepareNamespaceToBeFoundByName("jondoe-che", null); @@ -446,7 +444,6 @@ public class KubernetesNamespaceFactoryTest { } @Test( - enabled = false, expectedExceptions = InfrastructureException.class, expectedExceptionsMessageRegExp = "Error occurred when tried to fetch default namespace. Cause: connection refused") @@ -472,7 +469,6 @@ public class KubernetesNamespaceFactoryTest { } @Test( - enabled = false, expectedExceptions = InfrastructureException.class, expectedExceptionsMessageRegExp = "Error occurred when tried to list all available namespaces. Cause: connection refused") @@ -496,7 +492,7 @@ public class KubernetesNamespaceFactoryTest { namespaceFactory.list(); } - @Test(enabled = false) + @Test public void shouldRequireNamespacePriorExistenceIfDifferentFromDefaultAndUserDefinedIsNotAllowed() throws Exception { // There is only one scenario where this can happen. The workspace was created and started in @@ -534,7 +530,7 @@ public class KubernetesNamespaceFactoryTest { verify(toReturnNamespace).prepare(eq(false), any()); } - @Test(enabled = false) + @Test public void shouldReturnDefaultNamespaceWhenCreatingIsNotIsNotAllowed() throws Exception { // given namespaceFactory = @@ -566,7 +562,7 @@ public class KubernetesNamespaceFactoryTest { verify(toReturnNamespace).prepare(eq(false), any()); } - @Test(enabled = false) + @Test public void shouldPrepareWorkspaceServiceAccountIfItIsConfiguredAndNamespaceIsNotPredefined() throws Exception { // given @@ -604,7 +600,7 @@ public class KubernetesNamespaceFactoryTest { verify(serviceAccount).prepare(); } - @Test(enabled = false) + @Test public void shouldBindToAllConfiguredClusterRoles() throws Exception { // given namespaceFactory = @@ -674,7 +670,7 @@ public class KubernetesNamespaceFactoryTest { "serviceAccount-exec")); } - @Test(enabled = false) + @Test public void shouldCreateExecAndViewRolesAndBindings() throws Exception { // given namespaceFactory = @@ -732,7 +728,7 @@ public class KubernetesNamespaceFactoryTest { .collect(Collectors.toSet())); } - @Test(enabled = false) + @Test public void testNullClusterRolesResultsInEmptySet() { namespaceFactory = new KubernetesNamespaceFactory( @@ -751,7 +747,7 @@ public class KubernetesNamespaceFactoryTest { assertTrue(namespaceFactory.getClusterRoleNames().isEmpty()); } - @Test(enabled = false) + @Test public void testClusterRolesProperlyParsed() { namespaceFactory = new KubernetesNamespaceFactory( @@ -772,7 +768,7 @@ public class KubernetesNamespaceFactoryTest { assertTrue(expected.containsAll(namespaceFactory.getClusterRoleNames())); } - @Test(enabled = false) + @Test public void testEvalNamespaceUsesNamespaceDefaultIfWorkspaceDoesntRecordNamespaceAndLegacyNamespaceDoesntExist() throws Exception { @@ -801,7 +797,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "che-123"); } - @Test(enabled = false) + @Test public void testEvalNamespaceUsesNamespaceFromUserPreferencesIfExist() throws Exception { namespaceFactory = new KubernetesNamespaceFactory( @@ -830,7 +826,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "che-123"); } - @Test(enabled = false) + @Test public void testEvalNamespaceSkipsNamespaceFromUserPreferencesIfTemplateChanged() throws Exception { namespaceFactory = @@ -861,7 +857,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "che-user123-jondoe"); } - @Test(enabled = false) + @Test public void testEvalNamespaceSkipsNamespaceFromUserPreferencesIfUserAllowedPropertySetFalse() throws Exception { namespaceFactory = @@ -892,7 +888,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "che-user123-jondoe"); } - @Test(enabled = false) + @Test public void testEvalNamespaceUsesWorkspaceRecordedNamespaceIfWorkspaceRecordsIt() throws Exception { namespaceFactory = @@ -922,7 +918,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "wkspcnmspc"); } - @Test(enabled = false) + @Test public void testEvalNamespaceTreatsWorkspaceRecordedNamespaceLiterally() throws Exception { namespaceFactory = new KubernetesNamespaceFactory( @@ -950,7 +946,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "ns34345"); } - @Test(enabled = false) + @Test public void testEvalNamespaceNameWhenPreparedNamespacesFound() throws InfrastructureException { List namespaces = Arrays.asList( @@ -996,7 +992,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(namespace, "ns1"); } - @Test(enabled = false) + @Test public void testUsernamePlaceholderInLabelsIsNotEvaluated() throws InfrastructureException { List namespaces = singletonList( @@ -1031,7 +1027,7 @@ public class KubernetesNamespaceFactoryTest { verify(namespaceOperation).withLabels(Map.of("try_placeholder_here", "")); } - @Test(enabled = false, dataProvider = "invalidUsernames") + @Test(dataProvider = "invalidUsernames") public void normalizeTest(String raw, String expected) { namespaceFactory = new KubernetesNamespaceFactory( @@ -1050,7 +1046,7 @@ public class KubernetesNamespaceFactoryTest { assertEquals(expected, namespaceFactory.normalizeNamespaceName(raw)); } - @Test(enabled = false) + @Test public void normalizeLengthTest() { namespaceFactory = new KubernetesNamespaceFactory( diff --git a/pom.xml b/pom.xml index 6092419b59..e6fd419141 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 2.6 quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764 quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392 - 5.3.1 + 5.4.1 0.1.3 1.0.0 1.0.0