Skip to content

Commit ee885f9

Browse files
authored
Drop references to vectorized/redpanda image (#9624)
Image is no longer available. Fixes #9621
1 parent 8ce2045 commit ee885f9

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,10 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {
4545

4646
private static final String IMAGE_NAME = "redpandadata/redpanda";
4747

48-
@Deprecated
49-
private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";
50-
5148
private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);
5249

5350
private static final DockerImageName IMAGE = DockerImageName.parse(IMAGE_NAME);
5451

55-
@Deprecated
56-
private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME);
57-
5852
private static final int REDPANDA_PORT = 9092;
5953

6054
private static final int REDPANDA_ADMIN_PORT = 9644;
@@ -82,13 +76,12 @@ public RedpandaContainer(String image) {
8276

8377
public RedpandaContainer(DockerImageName imageName) {
8478
super(imageName);
85-
imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE, IMAGE);
79+
imageName.assertCompatibleWith(REDPANDA_IMAGE, IMAGE);
8680

8781
boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
8882
boolean isPublicCompatibleImage =
8983
REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
90-
IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
91-
REDPANDA_OLD_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart());
84+
IMAGE_NAME.equals(imageName.getUnversionedPart());
9285
if (isPublicCompatibleImage && isLessThanBaseVersion) {
9386
throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
9487
}

modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public CompatibleImageTest(String image) {
1515

1616
@Parameterized.Parameters(name = "{0}")
1717
public static String[] image() {
18-
return new String[] { "docker.redpanda.com/vectorized/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
18+
return new String[] { "docker.redpanda.com/redpandadata/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" };
1919
}
2020

2121
@Test

modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ public void testNotCompatibleVersion() {
6767
.hasMessageContaining("Redpanda version must be >= v22.2.1");
6868
}
6969

70-
@Test
71-
public void vectorizedRedpandaImageVersion2221ShouldNotBeCompatible() {
72-
assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
73-
.isInstanceOf(IllegalArgumentException.class)
74-
.hasMessageContaining("Redpanda version must be >= v22.2.1");
75-
}
76-
7770
@Test
7871
public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
7972
assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))

0 commit comments

Comments
 (0)