diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index 2750868fa5..ace5b3595c 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -489,6 +489,9 @@ che.infra.kubernetes.trusted_ca.src_configmap=NULL # Holds the copy of che.infra.kubernetes.trusted_ca.src_configmap but in a workspace namespace. # Content of this config map is mounted into all workspace containers including plugin brokers. # Do not change the config map name unless it conflicts with the already existing config map. +# Note that the resulting config map name can be adjusted eventually to make it unique in k8s namespace. +# The original name would be stored in `che.original_name` label. + che.infra.kubernetes.trusted_ca.dest_configmap=ca-certs # Configures path on workspace containers where the CA bundle should be mount. diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml index d12a2c109d..019dadb5a9 100644 --- a/infrastructures/kubernetes/pom.xml +++ b/infrastructures/kubernetes/pom.xml @@ -255,11 +255,6 @@ mockito-core test - - org.mockito - mockito-core - test - org.mockito mockito-testng diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisioner.java index 877355883c..2cb16c1b19 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisioner.java @@ -167,7 +167,6 @@ public interface KubernetesEnvironmentProvisioner { - public static final String GIT_CONFIG_MAP_NAME_SUFFIX = "-gitconfig"; + public static final String GIT_CONFIG_MAP_NAME = "gitconfig"; private static final String GIT_BASE_CONFIG_PATH = "/etc/"; public static final String GIT_CONFIG = "gitconfig"; @@ -132,12 +132,7 @@ public class GitConfigProvisioner implements ConfigurationProvisioner { - String configMapName = identity.getWorkspaceId() + GIT_CONFIG_MAP_NAME_SUFFIX; - - doProvisionGitConfiguration(configMapName, content, k8sEnv); - }); + .ifPresent(content -> doProvisionGitConfiguration(GIT_CONFIG_MAP_NAME, content, k8sEnv)); } private String getStringValueOrNull(Map map, String key) { diff --git 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 index 64c56f4f80..d9a69d7557 100644 --- 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 @@ -23,7 +23,6 @@ import io.fabric8.kubernetes.api.model.VolumeBuilder; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -35,7 +34,6 @@ import org.eclipse.che.workspace.infrastructure.kubernetes.environment.CheInstal import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment; import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment.PodData; import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment.PodRole; -import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesNamespace; import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.KubernetesNamespaceFactory; /** @@ -112,27 +110,20 @@ public class KubernetesTrustedCAProvisioner implements TrustedCAProvisioner { return; } - KubernetesNamespace namespace = namespaceFactory.getOrCreate(runtimeID); - Optional existing = namespace.configMaps().get(configMapName); - if (existing.isEmpty() - || !(existing.get().getData() == allCaCertsConfigMap.getData() - || existing.get().getData().equals(allCaCertsConfigMap.getData()))) { - // create or renew map - k8sEnv - .getConfigMaps() - .put( - configMapName, - new ConfigMapBuilder() - .withMetadata( - new ObjectMetaBuilder() - .withName(configMapName) - .withAnnotations(allCaCertsConfigMap.getMetadata().getAnnotations()) - .withLabels(configMapLabelKeyValue) - .build()) - .withApiVersion(allCaCertsConfigMap.getApiVersion()) - .withData(allCaCertsConfigMap.getData()) - .build()); - } + k8sEnv + .getConfigMaps() + .put( + configMapName, + new ConfigMapBuilder() + .withMetadata( + new ObjectMetaBuilder() + .withName(configMapName) + .withAnnotations(allCaCertsConfigMap.getMetadata().getAnnotations()) + .withLabels(configMapLabelKeyValue) + .build()) + .withApiVersion(allCaCertsConfigMap.getApiVersion()) + .withData(allCaCertsConfigMap.getData()) + .build()); for (PodData pod : k8sEnv.getPodsData().values()) { if (pod.getRole() == PodRole.DEPLOYMENT) { diff --git 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 index 0b7a33bfd5..452ba62c45 100644 --- 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 @@ -84,7 +84,7 @@ public class SshKeysProvisioner implements ConfigurationProvisioner sshConfig = new HashMap<>(); sshConfig.put(SSH_CONFIG, sshConfigData.toString()); ConfigMap configMap = new ConfigMapBuilder() .withNewMetadata() - .withName(sshConfigMapName) + .withName(SSH_CONFIG_MAP_NAME) .endMetadata() .withData(sshConfig) .build(); @@ -267,7 +265,9 @@ public class SshKeysProvisioner implements ConfigurationProvisioner mountConfigFile(p.getSpec(), sshConfigMapName, p.getRole() != PodRole.INJECTABLE)); + p -> + mountConfigFile( + p.getSpec(), SSH_CONFIG_MAP_NAME, p.getRole() != PodRole.INJECTABLE)); } private void mountConfigFile(PodSpec podSpec, String sshConfigMapName, boolean addVolume) { diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java index 64945d105d..fc9e552ff7 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java @@ -39,7 +39,8 @@ import org.eclipse.che.workspace.infrastructure.kubernetes.environment.Kubernete import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment.PodData; /** - * Makes names of Kubernetes pods and ingresses unique whole namespace by {@link Names}. + * Makes names of Kubernetes pods, ingresses and config maps unique whole namespace by {@link + * Names}. * *

