Merge pull request #37349 from iocanel/remove-base-openshift-images

Remove OpenshiftBaseXXXImage classes
quarkusio · Dec 7, 2023 · 018e8e4 · 018e8e4
2 parents 2899905 + f6f8626
commit 018e8e4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 177 deletions.
diff --git a/...src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseJavaImage.java b/...src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseJavaImage.java
diff --git a/...c/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseNativeImage.java b/...c/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseNativeImage.java
diff --git a/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
@@ -146,24 +146,14 @@ public void openshiftRequirementsJvm(ContainerImageOpenshiftConfig openshiftConf
         boolean hasCustomJvmArguments = config.jvmArguments.isPresent();
 
         builderImageProducer.produce(new BaseImageInfoBuildItem(baseJvmImage));
-        Optional<OpenshiftBaseJavaImage> baseImage = OpenshiftBaseJavaImage.findMatching(baseJvmImage);
 
         if (config.buildStrategy == BuildStrategy.BINARY) {
             // Jar directory priorities:
             // 1. explicitly specified by the user.
-            // 2. detected via OpenshiftBaseJavaImage
             // 3. fallback value
-            String jarDirectory = config.jarDirectory
-                    .orElse(baseImage.map(i -> i.getJarDirectory()).orElse(config.FALLBACK_JAR_DIRECTORY));
+            String jarDirectory = config.jarDirectory.orElse(config.FALLBACK_JAR_DIRECTORY);
             String pathToJar = concatUnixPaths(jarDirectory, jarFileName);
 
-            // If the image is known, we can define env vars for classpath, jar, lib etc.
-            baseImage.ifPresent(b -> {
-                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJarEnvVar(), pathToJar, null));
-                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJvmOptionsEnvVar(),
-                        String.join(" ", config.getEffectiveJvmArguments()), null));
-            });
-
             //In all other cases its the responsibility of the image to set those up correctly.
             if (hasCustomJarPath || hasCustomJvmArguments) {
                 List<String> cmd = new ArrayList<>();
@@ -172,8 +162,6 @@ public void openshiftRequirementsJvm(ContainerImageOpenshiftConfig openshiftConf
                 cmd.addAll(Arrays.asList("-jar", pathToJar));
                 envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(JAVA_APP_JAR, pathToJar, null));
                 commandProducer.produce(KubernetesCommandBuildItem.command(cmd));
-            } else if (baseImage.isEmpty()) {
-                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(JAVA_APP_JAR, pathToJar, null));
             }
         }
     }
@@ -209,26 +197,12 @@ public void openshiftRequirementsNative(ContainerImageOpenshiftConfig openshiftC
 
         if (config.buildStrategy == BuildStrategy.BINARY) {
             builderImageProducer.produce(new BaseImageInfoBuildItem(config.baseNativeImage));
-            Optional<OpenshiftBaseNativeImage> baseImage = OpenshiftBaseNativeImage.findMatching(config.baseNativeImage);
             // Native binary directory priorities:
             // 1. explicitly specified by the user.
-            // 2. detected via OpenshiftBaseNativeImage
-            // 3. fallback value
+            // 2. fallback vale
 
-            String nativeBinaryDirectory = config.nativeBinaryDirectory
-                    .orElse(baseImage.map(i -> i.getNativeBinaryDirectory()).orElse(config.FALLBACK_NATIVE_BINARY_DIRECTORY));
+            String nativeBinaryDirectory = config.nativeBinaryDirectory.orElse(config.FALLBACK_NATIVE_BINARY_DIRECTORY);
             String pathToNativeBinary = concatUnixPaths(nativeBinaryDirectory, nativeBinaryFileName);
-
-            baseImage.ifPresent(b -> {
-                envProducer.produce(
-                        KubernetesEnvBuildItem.createSimpleVar(b.getHomeDirEnvVar(), nativeBinaryDirectory, OPENSHIFT));
-                config.nativeArguments.ifPresent(nativeArguments -> {
-                    envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(),
-                            String.join(" ", nativeArguments), OPENSHIFT));
-                });
-
-            });
-
             if (hasCustomNativePath || hasCustomNativeArguments) {
                 commandProducer
                         .produce(KubernetesCommandBuildItem.commandWithArgs(pathToNativeBinary, config.nativeArguments.get()));

diff --git a/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
@@ -86,11 +86,6 @@ public void assertGeneratedResources() throws IOException {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_APP_JAR");
                                 //assertThat(envVar.getValue()).isEqualTo("/deployments/quarkus-run.jar"); // this is flaky
                             });
-                            assertThat(envVars).anySatisfy(envVar -> {
-                                assertThat(envVar.getName()).isEqualTo("JAVA_OPTIONS");
-                                assertThat(envVar.getValue())
-                                        .contains("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
-                            });
                         });
                     });