Revert "Fix: Re-enable KubernetesNamespaceFactoryTest and upgrade kubernetes client to 5.4" (#21)

This reverts commit 29247d8923.
2021-06-05 07:47:40 +03:00 · 2021-06-05 07:47:40 +03:00 · d65a8c650f
parent de23a6c8b8
commit d65a8c650f
9 changed files with 42 additions and 35 deletions
--- 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.v1.CronJob;
-import io.fabric8.kubernetes.api.model.batch.v1.Job;
+import io.fabric8.kubernetes.api.model.batch.CronJob;
+import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.Template;
 import java.util.Collection;
--- 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<Kubernet
  private VolumeMount buildCertVolumeMount() {
    return new VolumeMountBuilder()
        .withName(CHE_SELF_SIGNED_CERT_VOLUME)
-        .withReadOnly(true)
+        .withNewReadOnly(true)
        .withMountPath(CERT_MOUNT_PATH)
        .build();
  }
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisioner.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisioner.java
@ -250,6 +250,7 @@ public class GitConfigProvisioner implements ConfigurationProvisioner<Kubernetes
                  .withMountPath(GIT_CONFIG_PATH)
                  .withSubPath(GIT_CONFIG)
                  .withReadOnly(false)
+                  .withNewReadOnly(false)
                  .build();
          container.getVolumeMounts().add(volumeMount);
        });
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java
@ -160,7 +160,7 @@ public class KubernetesTrustedCAProvisioner implements TrustedCAProvisioner {
          .add(
              new VolumeMountBuilder()
                  .withName(CHE_TRUST_STORE_VOLUME)
-                  .withReadOnly(true)
+                  .withNewReadOnly(true)
                  .withMountPath(certificateMountPath)
                  .build());
    }
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java
@ -271,6 +271,7 @@ public class SshKeysProvisioner implements ConfigurationProvisioner<KubernetesEn
          VolumeMount volumeMount =
              new VolumeMountBuilder()
                  .withName(secretName)
+                  .withNewReadOnly(true)
                  .withReadOnly(true)
                  .withMountPath(SSH_PRIVATE_KEYS_PATH)
                  .build();
@ -327,6 +328,7 @@ public class SshKeysProvisioner implements ConfigurationProvisioner<KubernetesEn
                  .withMountPath(SSH_CONFIG_PATH)
                  .withSubPath(SSH_CONFIG)
                  .withReadOnly(true)
+                  .withNewReadOnly(true)
                  .build();
          container.getVolumeMounts().add(volumeMount);
        });
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java
@ -133,7 +133,7 @@ public class VcsSslCertificateProvisioner
  private VolumeMount buildCertVolumeMount() {
    return new VolumeMountBuilder()
        .withName(CHE_GIT_SELF_SIGNED_VOLUME)
-        .withReadOnly(true)
+        .withNewReadOnly(true)
        .withMountPath(CERT_MOUNT_PATH)
        .build();
  }
--- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java
+++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java
@ -32,10 +32,10 @@ import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder;
-import io.fabric8.kubernetes.api.model.batch.v1.CronJob;
-import io.fabric8.kubernetes.api.model.batch.v1.CronJobBuilder;
-import io.fabric8.kubernetes.api.model.batch.v1.Job;
-import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder;
+import io.fabric8.kubernetes.api.model.batch.CronJob;
+import io.fabric8.kubernetes.api.model.batch.CronJobBuilder;
+import io.fabric8.kubernetes.api.model.batch.Job;
+import io.fabric8.kubernetes.api.model.batch.JobBuilder;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
 import io.fabric8.openshift.api.model.Template;
--- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java
+++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java
@ -97,7 +97,7 @@ import org.testng.collections.Sets;
 *
 * @author Sergii Leshchenko
 */
-@Test
+@Test(enabled = false)
@Listeners(MockitoTestNGListener.class)
 public class KubernetesNamespaceFactoryTest {

@ -156,7 +156,7 @@ public class KubernetesNamespaceFactoryTest {
    serverMock.after();
  }

-  @Test
+  @Test(enabled = false)
  public void shouldNotThrowExceptionIfDefaultNamespaceIsSpecifiedOnCheckingIfNamespaceIsAllowed()
      throws Exception {
    namespaceFactory =
@ -177,7 +177,7 @@ public class KubernetesNamespaceFactoryTest {
    namespaceFactory.checkIfNamespaceIsAllowed("jondoe-che");
  }

-  @Test
+  @Test(enabled = false)
  public void shouldLookAtStoredNamespacesOnCheckingIfNamespaceIsAllowed() throws Exception {

    Map<String, String> prefs = new HashMap<>();
@ -205,6 +205,7 @@ public class KubernetesNamespaceFactoryTest {
  }

  @Test(
+      enabled = false,
      expectedExceptions = ValidationException.class,
      expectedExceptionsMessageRegExp =
          "User defined namespaces are not allowed. Only the default namespace 'jondoe-che' is available.")
@ -230,6 +231,7 @@ public class KubernetesNamespaceFactoryTest {
  }

  @Test(
+      enabled = false,
      expectedExceptions = ConfigurationException.class,
      expectedExceptionsMessageRegExp = "che.infra.kubernetes.namespace.default must be configured")
  public void shouldThrowExceptionIfNoDefaultNamespaceIsConfigured() {
@ -249,7 +251,7 @@ public class KubernetesNamespaceFactoryTest {
            pool);
  }

-  @Test
+  @Test(enabled = false)
  public void shouldReturnPreparedNamespacesWhenFound() throws InfrastructureException {
    // given
    List<Namespace> namespaces =
@ -309,7 +311,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(availableNamespaces.get(1).getName(), "ns2");
  }

-  @Test
+  @Test(enabled = false)
  public void shouldNotThrowAnExceptionWhenNotAllowedToListNamespaces() throws Exception {
    // given
    Namespace ns =
@ -349,7 +351,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(availableNamespaces.get(0).getName(), "ns1");
  }

-  @Test(expectedExceptions = InfrastructureException.class)
+  @Test(enabled = false, expectedExceptions = InfrastructureException.class)
  public void throwAnExceptionWhenErrorListingNamespaces() throws Exception {
    // given
    doThrow(new KubernetesClientException("Not allowed.", 500, new Status()))
@ -377,7 +379,7 @@ public class KubernetesNamespaceFactoryTest {
    // then throw
  }

-  @Test
+  @Test(enabled = false)
  public void shouldReturnDefaultNamespaceWhenItExists() throws Exception {
    prepareNamespaceToBeFoundByName(
        "jondoe-che",
@ -412,7 +414,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(defaultNamespace.getAttributes().get(PHASE_ATTRIBUTE), "Active");
  }

-  @Test
+  @Test(enabled = false)
  public void shouldReturnDefaultNamespaceWhenItDoesNotExistAndUserDefinedIsNotAllowed()
      throws Exception {
    prepareNamespaceToBeFoundByName("jondoe-che", null);
@ -444,6 +446,7 @@ public class KubernetesNamespaceFactoryTest {
  }

  @Test(
+      enabled = false,
      expectedExceptions = InfrastructureException.class,
      expectedExceptionsMessageRegExp =
          "Error occurred when tried to fetch default namespace. Cause: connection refused")
@ -469,6 +472,7 @@ public class KubernetesNamespaceFactoryTest {
  }

  @Test(
+      enabled = false,
      expectedExceptions = InfrastructureException.class,
      expectedExceptionsMessageRegExp =
          "Error occurred when tried to list all available namespaces. Cause: connection refused")
@ -492,7 +496,7 @@ public class KubernetesNamespaceFactoryTest {
    namespaceFactory.list();
  }

-  @Test
+  @Test(enabled = false)
  public void shouldRequireNamespacePriorExistenceIfDifferentFromDefaultAndUserDefinedIsNotAllowed()
      throws Exception {
    // There is only one scenario where this can happen. The workspace was created and started in
@ -530,7 +534,7 @@ public class KubernetesNamespaceFactoryTest {
    verify(toReturnNamespace).prepare(eq(false), any());
  }

-  @Test
+  @Test(enabled = false)
  public void shouldReturnDefaultNamespaceWhenCreatingIsNotIsNotAllowed() throws Exception {
    // given
    namespaceFactory =
@ -562,7 +566,7 @@ public class KubernetesNamespaceFactoryTest {
    verify(toReturnNamespace).prepare(eq(false), any());
  }

-  @Test
+  @Test(enabled = false)
  public void shouldPrepareWorkspaceServiceAccountIfItIsConfiguredAndNamespaceIsNotPredefined()
      throws Exception {
    // given
@ -600,7 +604,7 @@ public class KubernetesNamespaceFactoryTest {
    verify(serviceAccount).prepare();
  }

-  @Test
+  @Test(enabled = false)
  public void shouldBindToAllConfiguredClusterRoles() throws Exception {
    // given
    namespaceFactory =
@ -670,7 +674,7 @@ public class KubernetesNamespaceFactoryTest {
            "serviceAccount-exec"));
  }

-  @Test
+  @Test(enabled = false)
  public void shouldCreateExecAndViewRolesAndBindings() throws Exception {
    // given
    namespaceFactory =
@ -728,7 +732,7 @@ public class KubernetesNamespaceFactoryTest {
            .collect(Collectors.toSet()));
  }

-  @Test
+  @Test(enabled = false)
  public void testNullClusterRolesResultsInEmptySet() {
    namespaceFactory =
        new KubernetesNamespaceFactory(
@ -747,7 +751,7 @@ public class KubernetesNamespaceFactoryTest {
    assertTrue(namespaceFactory.getClusterRoleNames().isEmpty());
  }

-  @Test
+  @Test(enabled = false)
  public void testClusterRolesProperlyParsed() {
    namespaceFactory =
        new KubernetesNamespaceFactory(
@ -768,7 +772,7 @@ public class KubernetesNamespaceFactoryTest {
    assertTrue(expected.containsAll(namespaceFactory.getClusterRoleNames()));
  }

-  @Test
+  @Test(enabled = false)
  public void
      testEvalNamespaceUsesNamespaceDefaultIfWorkspaceDoesntRecordNamespaceAndLegacyNamespaceDoesntExist()
          throws Exception {
@ -797,7 +801,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "che-123");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceUsesNamespaceFromUserPreferencesIfExist() throws Exception {
    namespaceFactory =
        new KubernetesNamespaceFactory(
@ -826,7 +830,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "che-123");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceSkipsNamespaceFromUserPreferencesIfTemplateChanged()
      throws Exception {
    namespaceFactory =
@ -857,7 +861,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "che-user123-jondoe");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceSkipsNamespaceFromUserPreferencesIfUserAllowedPropertySetFalse()
      throws Exception {
    namespaceFactory =
@ -888,7 +892,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "che-user123-jondoe");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceUsesWorkspaceRecordedNamespaceIfWorkspaceRecordsIt()
      throws Exception {
    namespaceFactory =
@ -918,7 +922,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "wkspcnmspc");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceTreatsWorkspaceRecordedNamespaceLiterally() throws Exception {
    namespaceFactory =
        new KubernetesNamespaceFactory(
@ -946,7 +950,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "ns34345");
  }

-  @Test
+  @Test(enabled = false)
  public void testEvalNamespaceNameWhenPreparedNamespacesFound() throws InfrastructureException {
    List<Namespace> namespaces =
        Arrays.asList(
@ -992,7 +996,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(namespace, "ns1");
  }

-  @Test
+  @Test(enabled = false)
  public void testUsernamePlaceholderInLabelsIsNotEvaluated() throws InfrastructureException {
    List<Namespace> namespaces =
        singletonList(
@ -1027,7 +1031,7 @@ public class KubernetesNamespaceFactoryTest {
    verify(namespaceOperation).withLabels(Map.of("try_placeholder_here", "<username>"));
  }

-  @Test(dataProvider = "invalidUsernames")
+  @Test(enabled = false, dataProvider = "invalidUsernames")
  public void normalizeTest(String raw, String expected) {
    namespaceFactory =
        new KubernetesNamespaceFactory(
@ -1046,7 +1050,7 @@ public class KubernetesNamespaceFactoryTest {
    assertEquals(expected, namespaceFactory.normalizeNamespaceName(raw));
  }

-  @Test
+  @Test(enabled = false)
  public void normalizeLengthTest() {
    namespaceFactory =
        new KubernetesNamespaceFactory(
--- a/pom.xml
+++ b/pom.xml
@ -72,7 +72,7 @@
        <commons-lang.version>2.6</commons-lang.version>
        <integration.mysql.db.image>quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764</integration.mysql.db.image>
        <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392</integration.postgresql.db.image>
-        <io.fabric8.kubernetes-client>5.4.0</io.fabric8.kubernetes-client>
+        <io.fabric8.kubernetes-client>5.3.1</io.fabric8.kubernetes-client>
        <io.github.mweirauch.micrometer-jvm-extras.version>0.1.3</io.github.mweirauch.micrometer-jvm-extras.version>
        <io.jaegertracing.micrometer.version>1.0.0</io.jaegertracing.micrometer.version>
        <io.jaegertracing.version>1.0.0</io.jaegertracing.version>