diff --git a/CHANGELOG.md b/CHANGELOG.md index 447734b7e8..aa2185ae43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Usage: ### 1.0.0-SNAPSHOT * Fix #187: Provided Dockerfile is always skipped in simple Dockerfile mode * Fix #237: Remove deprecated fields and method calls +* Fix #218: Remove build mode from mojos * Fix #192: Removed `@Deprecated` fields from ClusterAccess ### 1.0.0-alpha-4 (2020-06-08) diff --git a/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/access/ClusterAccess.java b/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/access/ClusterAccess.java index 01993bc671..df90059cf6 100644 --- a/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/access/ClusterAccess.java +++ b/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/access/ClusterAccess.java @@ -23,7 +23,6 @@ import io.fabric8.openshift.client.OpenShiftClient; import org.eclipse.jkube.kit.common.KitLogger; import org.eclipse.jkube.kit.common.util.OpenshiftHelper; -import org.eclipse.jkube.kit.config.resource.RuntimeMode; import java.net.UnknownHostException; @@ -90,17 +89,5 @@ public boolean isOpenShift() { return false; } - public RuntimeMode resolveRuntimeMode(RuntimeMode mode) { - RuntimeMode resolvedMode; - if (mode == null) { - mode = RuntimeMode.DEFAULT; - } - if (mode.isAuto()) { - resolvedMode = isOpenShiftImageStream() ? RuntimeMode.openshift : RuntimeMode.kubernetes; - } else { - resolvedMode = mode; - } - return resolvedMode; - } } diff --git a/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/RuntimeMode.java b/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/RuntimeMode.java index 987aa93e6a..425afbf24b 100644 --- a/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/RuntimeMode.java +++ b/jkube-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/RuntimeMode.java @@ -33,36 +33,23 @@ public enum RuntimeMode { * onto cluster. It can be used both on vanilla Kubernetes and * OpenShift. */ - kubernetes(false, "Kubernetes"), + KUBERNETES("Kubernetes"), /** * Use special OpenShift features like BuildConfigs, DeploymentConfigs * ImageStreams and S2I builds while deploying onto cluster. It can be * used only when on OpenShift. */ - openshift(false, "OpenShift"), + OPENSHIFT("OpenShift"); - /** - * Detect automatically whether running cluster is OpenShift or Kuberentes. - * This is done by contacting cluster API server. - */ - auto(true, "Auto"); - - public static final RuntimeMode DEFAULT = RuntimeMode.auto; public static final String FABRIC8_EFFECTIVE_PLATFORM_MODE = "jkube.internal.effective.platform.mode"; - private boolean autoFlag; private String label; - RuntimeMode(boolean autoFlag, String label) { - this.autoFlag = autoFlag; + RuntimeMode(String label) { this.label = label; } - public boolean isAuto() { - return autoFlag; - } - public String getLabel() { return label; } @@ -71,7 +58,7 @@ public String getLabel() { * Returns true if the given maven properties indicate running in OpenShift platform mode */ public static boolean isOpenShiftMode(Properties properties) { - return properties != null && Objects.equals(openshift.toString(), properties.getProperty(FABRIC8_EFFECTIVE_PLATFORM_MODE, "")); + return properties != null && Objects.equals(OPENSHIFT.toString(), properties.getProperty(FABRIC8_EFFECTIVE_PLATFORM_MODE, "")); } } diff --git a/jkube-kit/config/resource/src/test/java/org/eclipse/jkube/kit/config/access/ClusterAccessTest.java b/jkube-kit/config/resource/src/test/java/org/eclipse/jkube/kit/config/access/ClusterAccessTest.java index 3f815841ba..26712f51d3 100644 --- a/jkube-kit/config/resource/src/test/java/org/eclipse/jkube/kit/config/access/ClusterAccessTest.java +++ b/jkube-kit/config/resource/src/test/java/org/eclipse/jkube/kit/config/access/ClusterAccessTest.java @@ -17,7 +17,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; import org.eclipse.jkube.kit.common.KitLogger; -import org.eclipse.jkube.kit.config.resource.RuntimeMode; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; @@ -28,7 +27,6 @@ import mockit.Verifications; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -115,35 +113,4 @@ public void createDefaultClientInOpenShiftShouldReturnOpenShiftClient() { assertNotNull(result); assertTrue(result instanceof OpenShiftClient); } - - @Test - public void resolveRuntimeModeWithAutoInKubernetesShouldReturnKubernetes() { - // When - final RuntimeMode result = new ClusterAccess(logger, null).resolveRuntimeMode(null); - // Then - assertEquals(RuntimeMode.kubernetes, result); - } - - @Test - public void resolveRuntimeModeWithAutoInOpenShiftShouldReturnOpenShift() { - // Given - // @formatter:off - new Expectations() {{ - defaultKubernetesClient.isAdaptable(OpenShiftClient.class); result = true; - defaultOpenShiftClient.supportsOpenShiftAPIGroup("image.openshift.io"); result = true; - }}; - // @formatter:on - // When - final RuntimeMode result = new ClusterAccess(logger, null).resolveRuntimeMode(null); - // Then - assertEquals(RuntimeMode.openshift, result); - } - - @Test - public void resolveRuntimeModeWithSpecificShouldReturnSpecific() { - // When - final RuntimeMode result = new ClusterAccess(logger, null).resolveRuntimeMode(RuntimeMode.openshift); - // Then - assertEquals(RuntimeMode.openshift, result); - } } diff --git a/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/JKubeServiceHub.java b/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/JKubeServiceHub.java index 779ef15247..df67802b05 100644 --- a/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/JKubeServiceHub.java +++ b/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/JKubeServiceHub.java @@ -48,7 +48,6 @@ public class JKubeServiceHub implements Closeable { private ServiceHub dockerServiceHub; @Getter private BuildServiceConfig buildServiceConfig; - private RuntimeMode resolvedMode; @Getter private KubernetesClient client; private LazyBuilder artifactResolverService; @@ -71,16 +70,9 @@ public JKubeServiceHub( private void init() { Objects.requireNonNull(configuration, "JKubeKitConfiguration is required"); Objects.requireNonNull(log, "log is a required parameter"); - if (platformMode == null) { - platformMode = RuntimeMode.DEFAULT; - } if (clusterAccess == null) { clusterAccess = new ClusterAccess(log, ClusterConfiguration.from(System.getProperties()).build()); } - this.resolvedMode = clusterAccess.resolveRuntimeMode(platformMode); - if (resolvedMode != RuntimeMode.kubernetes && resolvedMode != RuntimeMode.openshift) { - throw new IllegalArgumentException("Unknown platform mode " + platformMode + " resolved as "+ resolvedMode); - } this.client = clusterAccess.createDefaultClient(); // Lazily building services @@ -96,7 +88,7 @@ protected ApplyService build() { protected BuildService build() { BuildService ret; // Creating platform-dependent services - if (resolvedMode == RuntimeMode.openshift) { + if (platformMode == RuntimeMode.OPENSHIFT) { if (!(client instanceof OpenShiftClient)) { throw new IllegalStateException("OpenShift platform has been specified but OpenShift has not been detected!"); } @@ -123,7 +115,7 @@ public void close() { } public RuntimeMode getRuntimeMode() { - return resolvedMode; + return platformMode; } public ArtifactResolverService getArtifactResolverService() { diff --git a/jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/JKubeServiceHubTest.java b/jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/JKubeServiceHubTest.java index 17e3c85268..18209c87ec 100644 --- a/jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/JKubeServiceHubTest.java +++ b/jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/JKubeServiceHubTest.java @@ -21,9 +21,7 @@ import org.eclipse.jkube.kit.config.resource.RuntimeMode; import org.eclipse.jkube.kit.config.service.kubernetes.DockerBuildService; import org.eclipse.jkube.kit.config.service.openshift.OpenshiftBuildService; -import mockit.Expectations; import mockit.Mocked; -import org.junit.Before; import org.junit.Test; import static junit.framework.TestCase.assertTrue; @@ -52,25 +50,6 @@ public class JKubeServiceHubTest { @Mocked private BuildServiceConfig buildServiceConfig; - @Before - public void init() { - // @formatter:off - new Expectations() {{ - clusterAccess.resolveRuntimeMode(RuntimeMode.kubernetes); - result = RuntimeMode.kubernetes; - minTimes = 0; - - clusterAccess.resolveRuntimeMode(RuntimeMode.openshift); - result = RuntimeMode.openshift; - minTimes = 0; - - clusterAccess.resolveRuntimeMode(RuntimeMode.auto); - result = RuntimeMode.kubernetes; - minTimes = 0; - }}; - // @formatter:on - } - @Test(expected = NullPointerException.class) public void testMissingClusterAccess() { JKubeServiceHub.builder() @@ -89,6 +68,7 @@ public void testMissingKitLogger() { public void testBasicInit() { // When try (final JKubeServiceHub jKubeServiceHub = JKubeServiceHub.builder() + .platformMode(RuntimeMode.KUBERNETES) .configuration(configuration) .log(logger) .build() @@ -96,7 +76,7 @@ public void testBasicInit() { // Then assertThat(jKubeServiceHub, notNullValue()); assertThat(jKubeServiceHub.getClient(), notNullValue()); - assertThat(jKubeServiceHub.getRuntimeMode(), is(RuntimeMode.kubernetes)); + assertThat(jKubeServiceHub.getRuntimeMode(), is(RuntimeMode.KUBERNETES)); } } @@ -106,7 +86,7 @@ public void testObtainBuildService() { .configuration(configuration) .clusterAccess(clusterAccess) .log(logger) - .platformMode(RuntimeMode.kubernetes) + .platformMode(RuntimeMode.KUBERNETES) .dockerServiceHub(dockerServiceHub) .buildServiceConfig(buildServiceConfig) .build(); @@ -123,7 +103,7 @@ public void testObtainOpenshiftBuildService() { .configuration(configuration) .clusterAccess(clusterAccess) .log(logger) - .platformMode(RuntimeMode.openshift) + .platformMode(RuntimeMode.OPENSHIFT) .dockerServiceHub(dockerServiceHub) .buildServiceConfig(buildServiceConfig) .build(); @@ -140,7 +120,7 @@ public void testObtainArtifactResolverService() { .configuration(configuration) .clusterAccess(clusterAccess) .log(logger) - .platformMode(RuntimeMode.kubernetes) + .platformMode(RuntimeMode.KUBERNETES) .dockerServiceHub(dockerServiceHub) .build(); diff --git a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/AutoTLSEnricherTest.java b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/AutoTLSEnricherTest.java index 6b80693e0e..1c49dee46a 100644 --- a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/AutoTLSEnricherTest.java +++ b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/AutoTLSEnricherTest.java @@ -63,7 +63,7 @@ private SecretNameTestConfig(PlatformMode mode, String tlsSecretNameConfig, Stri } private static final class AdaptTestConfig { - private final PlatformMode mode; + private final RuntimeMode mode; private final String initContainerNameConfig; private final String initContainerName; private final String initContainerImageConfig; @@ -73,7 +73,7 @@ private static final class AdaptTestConfig { private final String jksVolumeNameConfig; private final String jksVolumeName; - private AdaptTestConfig(PlatformMode mode, String initContainerNameConfig, String initContainerName, + private AdaptTestConfig(RuntimeMode mode, String initContainerNameConfig, String initContainerName, String initContainerImageConfig, String initContainerImage, String tlsSecretVolumeNameConfig, String tlsSecretVolumeName, String jksVolumeNameConfig, String jksVolumeName) { this.mode = mode; @@ -91,18 +91,18 @@ private AdaptTestConfig(PlatformMode mode, String initContainerNameConfig, Strin @Test public void testAdapt() throws Exception { final AdaptTestConfig[] data = new AdaptTestConfig[] { - new AdaptTestConfig(PlatformMode.kubernetes, null, null, null, null, null, null, null, null), - new AdaptTestConfig(PlatformMode.openshift, null, "tls-jks-converter", null, + new AdaptTestConfig(RuntimeMode.KUBERNETES, null, null, null, null, null, null, null, null), + new AdaptTestConfig(RuntimeMode.OPENSHIFT, null, "tls-jks-converter", null, "jimmidyson/pemtokeystore:v0.1.0", null, "tls-pem", null, "tls-jks"), - new AdaptTestConfig(PlatformMode.openshift, null, "tls-jks-converter", null, + new AdaptTestConfig(RuntimeMode.OPENSHIFT, null, "tls-jks-converter", null, "jimmidyson/pemtokeystore:v0.1.0", "tls-a", "tls-a", null, "tls-jks"), - new AdaptTestConfig(PlatformMode.openshift, null, "tls-jks-converter", null, + new AdaptTestConfig(RuntimeMode.OPENSHIFT, null, "tls-jks-converter", null, "jimmidyson/pemtokeystore:v0.1.0", null, "tls-pem", "jks-b", "jks-b"), - new AdaptTestConfig(PlatformMode.openshift, "test-container-name", "test-container-name", "image/123", + new AdaptTestConfig(RuntimeMode.OPENSHIFT, "test-container-name", "test-container-name", "image/123", "image/123", "tls-a", "tls-a", "jks-b", "jks-b") }; for (final AdaptTestConfig tc : data) { - TreeMap configMap = new TreeMap() { + TreeMap configMap = new TreeMap() { { put(AutoTLSEnricher.Config.pemToJKSInitContainerName.name(), tc.initContainerNameConfig); put(AutoTLSEnricher.Config.pemToJKSInitContainerImage.name(), tc.initContainerImageConfig); @@ -138,9 +138,9 @@ public void testAdapt() throws Exception { PodTemplate pt = (PodTemplate) klb.buildItems().get(0); List initContainers = pt.getTemplate().getSpec().getInitContainers(); - assertEquals(tc.mode == PlatformMode.openshift, !initContainers.isEmpty()); + assertEquals(tc.mode == RuntimeMode.OPENSHIFT, !initContainers.isEmpty()); - if (tc.mode == PlatformMode.kubernetes) { + if (tc.mode == RuntimeMode.KUBERNETES) { continue; } diff --git a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/FromSelector.java b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/FromSelector.java index bf98ebad8a..f8c6616e61 100644 --- a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/FromSelector.java +++ b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/FromSelector.java @@ -40,7 +40,7 @@ public FromSelector(GeneratorContext context) { public String getFrom() { RuntimeMode mode = context.getRuntimeMode(); OpenShiftBuildStrategy strategy = context.getStrategy(); - if (mode == RuntimeMode.openshift && strategy == OpenShiftBuildStrategy.s2i) { + if (mode == RuntimeMode.OPENSHIFT && strategy == OpenShiftBuildStrategy.s2i) { return getS2iBuildFrom(); } else { return getDockerBuildFrom(); diff --git a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java index 54d7860fd3..da8f8e289a 100644 --- a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java +++ b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java @@ -166,7 +166,7 @@ protected void addFrom(BuildConfiguration.BuildConfigurationBuilder builder) { * @return Docker image name which is never null */ protected String getImageName() { - if (getContext().getRuntimeMode() == RuntimeMode.openshift) { + if (getContext().getRuntimeMode() == RuntimeMode.OPENSHIFT) { return getConfigWithFallback(Config.name, "jkube.generator.name", "%a:%l"); } else { return getConfigWithFallback(Config.name, "jkube.generator.name", "%g/%a:%l"); @@ -180,7 +180,7 @@ protected String getImageName() { * @return The docker registry if configured */ protected String getRegistry() { - if (getContext().getRuntimeMode() == RuntimeMode.openshift && + if (getContext().getRuntimeMode() == RuntimeMode.OPENSHIFT && getContext().getStrategy() == OpenShiftBuildStrategy.s2i) { return null; } diff --git a/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java b/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java index e99b2bfae5..14c3e5d255 100644 --- a/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java +++ b/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java @@ -26,7 +26,7 @@ import static org.eclipse.jkube.kit.config.image.build.OpenShiftBuildStrategy.s2i; import static org.eclipse.jkube.kit.config.image.build.OpenShiftBuildStrategy.docker; -import static org.eclipse.jkube.kit.config.resource.RuntimeMode.openshift; +import static org.eclipse.jkube.kit.config.resource.RuntimeMode.OPENSHIFT; import static org.junit.Assert.assertEquals; public class FromSelectorTest { @@ -43,12 +43,12 @@ public class FromSelectorTest { @Test public void simple() { final TestCase[] testCases = new TestCase[]{ - new TestCase(openshift, s2i, "s2i-prop", "istag-prop"), - new TestCase(openshift, docker, "docker-prop", "istag-prop"), + new TestCase(OPENSHIFT, s2i, "s2i-prop", "istag-prop"), + new TestCase(OPENSHIFT, docker, "docker-prop", "istag-prop"), new TestCase(null, s2i, "docker-prop", "istag-prop"), new TestCase(null, docker, "docker-prop", "istag-prop"), - new TestCase(openshift, null, "docker-prop", "istag-prop"), - new TestCase(openshift, null, "docker-prop", "istag-prop"), + new TestCase(OPENSHIFT, null, "docker-prop", "istag-prop"), + new TestCase(OPENSHIFT, null, "docker-prop", "istag-prop"), new TestCase(null, null, "docker-prop", "istag-prop"), new TestCase(null, null, "docker-prop", "istag-prop"), }; diff --git a/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java b/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java index 893158a08a..6999f76c3e 100644 --- a/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java +++ b/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java @@ -307,7 +307,7 @@ public void setupContextKubernetes(final Properties projectProps, final String c ctx.getConfig(); result = config; config.getConfig("test-generator", "from"); result = configFrom; minTimes = 0; config.getConfig("test-generator", "fromMode"); result = configFromMode; minTimes = 0; - ctx.getRuntimeMode();result = RuntimeMode.kubernetes;minTimes = 0; + ctx.getRuntimeMode();result = RuntimeMode.KUBERNETES;minTimes = 0; ctx.getStrategy(); result = null; minTimes = 0; }}; } @@ -319,7 +319,7 @@ public void setupContextOpenShift(final Properties projectProps, final String co ctx.getConfig(); result = config; config.getConfig("test-generator", "from"); result = configFrom; minTimes = 0; config.getConfig("test-generator", "fromMode"); result = configFromMode; minTimes = 0; - ctx.getRuntimeMode();result = RuntimeMode.openshift;minTimes = 0; + ctx.getRuntimeMode();result = RuntimeMode.OPENSHIFT;minTimes = 0; ctx.getStrategy(); result = OpenShiftBuildStrategy.s2i; minTimes = 0; }}; } diff --git a/jkube-kit/generator/java-exec/src/test/java/org/eclipse/jkube/generator/javaexec/JavaRunGeneratorTest.java b/jkube-kit/generator/java-exec/src/test/java/org/eclipse/jkube/generator/javaexec/JavaRunGeneratorTest.java index 5c7f7e7a43..d68a52b98d 100644 --- a/jkube-kit/generator/java-exec/src/test/java/org/eclipse/jkube/generator/javaexec/JavaRunGeneratorTest.java +++ b/jkube-kit/generator/java-exec/src/test/java/org/eclipse/jkube/generator/javaexec/JavaRunGeneratorTest.java @@ -44,12 +44,12 @@ public class JavaRunGeneratorTest { @Test public void fromSelector() throws IOException { final List testCases = Arrays.asList( - new TestCase("3.1.123", false, RuntimeMode.kubernetes, null, "java.upstream.docker"), - new TestCase("3.1.redhat-101", true, RuntimeMode.kubernetes, null, "java.upstream.docker"), - new TestCase("3.1.123", false, RuntimeMode.openshift, OpenShiftBuildStrategy.docker, "java.upstream.docker"), - new TestCase("3.1.redhat-101", true, RuntimeMode.openshift, OpenShiftBuildStrategy.docker, "java.upstream.docker"), - new TestCase("3.1.123", false, RuntimeMode.openshift, OpenShiftBuildStrategy.s2i, "java.upstream.s2i"), - new TestCase("3.1.redhat-101", true, RuntimeMode.openshift, OpenShiftBuildStrategy.s2i, "java.upstream.s2i")); + new TestCase("3.1.123", false, RuntimeMode.KUBERNETES, null, "java.upstream.docker"), + new TestCase("3.1.redhat-101", true, RuntimeMode.KUBERNETES, null, "java.upstream.docker"), + new TestCase("3.1.123", false, RuntimeMode.OPENSHIFT, OpenShiftBuildStrategy.docker, "java.upstream.docker"), + new TestCase("3.1.redhat-101", true, RuntimeMode.OPENSHIFT, OpenShiftBuildStrategy.docker, "java.upstream.docker"), + new TestCase("3.1.123", false, RuntimeMode.OPENSHIFT, OpenShiftBuildStrategy.s2i, "java.upstream.s2i"), + new TestCase("3.1.redhat-101", true, RuntimeMode.OPENSHIFT, OpenShiftBuildStrategy.s2i, "java.upstream.s2i")); Properties imageProps = getDefaultImageProps(); diff --git a/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java b/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java index 12b5a84ad6..bcc70d240c 100644 --- a/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java +++ b/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java @@ -83,12 +83,12 @@ public boolean isApplicable(List configs) { @Override public List customize(List configs, boolean prePackagePhase) { final AppServerHandler handler = getAppServerHandler(getContext()); - if (getContext().getRuntimeMode() == RuntimeMode.openshift && + if (getContext().getRuntimeMode() == RuntimeMode.OPENSHIFT && getContext().getStrategy() == OpenShiftBuildStrategy.s2i && !prePackagePhase && !handler.supportsS2iBuild() ) { - throw new IllegalArgumentException("S2I not yet supported for the webapp-generator. Use -Djkube.mode=kubernetes or " + + throw new IllegalArgumentException("S2I not yet supported for the webapp-generator. Use " + "-Djkube.build.strategy=docker for OpenShift mode. Please refer to the reference manual at " + "https://www.eclipse.org/jkube/docs for details about build modes."); } diff --git a/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandler.java b/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandler.java index d348304c93..4b88c1a0df 100644 --- a/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandler.java +++ b/jkube-kit/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandler.java @@ -110,7 +110,7 @@ public String getUser() { @Override public List runCmds() { - if (generatorContext.getRuntimeMode() == RuntimeMode.openshift + if (generatorContext.getRuntimeMode() == RuntimeMode.OPENSHIFT && generatorContext.getStrategy() == OpenShiftBuildStrategy.docker) { // OpenShift runs pods in a restricted security context (SCC) which randomizes the user. // Make required runtime directories writeable for all users diff --git a/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java b/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java index c40803365d..2db5a36b0f 100644 --- a/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java +++ b/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java @@ -72,7 +72,7 @@ public void customizeDoesNotSupportS2iBuildShouldThrowException() { final Properties projectProperties = new Properties(); projectProperties.put("jkube.generator.from", "image-to-trigger-custom-app-server-handler"); new Expectations() {{ - generatorContext.getRuntimeMode(); result = RuntimeMode.openshift; + generatorContext.getRuntimeMode(); result = RuntimeMode.OPENSHIFT; generatorContext.getStrategy(); result = OpenShiftBuildStrategy.s2i; generatorContext.getProject().getProperties(); result = projectProperties; }}; diff --git a/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandlerTest.java b/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandlerTest.java index 24461cd43c..249545ec5a 100644 --- a/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandlerTest.java +++ b/jkube-kit/generator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/handler/WildFlyAppSeverHandlerTest.java @@ -112,7 +112,7 @@ public void kubernetes() { // Given // @formatter:off new Expectations(GeneratorContext.class) {{ - generatorContext.getRuntimeMode(); result = RuntimeMode.kubernetes; + generatorContext.getRuntimeMode(); result = RuntimeMode.KUBERNETES; }}; // @formatter:on // When @@ -128,7 +128,7 @@ public void openShiftDockerStrategy() { // Given // @formatter:off new Expectations(GeneratorContext.class) {{ - generatorContext.getRuntimeMode(); result = RuntimeMode.openshift; + generatorContext.getRuntimeMode(); result = RuntimeMode.OPENSHIFT; generatorContext.getStrategy(); result = OpenShiftBuildStrategy.docker; }}; // @formatter:on @@ -145,7 +145,7 @@ public void openShiftSourceStrategy() { // Given // @formatter:off new Expectations(GeneratorContext.class) {{ - generatorContext.getRuntimeMode(); result = RuntimeMode.openshift; + generatorContext.getRuntimeMode(); result = RuntimeMode.OPENSHIFT; generatorContext.getStrategy(); result = OpenShiftBuildStrategy.s2i; }}; // @formatter:on diff --git a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java index a241a86c30..2dce2412ff 100644 --- a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java +++ b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java @@ -178,7 +178,7 @@ private void setupContextOpenShift (final Properties projectProps, final String ctx.getConfig(); result = config; config.getConfig("test-generator", "from"); result = configFrom; minTimes = 0; config.getConfig("test-generator", "fromMode"); result = configFromMode; minTimes = 0; - ctx.getRuntimeMode(); result = RuntimeMode.openshift; minTimes = 0; + ctx.getRuntimeMode(); result = RuntimeMode.OPENSHIFT; minTimes = 0; ctx.getStrategy(); result = OpenShiftBuildStrategy.s2i; minTimes = 0; }}; // @formatter:on diff --git a/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/goals/build/_jkube-build.adoc b/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/goals/build/_jkube-build.adoc index fa056bf1e4..2f2c8e86c6 100644 --- a/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/goals/build/_jkube-build.adoc +++ b/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/goals/build/_jkube-build.adoc @@ -4,15 +4,6 @@ This goal is for building Docker images. -ifeval::["{goal-prefix}" == "oc"] -Images can be built in two different ways depending on the `mode` configuration (controlled by the `jkube.mode` -property). -By default the mode is set to `auto`. In this case the plugin tries to detect which kind of build should be performed by -contacting the API server. If this fails or if no cluster access is configured e.g. with `oc login` then the mode is set -to `kubernetes` in which case a standard Docker build is performed. It can also be forced to `openshift` to perform an -OpenShift build. -endif::[] - [[build-kubernetes]] === Kubernetes Build @@ -159,17 +150,6 @@ the URL is: | Docker machine configuration. See <> for possible values | -ifeval::["{goal-prefix}" == "oc"] -| [[build-mode]] *mode* -a| The build mode which can be - -* `kubernetes` : A Docker image will be created by calling a Docker daemon. See <> for details. -* `openshift` : An OpenShift Build will be triggered, which can be either a _Docker binary build_ or a _S2I binary build_, depending on the configuration `buildStrategy`. See <> for details. -* `auto` : The plugin tries to detect the mode by contacting the configured cluster. - -`auto` is the default. (_Because of technical reasons, "kubernetes" is currently the default, but will change to "auto" eventually_) -| `jkube.mode` -endif::[] | *maxConnections* | Number of parallel connections are allowed to be opened to the Docker Host. For parsing log output, a connection needs to be kept open (as well for the wait features), so don't put that number to low. Default is 100 which should be suitable for most of the cases. diff --git a/kubernetes-maven-plugin/it/src/it/configmap/invoker.properties b/kubernetes-maven-plugin/it/src/it/configmap/invoker.properties index 325c8945a4..fea5947290 100644 --- a/kubernetes-maven-plugin/it/src/it/configmap/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/configmap/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/kubernetes-maven-plugin/it/src/it/custom-environment/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/custom-environment/expected/openshift.yml deleted file mode 100644 index 030b75368a..0000000000 --- a/kubernetes-maven-plugin/it/src/it/custom-environment/expected/openshift.yml +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-custom-environment - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-custom-environment - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-custom-environment - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - provider: jkube - app: jkube-maven-sample-custom-environment - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-custom-environment - spec: - replicas: 1 - selector: - app: jkube-maven-sample-custom-environment - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-custom-environment - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/custom-environment/invoker.properties b/kubernetes-maven-plugin/it/src/it/custom-environment/invoker.properties index 4495266c83..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/custom-environment/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/custom-environment/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/custom-raw-resources/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/custom-raw-resources/expected/openshift.yml deleted file mode 100644 index 3d8fd252a8..0000000000 --- a/kubernetes-maven-plugin/it/src/it/custom-raw-resources/expected/openshift.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: sample-svc - spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: project - provider: provider - group: group - type: NodePort - # strict checking: no other attributes will be added diff --git a/kubernetes-maven-plugin/it/src/it/custom-raw-resources/invoker.properties b/kubernetes-maven-plugin/it/src/it/custom-raw-resources/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/custom-raw-resources/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/custom-raw-resources/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/expected/openshift.yml deleted file mode 100644 index f3c33dcd63..0000000000 --- a/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/expected/openshift.yml +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - -apiVersion: v1 -kind: List -items: -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - name: fabric8-docker-registry - spec: - replicas: 1 - strategy: - type: Recreate - selector: - provider: jkube - app: deployment-strategy-type-919 - group: org.eclipse.jkube.devops.apps - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties b/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/docker-health-checks/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/docker-health-checks/expected/openshift.yml deleted file mode 100644 index a8f920b5eb..0000000000 --- a/kubernetes-maven-plugin/it/src/it/docker-health-checks/expected/openshift.yml +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- kind: DeploymentConfig - spec: - template: - spec: - containers: - - image: img1:latest - livenessProbe: - exec: - command: - - echo - - '"hello"' - name: dockerhc1 - readinessProbe: - exec: - command: - - echo - - '"hello"' - - image: img2:latest - livenessProbe: - exec: - command: - - echo - - '"hello"' - failureThreshold: 5 - periodSeconds: 45 - timeoutSeconds: 7381 - name: dockerhc2 - readinessProbe: - exec: - command: - - echo - - '"hello"' - failureThreshold: 5 - periodSeconds: 45 - timeoutSeconds: 7381 diff --git a/kubernetes-maven-plugin/it/src/it/docker-health-checks/invoker.properties b/kubernetes-maven-plugin/it/src/it/docker-health-checks/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/docker-health-checks/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/docker-health-checks/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/env-metadata/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/env-metadata/expected/openshift.yml deleted file mode 100644 index 40a0811be2..0000000000 --- a/kubernetes-maven-plugin/it/src/it/env-metadata/expected/openshift.yml +++ /dev/null @@ -1,97 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-env-metadata - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-env-metadata - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-env-metadata - spec: - replicas: 1 - selector: - app: jkube-maven-sample-env-metadata - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: MY_ENV_key - value: MY_ENV_value - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-env-metadata:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/env-metadata/invoker.properties b/kubernetes-maven-plugin/it/src/it/env-metadata/invoker.properties index b73cdae3f3..2d40deab48 100644 --- a/kubernetes-maven-plugin/it/src/it/env-metadata/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/env-metadata/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/kubernetes-maven-plugin/it/src/it/registry-286/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/registry-286/expected/openshift.yml deleted file mode 100644 index d43fc22a65..0000000000 --- a/kubernetes-maven-plugin/it/src/it/registry-286/expected/openshift.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - spec: - template: - spec: - containers: - - image: "@matches('fabric8io/jkube-maven-sample-registry-286:.*$')@" diff --git a/kubernetes-maven-plugin/it/src/it/registry-286/invoker.properties b/kubernetes-maven-plugin/it/src/it/registry-286/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/registry-286/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/registry-286/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/remote-resources/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/remote-resources/expected/openshift.yml deleted file mode 100644 index e108134114..0000000000 --- a/kubernetes-maven-plugin/it/src/it/remote-resources/expected/openshift.yml +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-remote-resources - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-remote-resources - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-remote-resources - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - provider: jkube - app: jkube-maven-sample-remote-resources - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-remote-resources - spec: - replicas: 1 - selector: - app: jkube-maven-sample-remote-resources - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-remote-resources - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/remote-resources/invoker.properties b/kubernetes-maven-plugin/it/src/it/remote-resources/invoker.properties index 4495266c83..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/remote-resources/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/remote-resources/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/revisionhistory/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/revisionhistory/expected/openshift.yml deleted file mode 100644 index 3af2331992..0000000000 --- a/kubernetes-maven-plugin/it/src/it/revisionhistory/expected/openshift.yml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: "@ignore@" - spec: "@ignore@" - -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - spec: - replicas: 1 - revisionHistoryLimit: 8 \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/revisionhistory/invoker.properties b/kubernetes-maven-plugin/it/src/it/revisionhistory/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/revisionhistory/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/revisionhistory/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/secret-config/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/secret-config/expected/openshift.yml deleted file mode 100644 index 4ff37345af..0000000000 --- a/kubernetes-maven-plugin/it/src/it/secret-config/expected/openshift.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey - namespace: default - data: - .dockercfg: eyJkb2NrZXIuaW8iOnsidXNlcm5hbWUiOiJ1c2VybmFtZSIsInBhc3N3b3JkIjoidGhpcy9pcyVhI3Bhc3N3b3JkIiwiZW1haWwiOiJiYXJAYmFyLmNvbSJ9fQ== - type: kubernetes.io/dockercfg -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey1 - namespace: default - data: - .dockercfg: eyJkb2NrZXIxLmlvIjp7InVzZXJuYW1lIjoidXNlcm5hbWUxIiwicGFzc3dvcmQiOiJ0aGlzL2lzJWEjcGFzc3dvcmQhMSIsImVtYWlsIjoiYmFyMUBiYXIuY29tIn19 - type: kubernetes.io/dockercfg -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey2 - data: - .dockercfg: eyJkb2NrZXIxLmlvIjp7InVzZXJuYW1lIjoidXNlcm5hbWUxIiwicGFzc3dvcmQiOiJ0aGlzL2lzJWEjcGFzc3dvcmQhMSIsImVtYWlsIjoiYmFyMUBiYXIuY29tIn19 - type: kubernetes.io/dockercfg diff --git a/kubernetes-maven-plugin/it/src/it/secret-config/invoker.properties b/kubernetes-maven-plugin/it/src/it/secret-config/invoker.properties index fa078d7ef2..c6cf08d3ad 100644 --- a/kubernetes-maven-plugin/it/src/it/secret-config/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/secret-config/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean compile -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/sidecar/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/sidecar/expected/openshift.yml deleted file mode 100644 index 4c7d373620..0000000000 --- a/kubernetes-maven-plugin/it/src/it/sidecar/expected/openshift.yml +++ /dev/null @@ -1,101 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-sidecar - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-sidecar - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-sidecar - spec: - replicas: 1 - selector: - app: jkube-maven-sample-sidecar - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - image: busybox - name: sidecar1 - - env: - - name: THIS_IS_THE_APP_BECAUSE_THERE_S_NO_NAME - value: "true" - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-sidecar:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - - image: busybox - name: sidecar2 - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/sidecar/invoker.properties b/kubernetes-maven-plugin/it/src/it/sidecar/invoker.properties index d91d465d13..5079745db4 100644 --- a/kubernetes-maven-plugin/it/src/it/sidecar/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/sidecar/invoker.properties @@ -13,6 +13,6 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes -Djkube.sidecar=true +invoker.mavenOpts=-Djkube.verbose -Djkube.sidecar=true #-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 invoker.debug=false diff --git a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml deleted file mode 100644 index b24fa2e40e..0000000000 --- a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml +++ /dev/null @@ -1,97 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - jkube.io/issue-system: "GitHub" - jkube.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties b/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties index 56b471f1b8..e3868ccd48 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties @@ -13,7 +13,7 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose #invoker.mavenOpts=-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9001 \ - -Djkube.verbose -Djkube.mode=kubernetes + -Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml deleted file mode 100644 index f44b99a20a..0000000000 --- a/kubernetes-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-tag: "HEAD" - jkube.io/scm-url: "git://github.com/jkubeio/kubernetes-maven-plugin.git" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: "HEAD" - jkube.io/scm-url: "git://github.com/jkubeio/kubernetes-maven-plugin.git" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/simple-maven-scm/invoker.properties b/kubernetes-maven-plugin/it/src/it/simple-maven-scm/invoker.properties index 56b471f1b8..e3868ccd48 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-maven-scm/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/simple-maven-scm/invoker.properties @@ -13,7 +13,7 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose #invoker.mavenOpts=-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9001 \ - -Djkube.verbose -Djkube.mode=kubernetes + -Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml index 3cbe45feb2..65775a1e8a 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml @@ -84,7 +84,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest + image: jkube/jkube-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml deleted file mode 100644 index 770dbded66..0000000000 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml +++ /dev/null @@ -1,114 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/scm-tag: HEAD - labels: - expose: "true" - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - strategy: - rollingParams: - timeoutSeconds: 3600 - type: Rolling - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange - - imageChangeParams: - automatic: true - containerNames: - - spring-boot - from: - kind: ImageStreamTag - name: jkube-maven-sample-zero-config:latest - type: ImageChange diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties index 2c87348f58..016848a607 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift -Dfabric8.openshift.generateRoute=false +invoker.mavenOpts=-Djkube.verbose -Dfabric8.openshift.generateRoute=false invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml index 3cbe45feb2..65775a1e8a 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml @@ -84,7 +84,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest + image: jkube/jkube-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml deleted file mode 100644 index 5f8a2aa3b9..0000000000 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml +++ /dev/null @@ -1,130 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/scm-tag: HEAD - labels: - expose: "true" - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - strategy: - rollingParams: - timeoutSeconds: 3600 - type: Rolling - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange - - imageChangeParams: - automatic: true - containerNames: - - spring-boot - from: - kind: ImageStreamTag - name: jkube-maven-sample-zero-config:latest - type: ImageChange -- apiVersion: route.openshift.io/v1 - kind: Route - metadata: - labels: - expose: "true" - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - port: - targetPort: 8080 - to: - kind: Service - name: jkube-maven-sample-zero-config diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties index c04cf076c9..7ee5c7b398 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift -Dfabric8.openshift.generateRoute=true -invoker.debug=false \ No newline at end of file +invoker.mavenOpts=-Djkube.verbose -Djkube.openshift.generateRoute=true +invoker.debug=false diff --git a/kubernetes-maven-plugin/it/src/it/simple/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/simple/expected/openshift.yml deleted file mode 100644 index e0f95f8a91..0000000000 --- a/kubernetes-maven-plugin/it/src/it/simple/expected/openshift.yml +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/simple/invoker.properties b/kubernetes-maven-plugin/it/src/it/simple/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/simple/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/simple/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/spring-boot/invoker.properties b/kubernetes-maven-plugin/it/src/it/spring-boot/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/spring-boot/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/spring-boot/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/statefulset/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/statefulset/expected/openshift.yml deleted file mode 100644 index 5e72ab8af4..0000000000 --- a/kubernetes-maven-plugin/it/src/it/statefulset/expected/openshift.yml +++ /dev/null @@ -1,110 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-statefulset - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-statefulset - provider: jkube - group: org.eclipse.jkube -- apiVersion: route.openshift.io/v1 - kind: Route - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-statefulset - spec: - port: - targetPort: 8080 - to: - kind: Service - name: jkube-maven-sample-statefulset -- apiVersion: apps/v1 - kind: StatefulSet - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-statefulset - spec: - replicas: 2 - selector: - matchLabels: - app: jkube-maven-sample-statefulset - provider: jkube - group: org.eclipse.jkube - serviceName: jkube-maven-sample-statefulset - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - livenessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 180 - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - readinessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 10 - securityContext: - privileged: false diff --git a/kubernetes-maven-plugin/it/src/it/statefulset/invoker.properties b/kubernetes-maven-plugin/it/src/it/statefulset/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/statefulset/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/statefulset/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/vertx-default/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/vertx-default/expected/openshift.yml deleted file mode 100644 index 39ec3f77f9..0000000000 --- a/kubernetes-maven-plugin/it/src/it/vertx-default/expected/openshift.yml +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - expose: "true" - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - name: vertx-default-sample - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - name: vertx-default-sample - spec: - replicas: 1 - selector: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('fabric8/vertx-default-sample:.*$')@" - imagePullPolicy: IfNotPresent - name: vertx - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/vertx-default/invoker.properties b/kubernetes-maven-plugin/it/src/it/vertx-default/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/vertx-default/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/vertx-default/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/vertx-health-check/invoker.properties b/kubernetes-maven-plugin/it/src/it/vertx-health-check/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/vertx-health-check/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/vertx-health-check/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/vertx/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/vertx/expected/openshift.yml deleted file mode 100644 index a559d49a8b..0000000000 --- a/kubernetes-maven-plugin/it/src/it/vertx/expected/openshift.yml +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-vertx - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-vertx - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-vertx - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps.openshift.io/v1 - kind: DeploymentConfig - metadata: - labels: - provider: jkube - app: jkube-maven-sample-vertx - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-vertx - spec: - replicas: 1 - selector: - app: jkube-maven-sample-vertx - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-vertx - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - triggers: - - type: ConfigChange diff --git a/kubernetes-maven-plugin/it/src/it/vertx/invoker.properties b/kubernetes-maven-plugin/it/src/it/vertx/invoker.properties index 4495266c83..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/vertx/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/vertx/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/openshift.yml b/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/openshift.yml deleted file mode 100644 index ff40219751..0000000000 --- a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/openshift.yml +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service -- apiVersion: v1 - kind: PersistentVolumeClaim - metadata: - annotations: - volume.beta.kubernetes.io/storage-class: cheese - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 5Gi \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties b/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties b/kubernetes-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties index f1b353bd6e..23df5cf5f8 100644 --- a/kubernetes-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties +++ b/kubernetes-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean k8s:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/AbstractDockerMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/AbstractDockerMojo.java index 71820e07db..197f376c55 100644 --- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/AbstractDockerMojo.java +++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/AbstractDockerMojo.java @@ -390,7 +390,7 @@ public KitLogger getKitLogger() { } public RuntimeMode getConfiguredRuntimeMode() { - return RuntimeMode.kubernetes; + return RuntimeMode.KUBERNETES; } protected void init() { @@ -398,7 +398,7 @@ protected void init() { authConfigFactory = new AuthConfigFactory(log); imageConfigResolver.setLog(log); clusterAccess = new ClusterAccess(log, initClusterConfiguration()); - runtimeMode = clusterAccess.resolveRuntimeMode(getConfiguredRuntimeMode()); + runtimeMode = getConfiguredRuntimeMode(); } protected boolean canExecute() { @@ -680,7 +680,7 @@ protected BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder */ public List customizeConfig(List configs) { log.info("Running in [[B]]%s[[B]] mode", runtimeMode.getLabel()); - if (runtimeMode != RuntimeMode.openshift) { + if (runtimeMode != RuntimeMode.OPENSHIFT) { log.info("Building Docker image in [[B]]Kubernetes[[B]] mode"); } try { diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java index 725313692e..7dd41d641c 100644 --- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java +++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/ResourceMojo.java @@ -136,9 +136,6 @@ public class ResourceMojo extends AbstractJKubeMojo { @Parameter private ResourceConfig resources; - @Parameter(property = "jkube.mode") - private RuntimeMode runtimeMode = RuntimeMode.DEFAULT; - // Skip resource descriptors validation @Parameter(property = "jkube.skipResourceValidation", defaultValue = "false") private Boolean skipResourceValidation; @@ -218,48 +215,6 @@ public class ResourceMojo extends AbstractJKubeMojo { @Parameter(property = "jkube.skipHealthCheck", defaultValue = "false") private Boolean skipHealthCheck; - /** - * The OpenShift deploy timeout in seconds: - * See this issue for background of why for end users on slow wifi on their laptops - * DeploymentConfigs usually barf: https://github.com/openshift/origin/issues/10531 - * - * Please follow also the discussion at - *
    - *
  • https://github.com/fabric8io/fabric8-maven-plugin/pull/944#discussion_r116962969
    • - *
  • https://github.com/fabric8io/fabric8-maven-plugin/pull/794
    • - *
