Remove unused elasticsearch cloud docker image (#115357)

2025-06-28 09:28:55 -04:00 · 2024-10-24 17:58:36 +02:00 · 2024-10-24 17:58:36 +02:00 · 482d2aced5
commit 482d2aced5
parent fb6c729858
13 changed files with 12 additions and 56 deletions
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
@ -21,9 +21,6 @@ public enum DockerBase {
    // The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
    IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),

-    // Base image with extras for Cloud
-    CLOUD("ubuntu:20.04", "-cloud", "apt-get"),
-
    // Chainguard based wolfi image with latest jdk
    // This is usually updated via renovatebot
    // spotless:off
--- a/distribution/docker/build.gradle
+++ b/distribution/docker/build.gradle
@ -288,20 +288,6 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
        }
      }

-      if (base == DockerBase.CLOUD) {
-        // If we're performing a release build, but `build.id` hasn't been set, we can
-        // infer that we're not at the Docker building stage of the build, and therefore
-        // we should skip the beats part of the build.
-        String buildId = providers.systemProperty('build.id').getOrNull()
-        boolean includeBeats = VersionProperties.isElasticsearchSnapshot() == true || buildId != null || useDra
-
-        if (includeBeats) {
-          from configurations.getByName("filebeat_${architecture.classifier}")
-          from configurations.getByName("metricbeat_${architecture.classifier}")
-        }
-        // For some reason, the artifact name can differ depending on what repository we used.
-        rename ~/((?:file|metric)beat)-.*\.tar\.gz$/, "\$1-${VersionProperties.elasticsearch}.tar.gz"
-      }
      Provider<DockerSupportService> serviceProvider = GradleUtils.getBuildService(
        project.gradle.sharedServices,
        DockerSupportPlugin.DOCKER_SUPPORT_SERVICE_NAME
@ -381,7 +367,7 @@ private static List<String> generateTags(DockerBase base, Architecture architect
  String image = "elasticsearch${base.suffix}"

  String namespace = 'elasticsearch'
-  if (base == DockerBase.CLOUD || base == DockerBase.CLOUD_ESS) {
+  if (base == base == DockerBase.CLOUD_ESS) {
    namespace += '-ci'
  }

@ -439,7 +425,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {

    }

-  if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD && base != DockerBase.CLOUD_ESS) {
+  if (base != DockerBase.IRON_BANK && base != DockerBase.CLOUD_ESS) {
    tasks.named("assemble").configure {
      dependsOn(buildDockerImageTask)
    }
@ -548,10 +534,6 @@ subprojects { Project subProject ->
      base = DockerBase.IRON_BANK
    } else if (subProject.name.contains('cloud-ess-')) {
      base = DockerBase.CLOUD_ESS
-    } else if (subProject.name.contains('cloud-')) {
-      base = DockerBase.CLOUD
-    } else if (subProject.name.contains('wolfi-ess')) {
-      base = DockerBase.WOLFI_ESS
    } else if (subProject.name.contains('wolfi-')) {
      base = DockerBase.WOLFI
    }
@ -559,10 +541,9 @@ subprojects { Project subProject ->
    final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
    final String extension = base == DockerBase.UBI ? 'ubi.tar' :
      (base == DockerBase.IRON_BANK ? 'ironbank.tar' :
-        (base == DockerBase.CLOUD ? 'cloud.tar' :
          (base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
            (base == DockerBase.WOLFI ? 'wolfi.tar' :
-                'docker.tar'))))
+                'docker.tar')))
    final String artifactName = "elasticsearch${arch}${base.suffix}_test"

    final String exportTaskName = taskName("export", architecture, base, 'DockerImage')
--- a/distribution/docker/cloud-docker-aarch64-export/build.gradle
+++ b/distribution/docker/cloud-docker-aarch64-export/build.gradle
@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.
--- a/distribution/docker/cloud-docker-export/build.gradle
+++ b/distribution/docker/cloud-docker-export/build.gradle
@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.
--- a/distribution/docker/wolfi-ess-docker-aarch64-export/build.gradle
+++ b/distribution/docker/wolfi-ess-docker-aarch64-export/build.gradle
@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.
--- a/distribution/docker/wolfi-ess-docker-export/build.gradle
+++ b/distribution/docker/wolfi-ess-docker-export/build.gradle
@ -1,2 +0,0 @@
-// This file is intentionally blank. All configuration of the
-// export is done in the parent project.
--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/DockerTests.java
@ -169,10 +169,7 @@ public class DockerTests extends PackagingTestCase {
     * Checks that no plugins are initially active.
     */
    public void test020PluginsListWithNoPlugins() {
-        assumeTrue(
-            "Only applies to non-Cloud images",
-            distribution.packaging != Packaging.DOCKER_CLOUD && distribution().packaging != Packaging.DOCKER_CLOUD_ESS
-        );
+        assumeTrue("Only applies to non-Cloud images", distribution().packaging != Packaging.DOCKER_CLOUD_ESS);

        final Installation.Executables bin = installation.executables();
        final Result r = sh.run(bin.pluginTool + " list");
@ -1116,8 +1113,8 @@ public class DockerTests extends PackagingTestCase {
     */
    public void test171AdditionalCliOptionsAreForwarded() throws Exception {
        assumeTrue(
-            "Does not apply to Cloud and Cloud ESS images, because they don't use the default entrypoint",
-            distribution.packaging != Packaging.DOCKER_CLOUD && distribution().packaging != Packaging.DOCKER_CLOUD_ESS
+            "Does not apply to Cloud ESS images, because they don't use the default entrypoint",
+            distribution().packaging != Packaging.DOCKER_CLOUD_ESS
        );

        runContainer(distribution(), builder().runArgs("bin/elasticsearch", "-Ecluster.name=kimchy").envVar("ELASTIC_PASSWORD", PASSWORD));
@ -1204,7 +1201,7 @@ public class DockerTests extends PackagingTestCase {
     * Check that the Cloud image contains the required Beats
     */
    public void test400CloudImageBundlesBeats() {
-        assumeTrue(distribution.packaging == Packaging.DOCKER_CLOUD || distribution.packaging == Packaging.DOCKER_CLOUD_ESS);
+        assumeTrue(distribution.packaging == Packaging.DOCKER_CLOUD_ESS);

        final List<String> contents = listContents("/opt");
        assertThat("Expected beats in /opt", contents, hasItems("filebeat", "metricbeat"));
--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/KeystoreManagementTests.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/KeystoreManagementTests.java
@ -436,10 +436,7 @@ public class KeystoreManagementTests extends PackagingTestCase {
        switch (distribution.packaging) {
            case TAR, ZIP -> assertThat(keystore, file(File, ARCHIVE_OWNER, ARCHIVE_OWNER, p660));
            case DEB, RPM -> assertThat(keystore, file(File, "root", "elasticsearch", p660));
-            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> assertThat(
-                keystore,
-                DockerFileMatcher.file(p660)
-            );
+            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> assertThat(keystore, DockerFileMatcher.file(p660));
            default -> throw new IllegalStateException("Unknown Elasticsearch packaging type.");
        }
    }
--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java
@ -245,7 +245,7 @@ public abstract class PackagingTestCase extends Assert {
                installation = Packages.installPackage(sh, distribution);
                Packages.verifyPackageInstallation(installation, distribution, sh);
            }
-            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> {
+            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> {
                installation = Docker.runContainer(distribution);
                Docker.verifyContainerInstallation(installation);
            }
@ -335,7 +335,6 @@ public abstract class PackagingTestCase extends Assert {
            case DOCKER:
            case DOCKER_UBI:
            case DOCKER_IRON_BANK:
-            case DOCKER_CLOUD:
            case DOCKER_CLOUD_ESS:
            case DOCKER_WOLFI:
                // nothing, "installing" docker image is running it
@ -358,7 +357,6 @@ public abstract class PackagingTestCase extends Assert {
            case DOCKER:
            case DOCKER_UBI:
            case DOCKER_IRON_BANK:
-            case DOCKER_CLOUD:
            case DOCKER_CLOUD_ESS:
            case DOCKER_WOLFI:
                // nothing, "installing" docker image is running it
@ -373,7 +371,7 @@ public abstract class PackagingTestCase extends Assert {
        switch (distribution.packaging) {
            case TAR, ZIP -> Archives.assertElasticsearchStarted(installation);
            case DEB, RPM -> Packages.assertElasticsearchStarted(sh, installation);
-            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> Docker.waitForElasticsearchToStart();
+            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> Docker.waitForElasticsearchToStart();
            default -> throw new IllegalStateException("Unknown Elasticsearch packaging type.");
        }
    }
--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/Distribution.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/Distribution.java
@ -33,8 +33,6 @@ public class Distribution {
            this.packaging = Packaging.DOCKER_UBI;
        } else if (filename.endsWith(".ironbank.tar")) {
            this.packaging = Packaging.DOCKER_IRON_BANK;
-        } else if (filename.endsWith(".cloud.tar")) {
-            this.packaging = Packaging.DOCKER_CLOUD;
        } else if (filename.endsWith(".cloud-ess.tar")) {
            this.packaging = Packaging.DOCKER_CLOUD_ESS;
        } else if (filename.endsWith(".wolfi.tar")) {
@ -63,7 +61,7 @@ public class Distribution {
     */
    public boolean isDocker() {
        return switch (packaging) {
-            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> true;
+            case DOCKER, DOCKER_UBI, DOCKER_IRON_BANK, DOCKER_CLOUD_ESS, DOCKER_WOLFI -> true;
            default -> false;
        };
    }
@ -77,7 +75,6 @@ public class Distribution {
        DOCKER(".docker.tar", Platforms.isDocker()),
        DOCKER_UBI(".ubi.tar", Platforms.isDocker()),
        DOCKER_IRON_BANK(".ironbank.tar", Platforms.isDocker()),
-        DOCKER_CLOUD(".cloud.tar", Platforms.isDocker()),
        DOCKER_CLOUD_ESS(".cloud-ess.tar", Platforms.isDocker()),
        DOCKER_WOLFI(".wolfi.tar", Platforms.isDocker());

--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java
@ -532,7 +532,7 @@ public class Docker {
                )
            );

-        if (es.distribution.packaging == Packaging.DOCKER_CLOUD || es.distribution.packaging == Packaging.DOCKER_CLOUD_ESS) {
+        if (es.distribution.packaging == Packaging.DOCKER_CLOUD_ESS) {
            verifyCloudContainerInstallation(es);
        }
    }
--- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/DockerRun.java
+++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/DockerRun.java
@ -165,7 +165,6 @@ public class DockerRun {
            case DOCKER -> "";
            case DOCKER_UBI -> "-ubi";
            case DOCKER_IRON_BANK -> "-ironbank";
-            case DOCKER_CLOUD -> "-cloud";
            case DOCKER_CLOUD_ESS -> "-cloud-ess";
            case DOCKER_WOLFI -> "-wolfi";
            default -> throw new IllegalStateException("Unexpected distribution packaging type: " + distribution.packaging);
--- a/settings.gradle
+++ b/settings.gradle
@ -63,8 +63,6 @@ List projects = [
  'distribution:archives:linux-aarch64-tar',
  'distribution:archives:linux-tar',
  'distribution:docker',
-  'distribution:docker:cloud-docker-export',
-  'distribution:docker:cloud-docker-aarch64-export',
  'distribution:docker:cloud-ess-docker-export',
  'distribution:docker:cloud-ess-docker-aarch64-export',
  'distribution:docker:docker-aarch64-export',