From a497618e4d3f2f033f0c010d7f1506dba628713c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Sat, 16 Mar 2019 14:57:05 +0100 Subject: [PATCH 1/2] feature(resource): Remove runtimeMode from fabric8:resource Also bumped up snapshot version to 4.1-SNAPSHOT --- core/pom.xml | 4 ++-- .../core/handler/DeploymentConfigHandler.java | 14 ++++++++++---- doc/pom.xml | 4 ++-- enricher/api/pom.xml | 4 ++-- .../fabric8/maven/enricher/api/BaseEnricher.java | 11 ----------- enricher/deprecated/pom.xml | 4 ++-- enricher/fabric8/pom.xml | 4 ++-- enricher/osio/pom.xml | 4 ++-- enricher/standard/pom.xml | 4 ++-- .../standard/DefaultControllerEnricher.java | 7 ++++++- .../standard/RevisionHistoryEnricher.java | 2 +- .../standard/openshift/AutoTLSEnricher.java | 4 ++-- .../openshift/DeploymentConfigEnricher.java | 12 ++++++------ .../standard/openshift/AutoTLSEnricherTest.java | 4 ---- generator/api/pom.xml | 4 ++-- generator/java-exec/pom.xml | 4 ++-- generator/karaf/pom.xml | 4 ++-- generator/spring-boot/pom.xml | 4 ++-- generator/thorntail-v2/pom.xml | 4 ++-- generator/vertx/pom.xml | 4 ++-- generator/webapp/pom.xml | 4 ++-- generator/wildfly-swarm/pom.xml | 4 ++-- it/pom.xml | 4 ++-- parent/pom.xml | 2 +- plugin/pom.xml | 4 ++-- .../maven/plugin/mojo/build/ResourceMojo.java | 16 ---------------- pom.xml | 4 ++-- watcher/api/pom.xml | 4 ++-- watcher/standard/pom.xml | 4 ++-- 29 files changed, 66 insertions(+), 86 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 7e82b0d85c..0a5440860f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../parent/pom.xml fabric8-maven-core - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Core diff --git a/core/src/main/java/io/fabric8/maven/core/handler/DeploymentConfigHandler.java b/core/src/main/java/io/fabric8/maven/core/handler/DeploymentConfigHandler.java index cad25da2d5..a74e737b7f 100644 --- a/core/src/main/java/io/fabric8/maven/core/handler/DeploymentConfigHandler.java +++ b/core/src/main/java/io/fabric8/maven/core/handler/DeploymentConfigHandler.java @@ -42,11 +42,17 @@ public class DeploymentConfigHandler { } public DeploymentConfig getDeploymentConfig(ResourceConfig config, - List images, Long openshiftDeployTimeoutSeconds, Boolean imageChangeTrigger, Boolean enableAutomaticTrigger, Boolean isOpenshiftBuildStrategy) { + List images, Long openshiftDeployTimeoutSeconds, Boolean imageChangeTrigger, Boolean enableAutomaticTrigger) { DeploymentConfig deploymentConfig = new DeploymentConfigBuilder() .withMetadata(createDeploymentConfigMetaData(config)) - .withSpec(createDeploymentConfigSpec(config, images, openshiftDeployTimeoutSeconds, imageChangeTrigger, enableAutomaticTrigger, isOpenshiftBuildStrategy)) + .withSpec( + createDeploymentConfigSpec( + config, + images, + openshiftDeployTimeoutSeconds, + imageChangeTrigger, + enableAutomaticTrigger)) .build(); return deploymentConfig; @@ -60,7 +66,7 @@ private ObjectMeta createDeploymentConfigMetaData(ResourceConfig config) { .build(); } - private DeploymentConfigSpec createDeploymentConfigSpec(ResourceConfig config, List images, Long openshiftDeployTimeoutSeconds, Boolean imageChangeTrigger, Boolean enableAutomaticTrigger, Boolean isOpenshiftBuildStrategy) { + private DeploymentConfigSpec createDeploymentConfigSpec(ResourceConfig config, List images, Long openshiftDeployTimeoutSeconds, Boolean imageChangeTrigger, Boolean enableAutomaticTrigger) { DeploymentConfigSpecBuilder specBuilder = new DeploymentConfigSpecBuilder(); PodTemplateSpec podTemplateSpec = podTemplateHandler.getPodTemplate(config,images); @@ -80,7 +86,7 @@ private DeploymentConfigSpec createDeploymentConfigSpec(ResourceConfig config, L } // add a new image change trigger for the build stream - if (containerToImageMap.size() != 0 && imageChangeTrigger && isOpenshiftBuildStrategy) { + if (containerToImageMap.size() != 0 && imageChangeTrigger) { for (Map.Entry entry : containerToImageMap.entrySet()) { String containerName = entry.getKey(); ImageName image = new ImageName(entry.getValue()); diff --git a/doc/pom.xml b/doc/pom.xml index 70e46c9075..0e148a7141 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../parent/pom.xml fabric8-maven-doc - 4.0-SNAPSHOT + 4.1-SNAPSHOT jar Fabric8 Maven :: Documentation diff --git a/enricher/api/pom.xml b/enricher/api/pom.xml index d81a7b9814..d53fdcd57b 100644 --- a/enricher/api/pom.xml +++ b/enricher/api/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-enricher-api - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Enricher :: API diff --git a/enricher/api/src/main/java/io/fabric8/maven/enricher/api/BaseEnricher.java b/enricher/api/src/main/java/io/fabric8/maven/enricher/api/BaseEnricher.java index 31cd784491..652edb4965 100644 --- a/enricher/api/src/main/java/io/fabric8/maven/enricher/api/BaseEnricher.java +++ b/enricher/api/src/main/java/io/fabric8/maven/enricher/api/BaseEnricher.java @@ -96,15 +96,4 @@ protected Map getRawConfig() { protected EnricherContext getContext() { return enricherContext; } - - /** - * Returns true if we are in OpenShift S2I binary building mode - */ - protected boolean isOpenShiftMode() { - Properties properties = getContext().getConfiguration().getProperties(); - if (properties != null) { - return RuntimeMode.isOpenShiftMode(properties); - } - return false; - } } diff --git a/enricher/deprecated/pom.xml b/enricher/deprecated/pom.xml index b9f841dbdc..b1eba2b9d5 100644 --- a/enricher/deprecated/pom.xml +++ b/enricher/deprecated/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-enricher-deprecated - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Enricher :: Deprecated diff --git a/enricher/fabric8/pom.xml b/enricher/fabric8/pom.xml index 58db137a2c..4c66677d3a 100644 --- a/enricher/fabric8/pom.xml +++ b/enricher/fabric8/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-enricher-fabric8 - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Enricher :: Fabric8 diff --git a/enricher/osio/pom.xml b/enricher/osio/pom.xml index be232c6568..9ed7e69e34 100644 --- a/enricher/osio/pom.xml +++ b/enricher/osio/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-enricher-osio - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Enricher :: OpenShift.io diff --git a/enricher/standard/pom.xml b/enricher/standard/pom.xml index 1e1d8587aa..380f02535f 100644 --- a/enricher/standard/pom.xml +++ b/enricher/standard/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-enricher-standard - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Enricher :: Standard diff --git a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java index 571a413f5f..83d545a81b 100644 --- a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java +++ b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/DefaultControllerEnricher.java @@ -128,7 +128,12 @@ public void create(PlatformMode platformMode, KubernetesListBuilder builder) { setProcessingInstruction(getContainersFromPodSpec(deployment.getSpec().getTemplate())); } else { log.info("Adding a default DeploymentConfig"); - DeploymentConfig deploymentConfig = deployConfigHandler.getDeploymentConfig(config, images, getOpenshiftDeployTimeoutInSeconds(3600L), getImageChangeTriggerFlag(true), isAutomaticTriggerEnabled(true), isOpenShiftMode()); + DeploymentConfig deploymentConfig = + deployConfigHandler.getDeploymentConfig( + config, images, + getOpenshiftDeployTimeoutInSeconds(3600L), + getImageChangeTriggerFlag(true), + isAutomaticTriggerEnabled(true)); builder.addToDeploymentConfigItems(deploymentConfig); setProcessingInstruction(getContainersFromPodSpec(deploymentConfig.getSpec().getTemplate())); } diff --git a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/RevisionHistoryEnricher.java b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/RevisionHistoryEnricher.java index e9eb7b93ab..c6b10f95cf 100644 --- a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/RevisionHistoryEnricher.java +++ b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/RevisionHistoryEnricher.java @@ -50,7 +50,7 @@ public RevisionHistoryEnricher(MavenEnricherContext buildContext) { public void create(PlatformMode platformMode, KubernetesListBuilder builder) { final Integer maxRevisionHistories = Configs.asInt(getConfig(Config.limit)); - log.info("Adding revision history limit to %s", maxRevisionHistories); + log.verbose("Adding revision history limit to %s", maxRevisionHistories); if(platformMode == PlatformMode.kubernetes) { builder.accept(new TypedVisitor() { diff --git a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricher.java b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricher.java index 93cf70e340..64f44f7f0b 100644 --- a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricher.java +++ b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricher.java @@ -78,7 +78,7 @@ public AutoTLSEnricher(MavenEnricherContext buildContext) { @Override public void create(PlatformMode platformMode, KubernetesListBuilder builder) { - if (!isOpenShiftMode()) { + if (platformMode != PlatformMode.openshift) { return; } @@ -136,7 +136,7 @@ private boolean isVolumeMountAlreadyExists(List volumes, String vol @Override public void enrich(PlatformMode platformMode, KubernetesListBuilder builder) { - if (!isOpenShiftMode()) { + if (platformMode != PlatformMode.openshift) { return; } diff --git a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/DeploymentConfigEnricher.java b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/DeploymentConfigEnricher.java index 2b917c8c96..933d2a06d0 100644 --- a/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/DeploymentConfigEnricher.java +++ b/enricher/standard/src/main/java/io/fabric8/maven/enricher/standard/openshift/DeploymentConfigEnricher.java @@ -54,10 +54,10 @@ public DeploymentConfigEnricher(MavenEnricherContext context) { @Override public void create(PlatformMode platformMode, KubernetesListBuilder builder) { - if(platformMode == PlatformMode.openshift) { - for(HasMetadata item : builder.buildItems()) { - if(item instanceof Deployment) { - DeploymentConfig deploymentConfig = convert(item, isOpenShiftMode()); + if (platformMode == PlatformMode.openshift) { + for (HasMetadata item : builder.buildItems()) { + if (item instanceof Deployment) { + DeploymentConfig deploymentConfig = convert(item); removeItemFromBuilder(builder, item); builder.addToDeploymentConfigItems(deploymentConfig); } @@ -76,7 +76,7 @@ private void removeItemFromBuilder(KubernetesListBuilder builder, HasMetadata it builder.withItems(newListItems); } - private DeploymentConfig convert(HasMetadata item, Boolean isOpenshiftBuildStrategy) { + private DeploymentConfig convert(HasMetadata item) { Deployment resource = (Deployment) item; DeploymentConfigBuilder builder = new DeploymentConfigBuilder(); builder.withMetadata(resource.getMetadata()); @@ -138,7 +138,7 @@ private DeploymentConfig convert(HasMetadata item, Boolean isOpenshiftBuildStrat // add a new image change trigger for the build stream if (containerToImageMap.size() != 0) { - if(enableImageChangeTrigger && isOpenshiftBuildStrategy) { + if (enableImageChangeTrigger) { for (Map.Entry entry : containerToImageMap.entrySet()) { String containerName = entry.getKey(); ImageName image = new ImageName(entry.getValue()); diff --git a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java index 7007da14ff..c0a6931161 100644 --- a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java +++ b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java @@ -116,15 +116,11 @@ public void testAdapt() throws Exception { final ProcessorConfig config = new ProcessorConfig(null, null, Collections.singletonMap(AutoTLSEnricher.ENRICHER_NAME, configMap)); - final Properties projectProps = new Properties(); - projectProps.put(RuntimeMode.FABRIC8_EFFECTIVE_PLATFORM_MODE, tc.mode.name()); - // Setup mock behaviour new Expectations() { { Configuration configuration = new Configuration.Builder() - .properties(projectProps) .processorConfig(config) .build(); context.getConfiguration(); diff --git a/generator/api/pom.xml b/generator/api/pom.xml index 5adf0c730c..f45e52dadc 100644 --- a/generator/api/pom.xml +++ b/generator/api/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-api - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: API diff --git a/generator/java-exec/pom.xml b/generator/java-exec/pom.xml index a486627d50..ff6b7555d2 100644 --- a/generator/java-exec/pom.xml +++ b/generator/java-exec/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-java-exec - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: Java Exec diff --git a/generator/karaf/pom.xml b/generator/karaf/pom.xml index 7e8876f8a3..f857572dd8 100644 --- a/generator/karaf/pom.xml +++ b/generator/karaf/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-karaf - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: Karaf diff --git a/generator/spring-boot/pom.xml b/generator/spring-boot/pom.xml index 879b875e05..3219533729 100644 --- a/generator/spring-boot/pom.xml +++ b/generator/spring-boot/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-spring-boot - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: Spring Boot diff --git a/generator/thorntail-v2/pom.xml b/generator/thorntail-v2/pom.xml index 61b232e983..977c47a0f0 100644 --- a/generator/thorntail-v2/pom.xml +++ b/generator/thorntail-v2/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-thorntail-v2 - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: Thorntail v2 diff --git a/generator/vertx/pom.xml b/generator/vertx/pom.xml index 3524085557..947c641b2d 100644 --- a/generator/vertx/pom.xml +++ b/generator/vertx/pom.xml @@ -34,12 +34,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-vertx - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: Vert.x diff --git a/generator/webapp/pom.xml b/generator/webapp/pom.xml index 6912b379da..790bb34262 100644 --- a/generator/webapp/pom.xml +++ b/generator/webapp/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-webapp - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: WebApp diff --git a/generator/wildfly-swarm/pom.xml b/generator/wildfly-swarm/pom.xml index 78cade3ff4..1be15d00f4 100644 --- a/generator/wildfly-swarm/pom.xml +++ b/generator/wildfly-swarm/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-generator-wildfly-swarm - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Generator :: WildFly Swarm diff --git a/it/pom.xml b/it/pom.xml index 09edb45c40..9179b1291b 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -46,12 +46,12 @@ for running a single test. io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../parent/pom.xml fabric8-maven-it - 4.0-SNAPSHOT + 4.1-SNAPSHOT jar Fabric8 Maven :: Integration Tests diff --git a/parent/pom.xml b/parent/pom.xml index e1ecf22809..3aa4d64047 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT pom Fabric8 Maven :: Parent diff --git a/plugin/pom.xml b/plugin/pom.xml index ca5bb78742..28e77d8e2e 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -21,12 +21,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../parent/pom.xml fabric8-maven-plugin - 4.0-SNAPSHOT + 4.1-SNAPSHOT maven-plugin Fabric8 Maven :: Plugin diff --git a/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java b/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java index 05c3f03a9a..7c7dc8617c 100644 --- a/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java +++ b/plugin/src/main/java/io/fabric8/maven/plugin/mojo/build/ResourceMojo.java @@ -89,9 +89,6 @@ public class ResourceMojo extends AbstractFabric8Mojo { * Used to annotate a resource as being for a specific platform only such as "kubernetes" or "openshift" */ - // THe key how we got the the docker maven plugin - private static final String DOCKER_MAVEN_PLUGIN_KEY = "io.fabric8:docker-maven-plugin"; - private static final String DOCKER_IMAGE_USER = "docker.image.user"; /** * The generated kubernetes and openshift manifests */ @@ -454,19 +451,6 @@ private void validateIfRequired(File resourceDir, ResourceClassifier classifier) } private void lateInit() { - ClusterAccess clusterAccess = new ClusterAccess(getClusterConfiguration()); - runtimeMode = new ClusterAccess(getClusterConfiguration()).resolveRuntimeMode(runtimeMode, log); - if (runtimeMode.equals(RuntimeMode.openshift)) { - Properties properties = project.getProperties(); - if (!properties.contains(DOCKER_IMAGE_USER)) { - String namespace = clusterAccess.getNamespace(); - log.info("Using docker image name of namespace: " + namespace); - properties.setProperty(DOCKER_IMAGE_USER, namespace); - } - if (!properties.contains(RuntimeMode.FABRIC8_EFFECTIVE_PLATFORM_MODE)) { - properties.setProperty(RuntimeMode.FABRIC8_EFFECTIVE_PLATFORM_MODE, runtimeMode.toString()); - } - } handlerHub = new HandlerHub( new GroupArtifactVersion(project.getGroupId(), project.getArtifactId(), project.getVersion()), project.getProperties()); diff --git a/pom.xml b/pom.xml index 70dcfac986..56412d9f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,13 @@ io.fabric8 fabric8-maven-plugin-build - 4.0-SNAPSHOT + 4.1-SNAPSHOT pom io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT parent/pom.xml diff --git a/watcher/api/pom.xml b/watcher/api/pom.xml index 9aa2d76316..e0624339db 100644 --- a/watcher/api/pom.xml +++ b/watcher/api/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-watcher-api - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Watcher :: API diff --git a/watcher/standard/pom.xml b/watcher/standard/pom.xml index aee2357444..6609bb6a38 100644 --- a/watcher/standard/pom.xml +++ b/watcher/standard/pom.xml @@ -22,12 +22,12 @@ io.fabric8 fabric8-maven-parent - 4.0-SNAPSHOT + 4.1-SNAPSHOT ../../parent/pom.xml fabric8-maven-watcher-standard - 4.0-SNAPSHOT + 4.1-SNAPSHOT Fabric8 Maven :: Watcher :: Standard From bf7cbebf919786e67612e699b0652776f9504a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Sat, 16 Mar 2019 15:22:43 +0100 Subject: [PATCH 2/2] chore(resource): Test fixes --- .../maven/enricher/standard/openshift/AutoTLSEnricherTest.java | 2 +- it/src/it/simple-with-route-flag-false/expected/kubernetes.yml | 2 +- it/src/it/simple-with-route-flag-false/expected/openshift.yml | 2 +- it/src/it/simple-with-route-flag-true/expected/kubernetes.yml | 2 +- it/src/it/simple-with-route-flag-true/expected/openshift.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java index c0a6931161..e4749bc9b2 100644 --- a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java +++ b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/openshift/AutoTLSEnricherTest.java @@ -134,7 +134,7 @@ public void testAdapt() throws Exception { AutoTLSEnricher enricher = new AutoTLSEnricher(context); KubernetesListBuilder klb = new KubernetesListBuilder().addNewPodTemplateItem().withNewMetadata().and() .withNewTemplate().withNewMetadata().and().withNewSpec().and().and().and(); - enricher.enrich(PlatformMode.kubernetes, klb); + enricher.enrich(tc.mode, klb); PodTemplate pt = (PodTemplate) klb.getItems().get(0); List initContainers = pt.getTemplate().getSpec().getInitContainers(); diff --git a/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml b/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml index 1dac7dea55..9953e09296 100644 --- a/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml +++ b/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml @@ -86,7 +86,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: fabric8-maven-sample-zero-config:latest + image: fabric8/fabric8-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/it/src/it/simple-with-route-flag-false/expected/openshift.yml b/it/src/it/simple-with-route-flag-false/expected/openshift.yml index 9e43c7cf84..4d19299f9e 100644 --- a/it/src/it/simple-with-route-flag-false/expected/openshift.yml +++ b/it/src/it/simple-with-route-flag-false/expected/openshift.yml @@ -89,7 +89,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: fabric8-maven-sample-zero-config:latest + image: fabric8/fabric8-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml b/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml index 1dac7dea55..9953e09296 100644 --- a/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml +++ b/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml @@ -86,7 +86,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: fabric8-maven-sample-zero-config:latest + image: fabric8/fabric8-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/it/src/it/simple-with-route-flag-true/expected/openshift.yml b/it/src/it/simple-with-route-flag-true/expected/openshift.yml index a6416e5a61..248e1006ab 100644 --- a/it/src/it/simple-with-route-flag-true/expected/openshift.yml +++ b/it/src/it/simple-with-route-flag-true/expected/openshift.yml @@ -89,7 +89,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: fabric8-maven-sample-zero-config:latest + image: fabric8/fabric8-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: