Skip to content

Drop references to vectorized/redpanda image #9624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Drop references to vectorized/redpanda image #9624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,10 @@ public class RedpandaContainer extends GenericContainer<RedpandaContainer> {

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

@Deprecated
private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda";

private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME);

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

@Deprecated
private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME);

private static final int REDPANDA_PORT = 9092;

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

public RedpandaContainer(DockerImageName imageName) {
super(imageName);
imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE, IMAGE);
imageName.assertCompatibleWith(REDPANDA_IMAGE, IMAGE);

boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1");
boolean isPublicCompatibleImage =
REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
IMAGE_NAME.equals(imageName.getUnversionedPart()) ||
REDPANDA_OLD_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart());
IMAGE_NAME.equals(imageName.getUnversionedPart());
if (isPublicCompatibleImage && isLessThanBaseVersion) {
throw new IllegalArgumentException("Redpanda version must be >= v22.2.1");
}
Expand Down
2 changes: 1 addition & 1 deletion modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public CompatibleImageTest(String image) {

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

@Test
Expand Down
7 changes: 0 additions & 7 deletions modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ public void testNotCompatibleVersion() {
.hasMessageContaining("Redpanda version must be >= v22.2.1");
}

@Test
public void vectorizedRedpandaImageVersion2221ShouldNotBeCompatible() {
assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Redpanda version must be >= v22.2.1");
}

@Test
public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() {
assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))
Expand Down
Loading