feat(halyard): Add support for the new java8 containers

docs/commands.md

@@ -5951,9 +5951,10 @@ This is only required when Spinnaker is being deployed in non-Kubernetes cluster
  * `--git-origin-user`: This is the git user your github fork exists under.
  * `--git-upstream-user`: This is the upstream git user you are configuring to pull changes from & push PRs to.
  * `--image-variant`: The container image variant type to use when deploying a distributed installation of Spinnaker.
-Warning: variants other than the 'slim' one are only available with Spinnaker v1.16+
 	slim: Based on an Alpine image
 	ubuntu: Based on Canonical's ubuntu:bionic image.
+	java8: A variant of slim that uses the Java 8 runtime
+	ubuntu-java8: A variant of ubuntu that uses the Java 8 runtime
 Default value: slim
  * `--liveness-probe-enabled`: When true, enable Kubernetes liveness probes on Spinnaker services deployed in a Distributed installation. See docs for more information: [https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)
  * `--liveness-probe-initial-delay-seconds`: The number of seconds to wait before performing the first liveness probe. Should be set to the longest service startup time. See docs for more information: [https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)

halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/config/EditDeploymentEnvironmentCommand.java

@@ -109,9 +109,10 @@ public class EditDeploymentEnvironmentCommand extends AbstractConfigCommand {
       names = "--image-variant",
       description =
           "The container image variant type to use when deploying a distributed installation of Spinnaker.\n"
-              + "Warning: variants other than the 'slim' one are only available with Spinnaker v1.16+\n"
               + "\tslim: Based on an Alpine image\n"
               + "\tubuntu: Based on Canonical's ubuntu:bionic image.\n"
+              + "\tjava8: A variant of slim that uses the Java 8 runtime\n"
+              + "\tubuntu-java8: A variant of ubuntu that uses the Java 8 runtime\n"
               + "Default value: slim",
       converter = ImageVariantConverter.class)
   private ImageVariant imageVariant;

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/model/v1/node/DeploymentEnvironment.java

@@ -93,7 +93,9 @@ public static Size fromString(String name) {
 
   public enum ImageVariant {
     SLIM("Based on an Alpine image"),
-    UBUNTU("Based on Canonical's ubuntu:bionic image");
+    UBUNTU("Based on Canonical's ubuntu:bionic image"),
+    JAVA8("A variant of SLIM that uses the Java 8 runtime"),
+    UBUNTU_JAVA8("A variant of UBUNTU that uses the Java 8 runtime");
 
     @Getter final String description;
 
@@ -102,17 +104,18 @@ public enum ImageVariant {
     }
 
     public static ImageVariant fromString(String name) {
-      for (ImageVariant variant : values()) {
-        if (variant.toString().equalsIgnoreCase(name)) {
-          return variant;
-        }
+      try {
+        return ImageVariant.valueOf(name.toUpperCase().replace('-', '_'));
+      } catch (IllegalArgumentException e) {
+        throw new IllegalArgumentException(
+            String.format(
+                "ImageVariant \"%s\" is not a valid choice. The options are: %s",
+                name, Arrays.toString(ImageVariant.values())));
       }
+    }
 
-      throw new IllegalArgumentException(
-          "ImageVariant \""
-              + name
-              + "\" is not a valid choice. The options are: "
-              + Arrays.toString(ImageVariant.values()));
+    public String getContainerSuffix() {
+      return name().toLowerCase().replace("_", "-");
     }
   }
 

halyard-deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/distributed/kubernetes/KubernetesService.java

@@ -48,7 +48,7 @@ default String getArtifactId(DeploymentConfiguration deploymentConfiguration) {
       // versions >= 1.16.0
       tag = version;
     } else {
-      tag = String.format("%s-%s", version, imageVariant.toString().toLowerCase());
+      tag = String.format("%s-%s", version, imageVariant.getContainerSuffix());
     }
 
     KubernetesImageDescription image =