Skip to content
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

Remove invalid imagePushSecret from BuildConfig when using internal registry #35695

Merged
merged 1 commit into from
Sep 4, 2023
Merged

Remove invalid imagePushSecret from BuildConfig when using internal registry #35695

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
13 changes: 9 additions & 4 deletions ...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,26 @@ public void configureExternalRegistry(ApplicationInfoBuildItem applicationInfo,
containerImageInfo.registry.ifPresent(registry -> {
final String name = applicationInfo.getName();
final String serviceAccountName = applicationInfo.getName();
String imagePushSecret = openshiftConfig.imagePushSecret.orElse(applicationInfo.getName() + "-push-secret");
String repositoryWithRegistry = registry + "/" + containerImageInfo.getRepository();

if (registry.contains(OPENSHIFT_INTERNAL_REGISTRY)) {
if (openshiftConfig.imagePushSecret.isPresent()) {
//if a push secret has been specified, we need to apply it.
String imagePushSecret = openshiftConfig.imagePushSecret.get();
decorator.produce(new DecoratorBuildItem(OPENSHIFT, new ApplyDockerImageOutputToBuildConfigDecorator(
applicationInfo.getName(), containerImageInfo.getImage(), imagePushSecret)));
} else if (registry.contains(OPENSHIFT_INTERNAL_REGISTRY)) {
//no special handling of secrets is really needed.
} else if (containerImageInfo.username.isPresent() && containerImageInfo.password.isPresent()) {
String imagePushSecret = applicationInfo.getName() + "-push-secret";
decorator.produce(new DecoratorBuildItem(OPENSHIFT,
new AddDockerConfigJsonSecretDecorator(imagePushSecret, containerImageInfo.registry.get(),
containerImageInfo.username.get(), containerImageInfo.password.get())));
decorator.produce(new DecoratorBuildItem(OPENSHIFT, new ApplyDockerImageOutputToBuildConfigDecorator(
applicationInfo.getName(), containerImageInfo.getImage(), imagePushSecret)));
} else {
LOG.warn("An external image registry has been specified, but no push secret or credentials.");
}

decorator.produce(new DecoratorBuildItem(OPENSHIFT, new ApplyDockerImageOutputToBuildConfigDecorator(
applicationInfo.getName(), containerImageInfo.getImage(), imagePushSecret)));
decorator.produce(new DecoratorBuildItem(OPENSHIFT,
new ApplyDockerImageRepositoryToImageStream(applicationInfo.getName(), repositoryWithRegistry)));
});
Expand Down
50 changes: 50 additions & 0 deletions ...tandard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithInternalRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package io.quarkus.it.kubernetes;

import static org.assertj.core.api.Assertions.assertThat;

import java.io.IOException;
import java.nio.file.Path;
import java.util.List;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.openshift.api.model.BuildConfig;
import io.quarkus.builder.Version;
import io.quarkus.maven.dependency.Dependency;
import io.quarkus.test.ProdBuildResults;
import io.quarkus.test.ProdModeTestResults;
import io.quarkus.test.QuarkusProdModeTest;

public class OpenshiftWithInternalRegistryTest extends BaseOpenshiftWithRemoteRegistry {

private static final String APP_NAME = "openshift-with-internal-registry";

@RegisterExtension
static final QuarkusProdModeTest config = new QuarkusProdModeTest()
.withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class))
.setApplicationName(APP_NAME)
.setApplicationVersion("0.1-SNAPSHOT")
.overrideConfigKey("quarkus.container-image.group", "project")
.overrideConfigKey("quarkus.container-image.registry", "quay.io")
.overrideConfigKey("quarkus.openshift.generate-image-pull-secret", "true")
.setForcedDependencies(List.of(Dependency.of("io.quarkus", "quarkus-openshift", Version.getVersion())));

@ProdBuildResults
private ProdModeTestResults prodModeTestResults;

@Test
public void assertGeneratedResources() throws IOException {
Path buildDir = prodModeTestResults.getBuildDir();
List<HasMetadata> resourceList = getResources("openshift", buildDir);
assertThat(resourceList).filteredOn(h -> "BuildConfig".equals(h.getKind())).singleElement().satisfies(h -> {
assertThat(h.getMetadata()).satisfies(m -> {
assertThat(m.getName()).isEqualTo(APP_NAME);
});
assertThat(h).isInstanceOfSatisfying(BuildConfig.class, b -> {
assertThat(b.getSpec().getOutput().getPushSecret()).isNull();
});
});
}
}