Original names will be stored in {@link Constants#CHE_ORIGINAL_NAME_LABEL} label of renamed * object. diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplier.java index 5c1a22af37..127419d92e 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplier.java @@ -64,10 +64,7 @@ public class GitCredentialStorageFileSecretApplier extends FileSecretApplier { keys.size())); } Path gitSecretFilePath = Paths.get(secretMountPath, keys.iterator().next()); - ConfigMap gitConfigMap = - env.getConfigMaps() - .get( - runtimeIdentity.getWorkspaceId() + GitConfigProvisioner.GIT_CONFIG_MAP_NAME_SUFFIX); + ConfigMap gitConfigMap = env.getConfigMaps().get(GitConfigProvisioner.GIT_CONFIG_MAP_NAME); if (gitConfigMap != null) { Map gitConfigMapData = gitConfigMap.getData(); String gitConfig = gitConfigMapData.get(GitConfigProvisioner.GIT_CONFIG); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisionerTest.java index 50405ee6e1..dbb69619cf 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesEnvironmentProvisionerTest.java @@ -153,7 +153,7 @@ public class KubernetesEnvironmentProvisionerTest { provisionOrder.verify(envVarsProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verify(volumesStrategy).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verify(restartPolicyRewriter).provision(eq(k8sEnv), eq(runtimeIdentity)); - provisionOrder.verify(uniqueNamesProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); + provisionOrder.verify(ramLimitProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verify(nodeSelectorProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder @@ -170,6 +170,7 @@ public class KubernetesEnvironmentProvisionerTest { provisionOrder.verify(gitConfigProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verify(gatewayRouterProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verify(trustedCAProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); + provisionOrder.verify(uniqueNamesProvisioner).provision(eq(k8sEnv), eq(runtimeIdentity)); provisionOrder.verifyNoMoreInteractions(); } } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisionerTest.java index 44c4231b43..8bb1b3c7f7 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/GitConfigProvisionerTest.java @@ -205,9 +205,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -257,9 +257,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -309,9 +309,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -354,9 +354,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -402,9 +402,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -421,8 +421,6 @@ public class GitConfigProvisionerTest { when(vcsSslCertificateProvisioner.getGitServerHost()).thenReturn("https://localhost"); when(vcsSslCertificateProvisioner.getCertPath()).thenReturn("/some/path"); - when(runtimeIdentity.getWorkspaceId()).thenReturn("wksp"); - ObjectMeta podMeta = new ObjectMetaBuilder().withName("wksp").build(); when(pod.getMetadata()).thenReturn(podMeta); when(pod.getSpec()).thenReturn(podSpec); @@ -450,9 +448,9 @@ public class GitConfigProvisionerTest { assertEquals(mount.getSubPath(), "gitconfig"); assertEquals(k8sEnv.getConfigMaps().size(), 1); - assertTrue(k8sEnv.getConfigMaps().containsKey("wksp-gitconfig")); + assertTrue(k8sEnv.getConfigMaps().containsKey("gitconfig")); - ConfigMap configMap = k8sEnv.getConfigMaps().get("wksp-gitconfig"); + ConfigMap configMap = k8sEnv.getConfigMaps().get("gitconfig"); assertEquals(configMap.getData().size(), 1); assertTrue(configMap.getData().containsKey("gitconfig")); @@ -471,7 +469,6 @@ public class GitConfigProvisionerTest { singletonMap( "theia-user-preferences", "{\"git.user.name\":\"user\",\"git.user.email\":\"email\"}"); when(preferenceManager.find(eq("id"), eq("theia-user-preferences"))).thenReturn(preferences); - when(runtimeIdentity.getWorkspaceId()).thenReturn("wksp"); Pod pod = new PodBuilder() diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeySecretProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeySecretProvisionerTest.java index cddf873db5..0e1c99885f 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeySecretProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeySecretProvisionerTest.java @@ -144,9 +144,9 @@ public class SshKeySecretProvisionerTest { Map configMaps = k8sEnv.getConfigMaps(); assertNotNull(configMaps); - assertTrue(configMaps.containsKey("wksp-sshconfigmap")); + assertTrue(configMaps.containsKey("sshconfigmap")); - ConfigMap sshConfigMap = configMaps.get("wksp-sshconfigmap"); + ConfigMap sshConfigMap = configMaps.get("sshconfigmap"); assertNotNull(sshConfigMap); Map mapData = sshConfigMap.getData(); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplierTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplierTest.java index 9a3a8ad40e..49c88f805a 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplierTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/GitCredentialStorageFileSecretApplierTest.java @@ -13,6 +13,7 @@ package org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.GitConfigProvisioner.GIT_CONFIG_MAP_NAME; import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.FileSecretApplier.ANNOTATION_MOUNT_PATH; import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.KubernetesSecretApplier.ANNOTATION_AUTOMOUNT; import static org.eclipse.che.workspace.infrastructure.kubernetes.provision.secret.SecretAsContainerResourceProvisioner.ANNOTATION_MOUNT_AS; @@ -64,7 +65,7 @@ public class GitCredentialStorageFileSecretApplierTest { when(environment.getPodsData()).thenReturn(singletonMap("pod1", podData)); when(podData.getRole()).thenReturn(KubernetesEnvironment.PodRole.DEPLOYMENT); when(podData.getSpec()).thenReturn(podSpec); - when(runtimeIdentity.getWorkspaceId()).thenReturn("ws-1234598"); + lenient().when(runtimeIdentity.getWorkspaceId()).thenReturn("ws-1234598"); } @Test( @@ -124,10 +125,7 @@ public class GitCredentialStorageFileSecretApplierTest { new ConfigMapBuilder() .withData(ImmutableMap.of(GitConfigProvisioner.GIT_CONFIG, GIT_CONFIG_CONTENT)) .build(); - when(environment.getConfigMaps()) - .thenReturn( - ImmutableMap.of( - "ws-1234598" + GitConfigProvisioner.GIT_CONFIG_MAP_NAME_SUFFIX, configMap)); + when(environment.getConfigMaps()).thenReturn(ImmutableMap.of(GIT_CONFIG_MAP_NAME, configMap)); // when secretApplier.applySecret(environment, runtimeIdentity, secret); // then @@ -172,10 +170,7 @@ public class GitCredentialStorageFileSecretApplierTest { GIT_CONFIG_CONTENT + "[credential]\n\thelper = store --file /home/user/.git/credentials\n")) .build(); - when(environment.getConfigMaps()) - .thenReturn( - ImmutableMap.of( - "ws-1234598" + GitConfigProvisioner.GIT_CONFIG_MAP_NAME_SUFFIX, configMap)); + when(environment.getConfigMaps()).thenReturn(ImmutableMap.of(GIT_CONFIG_MAP_NAME, configMap)); // when secretApplier.applySecret(environment, runtimeIdentity, secret); } diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisioner.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisioner.java index dfd953a1c3..2258d4ad2e 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisioner.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisioner.java @@ -163,7 +163,6 @@ public class OpenShiftEnvironmentProvisioner // 3 stage - add OpenShift env items restartPolicyRewriter.provision(osEnv, identity); - uniqueNamesProvisioner.provision(osEnv, identity); routeTlsProvisioner.provision(osEnv, identity); resourceLimitRequestProvisioner.provision(osEnv, identity); nodeSelectorProvisioner.provision(osEnv, identity); @@ -179,6 +178,7 @@ public class OpenShiftEnvironmentProvisioner gatewayRouterProvisioner.provision(osEnv, identity); deploymentMetadataProvisioner.provision(osEnv, identity); trustedCAProvisioner.provision(osEnv, identity); + uniqueNamesProvisioner.provision(osEnv, identity); LOG.debug( "Provisioning OpenShift environment done for workspace '{}'", identity.getWorkspaceId()); } diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisionerTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisionerTest.java index 6566de39f4..2d5245b4ad 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisionerTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftEnvironmentProvisionerTest.java @@ -150,7 +150,6 @@ public class OpenShiftEnvironmentProvisionerTest { provisionOrder.verify(envVarsProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(volumesStrategy).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(restartPolicyRewriter).provision(eq(osEnv), eq(runtimeIdentity)); - provisionOrder.verify(uniqueNamesProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(tlsRouteProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(ramLimitProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(nodeSelectorProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); @@ -167,6 +166,7 @@ public class OpenShiftEnvironmentProvisionerTest { provisionOrder.verify(gatewayRouterProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(deploymentMetadataProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verify(trustedCAProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); + provisionOrder.verify(uniqueNamesProvisioner).provision(eq(osEnv), eq(runtimeIdentity)); provisionOrder.verifyNoMoreInteractions(); } }