- * and the references within it for the reason of this ridiculous long default timeout - * (in short: Its because Docker image download times are added to the deployment time, making - * the default of 10 minutes quite unusable if multiple images are included in the deployment). - */ - @Parameter(property = "jkube.openshift.deployTimeoutSeconds", defaultValue = "3600") - private Long openshiftDeployTimeoutSeconds; - - /** - * If set to true it would set the container image reference to "", this is done to handle weird - * behavior of OpenShift 3.7 in which subsequent rollouts lead to ImagePullErr - * - * Please see discussion at - *
    - *
  • https://github.com/openshift/origin/issues/18406
    • - *
  • https://github.com/fabric8io/fabric8-maven-plugin/issues/1130
    • - *
- */ - @Parameter(property = "jkube.openshift.trimImageInContainerSpec", defaultValue = "false") - private Boolean trimImageInContainerSpec; - - @Parameter(property = "jkube.openshift.generateRoute", defaultValue = "true") - private Boolean generateRoute; - - @Parameter(property = "jkube.openshift.enableAutomaticTrigger", defaultValue = "true") - private Boolean enableAutomaticTrigger; - - @Parameter(property = "jkube.openshift.imageChangeTrigger", defaultValue = "true") - private Boolean enableImageChangeTrigger; - - @Parameter(property = "jkube.openshift.enrichAllWithImageChangeTrigger", defaultValue = "false") - private Boolean erichAllWithImageChangeTrigger; - @Parameter(property = "jkube.skip.resource", defaultValue = "false") protected boolean skipResource; @@ -386,6 +341,10 @@ protected PlatformMode getPlatformMode() { return PlatformMode.kubernetes; } + protected RuntimeMode getRuntimeMode() { + return RuntimeMode.KUBERNETES; + } + protected ResourceClassifier getResourceClassifier() { return ResourceClassifier.KUBERNETES; } @@ -429,14 +388,14 @@ private void validateIfRequired(File resourceDir, ResourceClassifier classifier) } private void lateInit() { - runtimeMode = clusterAccess.resolveRuntimeMode(runtimeMode); - if (runtimeMode.equals(RuntimeMode.openshift)) { + RuntimeMode runtimeMode = getRuntimeMode(); + if (runtimeMode.equals(RuntimeMode.OPENSHIFT)) { Properties properties = project.getProperties(); if (!properties.contains(DOCKER_IMAGE_USER)) { - String namespace = this.namespace != null && !this.namespace.isEmpty() ? + String namespaceToBeUsed = this.namespace != null && !this.namespace.isEmpty() ? this.namespace: clusterAccess.getNamespace(); - log.info("Using docker image name of namespace: " + namespace); - properties.setProperty(DOCKER_IMAGE_USER, namespace); + log.info("Using docker image name of namespace: " + namespaceToBeUsed); + properties.setProperty(DOCKER_IMAGE_USER, namespaceToBeUsed); } if (!properties.contains(RuntimeMode.FABRIC8_EFFECTIVE_PLATFORM_MODE)) { properties.setProperty(RuntimeMode.FABRIC8_EFFECTIVE_PLATFORM_MODE, runtimeMode.toString()); @@ -562,7 +521,7 @@ private List getResolvedImages(List imag GeneratorContext ctx = GeneratorContext.builder() .config(extractGeneratorConfig()) .project(jkubeProject) - .runtimeMode(runtimeMode) + .runtimeMode(getRuntimeMode()) .logger(log) .strategy(OpenShiftBuildStrategy.docker) .useProjectClasspath(useProjectClasspath) diff --git a/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml b/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml index 1da7b9fffc..f9ffeafc4a 100644 --- a/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml @@ -87,7 +87,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-config-map:.*$')@" + image: jkube-maven-sample-config-map:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/configmap/invoker.properties b/openshift-maven-plugin/it/src/it/configmap/invoker.properties index 8d81e0e037..6e1adcefdd 100644 --- a/openshift-maven-plugin/it/src/it/configmap/invoker.properties +++ b/openshift-maven-plugin/it/src/it/configmap/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/custom-environment/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/custom-environment/expected/kubernetes.yml deleted file mode 100644 index ddfd34e2cf..0000000000 --- a/openshift-maven-plugin/it/src/it/custom-environment/expected/kubernetes.yml +++ /dev/null @@ -1,78 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: jkube-maven-sample-custom-environment - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-custom-environment - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - provider: jkube - app: jkube-maven-sample-custom-environment - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-custom-environment - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-custom-environment - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-custom-environment - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/custom-environment/invoker.properties b/openshift-maven-plugin/it/src/it/custom-environment/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/custom-environment/invoker.properties +++ b/openshift-maven-plugin/it/src/it/custom-environment/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/custom-raw-resources/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/custom-raw-resources/expected/kubernetes.yml deleted file mode 100644 index 3d8fd252a8..0000000000 --- a/openshift-maven-plugin/it/src/it/custom-raw-resources/expected/kubernetes.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: sample-svc - spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: project - provider: provider - group: group - type: NodePort - # strict checking: no other attributes will be added diff --git a/openshift-maven-plugin/it/src/it/custom-raw-resources/invoker.properties b/openshift-maven-plugin/it/src/it/custom-raw-resources/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/custom-raw-resources/invoker.properties +++ b/openshift-maven-plugin/it/src/it/custom-raw-resources/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/expected/kubernetes.yml deleted file mode 100644 index 0458ee6ab6..0000000000 --- a/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/expected/kubernetes.yml +++ /dev/null @@ -1,83 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: extensions/v1beta1 - kind: Deployment - metadata: - labels: - provider: jkube - app: deployment-strategy-type-919 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - name: jkube-docker-registry - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - provider: jkube - app: deployment-strategy-type-919 - group: org.eclipse.jkube.devops.apps - strategy: - type: Recreate - template: - metadata: - labels: - provider: jkube - app: deployment-strategy-type-919 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: registry:2 - imagePullPolicy: IfNotPresent - name: jkube-docker-registry - ports: - - containerPort: 5000 - name: http - resources: - limits: - cpu: "0" - memory: "0" - requests: - cpu: "0" - memory: "0" - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - readOnly: false - initContainers: - - command: - - chmod - - "777" - - /var/lib/registry - image: busybox - imagePullPolicy: IfNotPresent - name: jkube-volume-permission - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - volumes: - - name: jkube-docker-registry-storage - persistentVolumeClaim: - claimName: jkube-docker-registry-storage diff --git a/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties b/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties +++ b/openshift-maven-plugin/it/src/it/deployment-strategy-type-919/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/docker-health-checks/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/docker-health-checks/expected/kubernetes.yml deleted file mode 100644 index e40c8a71d0..0000000000 --- a/openshift-maven-plugin/it/src/it/docker-health-checks/expected/kubernetes.yml +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- kind: Deployment - spec: - template: - spec: - containers: - - image: img1:latest - livenessProbe: - exec: - command: - - echo - - '"hello"' - name: dockerhc1 - readinessProbe: - exec: - command: - - echo - - '"hello"' - - image: img2:latest - livenessProbe: - exec: - command: - - echo - - '"hello"' - failureThreshold: 5 - periodSeconds: 45 - timeoutSeconds: 7381 - name: dockerhc2 - readinessProbe: - exec: - command: - - echo - - '"hello"' - failureThreshold: 5 - periodSeconds: 45 - timeoutSeconds: 7381 diff --git a/openshift-maven-plugin/it/src/it/docker-health-checks/invoker.properties b/openshift-maven-plugin/it/src/it/docker-health-checks/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/docker-health-checks/invoker.properties +++ b/openshift-maven-plugin/it/src/it/docker-health-checks/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml deleted file mode 100644 index 9492d9e7e3..0000000000 --- a/openshift-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-env-metadata - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-env-metadata - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-env-metadata - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-env-metadata - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-env-metadata - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: MY_ENV_key - value: MY_ENV_value - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-env-metadata:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml b/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml index 40a0811be2..1456d62c3e 100644 --- a/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml @@ -78,7 +78,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-env-metadata:.*$')@" + image: jkube-maven-sample-env-metadata:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/env-metadata/invoker.properties b/openshift-maven-plugin/it/src/it/env-metadata/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/env-metadata/invoker.properties +++ b/openshift-maven-plugin/it/src/it/env-metadata/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/raw-resources/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/raw-resources/expected/kubernetes.yml deleted file mode 100644 index 3d8fd252a8..0000000000 --- a/openshift-maven-plugin/it/src/it/raw-resources/expected/kubernetes.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: sample-svc - spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: 8080 - selector: - app: project - provider: provider - group: group - type: NodePort - # strict checking: no other attributes will be added diff --git a/openshift-maven-plugin/it/src/it/registry-286/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/registry-286/expected/kubernetes.yml deleted file mode 100644 index aafc060fab..0000000000 --- a/openshift-maven-plugin/it/src/it/registry-286/expected/kubernetes.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service -- apiVersion: apps/v1 - kind: Deployment - spec: - template: - spec: - containers: - - image: "@matches('jkube/jkube-maven-sample-registry-286:.*$')@" diff --git a/openshift-maven-plugin/it/src/it/registry-286/expected/openshift.yml b/openshift-maven-plugin/it/src/it/registry-286/expected/openshift.yml index 689e4063e4..0580f33c82 100644 --- a/openshift-maven-plugin/it/src/it/registry-286/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/registry-286/expected/openshift.yml @@ -24,4 +24,4 @@ items: template: spec: containers: - - image: "@matches('jkube/jkube-maven-sample-registry-286:.*$')@" + - image: jkube-maven-sample-registry-286:latest diff --git a/openshift-maven-plugin/it/src/it/registry-286/invoker.properties b/openshift-maven-plugin/it/src/it/registry-286/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/registry-286/invoker.properties +++ b/openshift-maven-plugin/it/src/it/registry-286/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/remote-resources/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/remote-resources/expected/kubernetes.yml deleted file mode 100644 index aa1e5b8b10..0000000000 --- a/openshift-maven-plugin/it/src/it/remote-resources/expected/kubernetes.yml +++ /dev/null @@ -1,78 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: jkube-maven-sample-remote-resources - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-remote-resources - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - provider: jkube - app: jkube-maven-sample-remote-resources - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-remote-resources - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-remote-resources - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-remote-resources - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/remote-resources/invoker.properties b/openshift-maven-plugin/it/src/it/remote-resources/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/remote-resources/invoker.properties +++ b/openshift-maven-plugin/it/src/it/remote-resources/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/revisionhistory/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/revisionhistory/expected/kubernetes.yml deleted file mode 100644 index 027a1bb44c..0000000000 --- a/openshift-maven-plugin/it/src/it/revisionhistory/expected/kubernetes.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: "@ignore@" - spec: "@ignore@" -- apiVersion: apps/v1 - kind: Deployment - spec: - replicas: 1 - revisionHistoryLimit: 8 diff --git a/openshift-maven-plugin/it/src/it/revisionhistory/invoker.properties b/openshift-maven-plugin/it/src/it/revisionhistory/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/revisionhistory/invoker.properties +++ b/openshift-maven-plugin/it/src/it/revisionhistory/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/secret-config/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/secret-config/expected/kubernetes.yml deleted file mode 100644 index 5931a77a33..0000000000 --- a/openshift-maven-plugin/it/src/it/secret-config/expected/kubernetes.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey - namespace: default - data: - .dockercfg: eyJkb2NrZXIuaW8iOnsidXNlcm5hbWUiOiJ1c2VybmFtZSIsInBhc3N3b3JkIjoidGhpcy9pcyVhI3Bhc3N3b3JkIiwiZW1haWwiOiJiYXJAYmFyLmNvbSJ9fQ== - type: openshift.io/dockercfg -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey1 - namespace: default - data: - .dockercfg: eyJkb2NrZXIxLmlvIjp7InVzZXJuYW1lIjoidXNlcm5hbWUxIiwicGFzc3dvcmQiOiJ0aGlzL2lzJWEjcGFzc3dvcmQhMSIsImVtYWlsIjoiYmFyMUBiYXIuY29tIn19 - type: openshift.io/dockercfg -- apiVersion: v1 - kind: Secret - metadata: - name: mydockerkey2 - data: - .dockercfg: eyJkb2NrZXIxLmlvIjp7InVzZXJuYW1lIjoidXNlcm5hbWUxIiwicGFzc3dvcmQiOiJ0aGlzL2lzJWEjcGFzc3dvcmQhMSIsImVtYWlsIjoiYmFyMUBiYXIuY29tIn19 - type: openshift.io/dockercfg diff --git a/openshift-maven-plugin/it/src/it/secret-config/invoker.properties b/openshift-maven-plugin/it/src/it/secret-config/invoker.properties index cbd97855a9..c6cf08d3ad 100644 --- a/openshift-maven-plugin/it/src/it/secret-config/invoker.properties +++ b/openshift-maven-plugin/it/src/it/secret-config/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean compile -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml deleted file mode 100644 index 32cbb1c398..0000000000 --- a/openshift-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-sidecar - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-sidecar - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-sidecar - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-sidecar - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-sidecar - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - image: busybox - name: sidecar1 - - env: - - name: THIS_IS_THE_APP_BECAUSE_THERE_S_NO_NAME - value: "true" - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-sidecar:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false - - image: busybox - name: sidecar2 diff --git a/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml b/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml index 4c7d373620..c3b6e2e1c1 100644 --- a/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml @@ -80,7 +80,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-sidecar:.*$')@" + image: jkube-maven-sample-sidecar:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/sidecar/invoker.properties b/openshift-maven-plugin/it/src/it/sidecar/invoker.properties index afe3617d9b..d4b5a0d25c 100644 --- a/openshift-maven-plugin/it/src/it/sidecar/invoker.properties +++ b/openshift-maven-plugin/it/src/it/sidecar/invoker.properties @@ -13,6 +13,6 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes -Djkube.sidecar=true +invoker.mavenOpts=-Djkube.verbose -Djkube.sidecar=true #-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml deleted file mode 100644 index 4136926382..0000000000 --- a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - jkube.io/issue-system: "GitHub" - jkube.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml index b24fa2e40e..90454de412 100644 --- a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml @@ -78,7 +78,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" + image: jkube-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties +++ b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/kubernetes.yml deleted file mode 100644 index 2ce32116c8..0000000000 --- a/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/kubernetes.yml +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-tag: "HEAD" - jkube.io/scm-url: "git://github.com/jkubeio/openshift-maven-plugin.git" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: "HEAD" - jkube.io/scm-url: "git://github.com/jkubeio/openshift-maven-plugin.git" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: "HEAD" - jkube.io/scm-url: "git://github.com/jkubeio/openshift-maven-plugin.git" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml index b415706cd5..d4ba8fbed1 100644 --- a/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-maven-scm/expected/openshift.yml @@ -79,7 +79,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" + image: jkube-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/simple-maven-scm/invoker.properties b/openshift-maven-plugin/it/src/it/simple-maven-scm/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/simple-maven-scm/invoker.properties +++ b/openshift-maven-plugin/it/src/it/simple-maven-scm/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml deleted file mode 100644 index 3cbe45feb2..0000000000 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml +++ /dev/null @@ -1,101 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/scm-tag: HEAD - labels: - expose: "true" - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties b/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties index 7ed5a11dc6..11457aa13e 100644 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties +++ b/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift -Dfabric8.openshift.generateRoute=false +invoker.mavenOpts=-Djkube.verbose -Dfabric8.openshift.generateRoute=false invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml deleted file mode 100644 index 3cbe45feb2..0000000000 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml +++ /dev/null @@ -1,101 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/port: "9779" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/scm-tag: HEAD - labels: - expose: "true" - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/scm-url: https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/jkube-maven-sample-zero-config - jkube.io/git-branch: "@ignore@" - jkube.io/scm-tag: HEAD - labels: - app: jkube-maven-sample-zero-config - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: jkube-maven-sample-zero-config:latest - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties index 6b82c3491d..d7de7d6d76 100644 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties +++ b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift -Dfabric8.openshift.generateRoute=true +invoker.mavenOpts=-Djkube.verbose -Dfabric8.openshift.generateRoute=true invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/simple/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/simple/expected/kubernetes.yml deleted file mode 100644 index c3c9ecf44c..0000000000 --- a/openshift-maven-plugin/it/src/it/simple/expected/kubernetes.yml +++ /dev/null @@ -1,94 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - prometheus.io/scrape: "true" - jkube.io/git-branch: "@ignore@" - prometheus.io/port: "9779" - labels: - expose: "true" - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-zero-config - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-zero-config - provider: jkube - group: org.eclipse.jkube - template: - metadata: - annotations: - jkube.io/git-commit: "@ignore@" - jkube.io/git-branch: "@ignore@" - labels: - provider: jkube - app: jkube-maven-sample-zero-config - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" - imagePullPolicy: IfNotPresent - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml index e0f95f8a91..693fcc3010 100644 --- a/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml @@ -76,7 +76,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-zero-config:.*$')@" + image: jkube-maven-sample-zero-config:latest imagePullPolicy: IfNotPresent name: spring-boot ports: diff --git a/openshift-maven-plugin/it/src/it/simple/invoker.properties b/openshift-maven-plugin/it/src/it/simple/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/simple/invoker.properties +++ b/openshift-maven-plugin/it/src/it/simple/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/spring-boot/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/spring-boot/expected/kubernetes.yml deleted file mode 100644 index 4a54c48093..0000000000 --- a/openshift-maven-plugin/it/src/it/spring-boot/expected/kubernetes.yml +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: jkube-maven-sample-spring-boot - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-spring-boot - provider: jkube - group: org.eclipse.jkube - type: NodePort -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - testProject: spring-boot-sample - provider: jkube - app: jkube-maven-sample-spring-boot - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-spring-boot - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-spring-boot - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - testProject: spring-boot-sample - provider: jkube - app: jkube-maven-sample-spring-boot - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-spring-boot:.*$')@" - imagePullPolicy: IfNotPresent - livenessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 180 - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - readinessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 10 - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml b/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml index 53bfa65213..e75c939b7c 100644 --- a/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml @@ -69,7 +69,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/jkube-maven-sample-spring-boot:.*$')@" + image: jkube-maven-sample-spring-boot:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/openshift-maven-plugin/it/src/it/spring-boot/invoker.properties b/openshift-maven-plugin/it/src/it/spring-boot/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/spring-boot/invoker.properties +++ b/openshift-maven-plugin/it/src/it/spring-boot/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/statefulset/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/statefulset/expected/kubernetes.yml deleted file mode 100644 index 8e8232f17b..0000000000 --- a/openshift-maven-plugin/it/src/it/statefulset/expected/kubernetes.yml +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-statefulset - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-statefulset - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: StatefulSet - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-statefulset - spec: - replicas: 2 - selector: - matchLabels: - app: jkube-maven-sample-statefulset - provider: jkube - group: org.eclipse.jkube - serviceName: jkube-maven-sample-statefulset - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-statefulset - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - livenessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 180 - name: spring-boot - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - readinessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 10 - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/statefulset/invoker.properties b/openshift-maven-plugin/it/src/it/statefulset/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/statefulset/invoker.properties +++ b/openshift-maven-plugin/it/src/it/statefulset/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/vertx-default/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/vertx-default/expected/kubernetes.yml deleted file mode 100644 index f357506736..0000000000 --- a/openshift-maven-plugin/it/src/it/vertx-default/expected/kubernetes.yml +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: vertx-default-sample - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - name: vertx-default-sample - spec: - replicas: 1 - selector: - matchLabels: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/vertx-default-sample:.*$')@" - imagePullPolicy: IfNotPresent - name: vertx - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml b/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml index 51abc4aff5..08d464f447 100644 --- a/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml @@ -65,7 +65,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/vertx-default-sample:.*$')@" + image: vertx-default-sample:latest imagePullPolicy: IfNotPresent name: vertx ports: diff --git a/openshift-maven-plugin/it/src/it/vertx-default/invoker.properties b/openshift-maven-plugin/it/src/it/vertx-default/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/vertx-default/invoker.properties +++ b/openshift-maven-plugin/it/src/it/vertx-default/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/vertx-health-check/expected/kubernetes.yml deleted file mode 100644 index 4ccb8d4cfd..0000000000 --- a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/kubernetes.yml +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: vertx-default-sample - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - name: vertx-default-sample - spec: - replicas: 1 - selector: - matchLabels: - app: vertx-default-sample - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: vertx-default-sample - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@matches('jkube/vertx-default-sample:.*$')@" - imagePullPolicy: IfNotPresent - name: vertx - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - livenessProbe: - httpGet: - path: / - port: 8080 - scheme: HTTP - initialDelaySeconds: 180 - readinessProbe: - httpGet: - path: / - port: 8080 - scheme: HTTP - initialDelaySeconds: 10 - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml b/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml index 277903814a..d9f49d64a1 100644 --- a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml @@ -65,7 +65,7 @@ items: valueFrom: fieldRef: fieldPath: metadata.namespace - image: "@matches('jkube/vertx-default-sample:.*$')@" + image: vertx-default-sample:latest imagePullPolicy: IfNotPresent name: vertx ports: diff --git a/openshift-maven-plugin/it/src/it/vertx-health-check/invoker.properties b/openshift-maven-plugin/it/src/it/vertx-health-check/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/vertx-health-check/invoker.properties +++ b/openshift-maven-plugin/it/src/it/vertx-health-check/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/vertx/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/vertx/expected/kubernetes.yml deleted file mode 100644 index 0fd28c5ea8..0000000000 --- a/openshift-maven-plugin/it/src/it/vertx/expected/kubernetes.yml +++ /dev/null @@ -1,78 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - name: jkube-maven-sample-vertx - spec: - ports: - - name: http - port: 8080 - protocol: TCP - targetPort: 8080 - selector: - app: jkube-maven-sample-vertx - provider: jkube - group: org.eclipse.jkube -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: - provider: jkube - app: jkube-maven-sample-vertx - version: "@ignore@" - group: org.eclipse.jkube - name: jkube-maven-sample-vertx - spec: - replicas: 1 - selector: - matchLabels: - app: jkube-maven-sample-vertx - provider: jkube - group: org.eclipse.jkube - template: - metadata: - labels: - provider: jkube - app: jkube-maven-sample-vertx - version: "@ignore@" - group: org.eclipse.jkube - spec: - containers: - - env: - - name: JAVA_OPTIONS - value: -Xmx1500m - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: "@ignore@" - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9779 - name: prometheus - protocol: TCP - - containerPort: 8778 - name: jolokia - protocol: TCP - securityContext: - privileged: false diff --git a/openshift-maven-plugin/it/src/it/vertx/invoker.properties b/openshift-maven-plugin/it/src/it/vertx/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/vertx/invoker.properties +++ b/openshift-maven-plugin/it/src/it/vertx/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml deleted file mode 100644 index b7070e2f46..0000000000 --- a/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - expose: "true" - name: jkube-docker-registry - spec: - ports: - - port: 80 - protocol: TCP - targetPort: 5000 - selector: - app: jkube-docker-registry - provider: jkube - group: org.eclipse.jkube.devops.apps -- apiVersion: v1 - kind: PersistentVolumeClaim - metadata: - annotations: - volume.beta.openshift.io/storage-class: cheese - labels: - app: volume-enricher-storage-class-835 - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-docker-registry-storage - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 5Gi -- apiVersion: extensions/v1beta1 - kind: Deployment - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - name: jkube-docker-registry - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - provider: jkube - app: volume-enricher-storage-class-835 - group: org.eclipse.jkube.devops.apps - template: - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: registry:2 - imagePullPolicy: IfNotPresent - name: jkube-docker-registry - ports: - - containerPort: 5000 - name: http - resources: - limits: - cpu: "0" - memory: "0" - requests: - cpu: "0" - memory: "0" - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - readOnly: false - initContainers: - - command: - - chmod - - "777" - - /var/lib/registry - image: busybox - imagePullPolicy: IfNotPresent - name: jkube-volume-permission - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - volumes: - - name: jkube-docker-registry-storage - persistentVolumeClaim: - claimName: jkube-docker-registry-storage - diff --git a/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties b/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties index befe39a0f7..6f779a78a5 100644 --- a/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties +++ b/openshift-maven-plugin/it/src/it/volume-enricher-custom-storage-class/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=kubernetes +invoker.mavenOpts=-Djkube.verbose invoker.debug=false diff --git a/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/expected/kubernetes.yml b/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/expected/kubernetes.yml deleted file mode 100644 index bae22ac40c..0000000000 --- a/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/expected/kubernetes.yml +++ /dev/null @@ -1,115 +0,0 @@ -# -# Copyright (c) 2019 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at: -# -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -# - ---- -apiVersion: v1 -kind: List -items: -- apiVersion: v1 - kind: Service - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - expose: "true" - name: jkube-docker-registry - spec: - ports: - - port: 80 - protocol: TCP - targetPort: 5000 - selector: - app: jkube-docker-registry - provider: jkube - group: org.eclipse.jkube.devops.apps -- apiVersion: v1 - kind: PersistentVolumeClaim - metadata: - labels: - app: volume-enricher-storage-class-835 - provider: jkube - version: 0.1-SNAPSHOT - group: org.eclipse.jkube - name: jkube-docker-registry-storage - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 5Gi -- apiVersion: extensions/v1beta1 - kind: Deployment - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - name: jkube-docker-registry - spec: - replicas: 1 - revisionHistoryLimit: 2 - selector: - matchLabels: - provider: jkube - app: volume-enricher-storage-class-835 - group: org.eclipse.jkube.devops.apps - template: - metadata: - labels: - provider: jkube - app: volume-enricher-storage-class-835 - version: 0.1-SNAPSHOT - group: org.eclipse.jkube.devops.apps - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - image: registry:2 - imagePullPolicy: IfNotPresent - name: jkube-docker-registry - ports: - - containerPort: 5000 - name: http - resources: - limits: - cpu: "0" - memory: "0" - requests: - cpu: "0" - memory: "0" - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - readOnly: false - initContainers: - - command: - - chmod - - "777" - - /var/lib/registry - image: busybox - imagePullPolicy: IfNotPresent - name: jkube-volume-permission - volumeMounts: - - mountPath: /var/lib/registry - name: jkube-docker-registry-storage - volumes: - - name: jkube-docker-registry-storage - persistentVolumeClaim: - claimName: jkube-docker-registry-storage diff --git a/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties b/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties index 817aa3da89..c8a1aa3319 100644 --- a/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties +++ b/openshift-maven-plugin/it/src/it/volume-enricher-storage-class-835/invoker.properties @@ -13,5 +13,5 @@ # invoker.goals.1=clean oc:resource -invoker.mavenOpts=-Djkube.verbose -Djkube.mode=openshift +invoker.mavenOpts=-Djkube.verbose invoker.debug=false \ No newline at end of file diff --git a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java index bea7af458a..2d75be739e 100644 --- a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java +++ b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java @@ -27,7 +27,7 @@ import java.util.List; -import static org.eclipse.jkube.kit.config.resource.RuntimeMode.kubernetes; +import static org.eclipse.jkube.kit.config.resource.RuntimeMode.KUBERNETES; /** * Builds the docker images configured for this project via a Docker or S2I binary build. @@ -37,12 +37,6 @@ @Mojo(name = "build", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.COMPILE) public class OpenshiftBuildMojo extends BuildMojo { - /** - * Whether to perform a Kubernetes build (i.e. against a vanilla Docker daemon) or - * an OpenShift build (with a Docker build against the OpenShift API server. - */ - @Parameter(name="mode", property = "jkube.mode") - protected RuntimeMode configuredRuntimeMode = RuntimeMode.DEFAULT; /** * OpenShift build mode when an OpenShift build is performed. @@ -75,16 +69,16 @@ public class OpenshiftBuildMojo extends BuildMojo { @Override protected boolean isDockerAccessRequired() { - return runtimeMode == kubernetes; + return runtimeMode == KUBERNETES; } @Override public RuntimeMode getConfiguredRuntimeMode() { - return configuredRuntimeMode; + return RuntimeMode.OPENSHIFT; } public List customizeConfig(List configs) { - if (runtimeMode == RuntimeMode.openshift) { + if (runtimeMode == RuntimeMode.OPENSHIFT) { log.info("Using [[B]]OpenShift[[B]] build with strategy [[B]]%s[[B]]", buildStrategy.getLabel()); } return super.customizeConfig(configs); @@ -110,17 +104,4 @@ protected String getLogPrefix() { return OpenShift.DEFAULT_LOG_PREFIX; } - /** - * Sets the configured {@link RuntimeMode} to be considered when resolving the effective runtime mode. - * - *

n.b this is a workaround for {@code @Parameter(name="mode")} being ignored - * - * @see MPLUGINTESTING-56 - * @see maven-annotation-api-parameter-name-method-seems-to-not-work - * - * @param mode configured RuntimeMode - */ - public void setMode(RuntimeMode mode) { - configuredRuntimeMode = mode; - } } diff --git a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftResourceMojo.java b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftResourceMojo.java index 20ac91fe0a..4d6829f365 100644 --- a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftResourceMojo.java +++ b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftResourceMojo.java @@ -13,12 +13,14 @@ */ package org.eclipse.jkube.maven.plugin.mojo.build; +import org.apache.maven.plugins.annotations.Parameter; import org.eclipse.jkube.kit.common.util.ResourceClassifier; import org.eclipse.jkube.kit.config.resource.PlatformMode; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; +import org.eclipse.jkube.kit.config.resource.RuntimeMode; import org.eclipse.jkube.maven.plugin.mojo.OpenShift; /** @@ -28,6 +30,48 @@ @Mojo(name = "resource", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) public class OpenshiftResourceMojo extends ResourceMojo { + /** + * The OpenShift deploy timeout in seconds: + * See this issue for background of why for end users on slow wifi on their laptops + * DeploymentConfigs usually barf: https://github.com/openshift/origin/issues/10531 + * + * Please follow also the discussion at + *

    + *
  • https://github.com/fabric8io/fabric8-maven-plugin/pull/944#discussion_r116962969
    • + *
  • https://github.com/fabric8io/fabric8-maven-plugin/pull/794
    • + *
+ * and the references within it for the reason of this ridiculous long default timeout + * (in short: Its because Docker image download times are added to the deployment time, making + * the default of 10 minutes quite unusable if multiple images are included in the deployment). + */ + @Parameter(property = "jkube.openshift.deployTimeoutSeconds", defaultValue = "3600") + private Long openshiftDeployTimeoutSeconds; + + /** + * If set to true it would set the container image reference to "", this is done to handle weird + * behavior of OpenShift 3.7 in which subsequent rollouts lead to ImagePullErr + * + * Please see discussion at + *
    + *
  • https://github.com/openshift/origin/issues/18406
    • + *
  • https://github.com/fabric8io/fabric8-maven-plugin/issues/1130
    • + *
+ */ + @Parameter(property = "jkube.openshift.trimImageInContainerSpec", defaultValue = "false") + private Boolean trimImageInContainerSpec; + + @Parameter(property = "jkube.openshift.generateRoute", defaultValue = "true") + private Boolean generateRoute; + + @Parameter(property = "jkube.openshift.enableAutomaticTrigger", defaultValue = "true") + private Boolean enableAutomaticTrigger; + + @Parameter(property = "jkube.openshift.imageChangeTrigger", defaultValue = "true") + private Boolean enableImageChangeTrigger; + + @Parameter(property = "jkube.openshift.enrichAllWithImageChangeTrigger", defaultValue = "false") + private Boolean erichAllWithImageChangeTrigger; + @Override protected String getLogPrefix() { return OpenShift.DEFAULT_LOG_PREFIX; @@ -42,4 +86,9 @@ protected PlatformMode getPlatformMode() { protected ResourceClassifier getResourceClassifier() { return ResourceClassifier.OPENSHIFT; } + + @Override + protected RuntimeMode getRuntimeMode() { + return RuntimeMode.OPENSHIFT; + } } diff --git a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/OpenshiftWatchMojo.java b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/OpenshiftWatchMojo.java index d74d4ddd69..867dd9ef67 100644 --- a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/OpenshiftWatchMojo.java +++ b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/OpenshiftWatchMojo.java @@ -41,13 +41,6 @@ @Execute(goal = "deploy") public class OpenshiftWatchMojo extends WatchMojo { - /** - * Whether to perform a Kubernetes build (i.e. against a vanilla Docker daemon) or - * an OpenShift build (with a Docker build against the OpenShift API server. - */ - @Parameter(property = "jkube.mode") - protected RuntimeMode configuredRuntimeMode = RuntimeMode.DEFAULT; - /** * OpenShift build mode when an OpenShift build is performed. * Can be either "s2i" for an s2i binary build mode or "docker" for a binary @@ -64,7 +57,7 @@ public class OpenshiftWatchMojo extends WatchMojo { @Override public RuntimeMode getConfiguredRuntimeMode() { - return configuredRuntimeMode; + return RuntimeMode.OPENSHIFT; } @Override diff --git a/quickstarts/kit/docker-image/pom.xml b/quickstarts/kit/docker-image/pom.xml index 9526fbceaa..8b7b3af344 100644 --- a/quickstarts/kit/docker-image/pom.xml +++ b/quickstarts/kit/docker-image/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jkube.quickstarts.kit docker-image - 1.0.0-alpha-4 + 1.0.0-SNAPSHOT Eclipse JKube :: Quickstarts :: Kit :: Docker Image jar diff --git a/quickstarts/kit/docker-image/src/main/java/org/eclipse/jkube/quickstart/kit/docker/Main.java b/quickstarts/kit/docker-image/src/main/java/org/eclipse/jkube/quickstart/kit/docker/Main.java index 9fe5b15adc..c9035b555c 100644 --- a/quickstarts/kit/docker-image/src/main/java/org/eclipse/jkube/quickstart/kit/docker/Main.java +++ b/quickstarts/kit/docker-image/src/main/java/org/eclipse/jkube/quickstart/kit/docker/Main.java @@ -77,7 +77,7 @@ public static void main(String[] args) { JKubeServiceHub jKubeServiceHub = JKubeServiceHub.builder() .log(kitLogger) .configuration(configuration) - .platformMode(RuntimeMode.kubernetes) + .platformMode(RuntimeMode.KUBERNETES) .dockerServiceHub(serviceHub) .buildServiceConfig(dockerBuildServiceConfig) .build()) {