-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36115 from iocanel/fix-36089-init-task-serviceacc…
…ount User provided ServiceAccount always takes precedence over extensions
- Loading branch information
Showing
4 changed files
with
159 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...kus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithFlywayInitBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import io.fabric8.kubernetes.api.model.HasMetadata; | ||
| import io.fabric8.kubernetes.api.model.apps.Deployment; | ||
| import io.fabric8.kubernetes.api.model.batch.v1.Job; | ||
| import io.fabric8.kubernetes.api.model.rbac.RoleBinding; | ||
|
|
||
| public class KubernetesWithFlywayInitBase { | ||
|
|
||
| public void assertGeneratedResources(Path kubernetesDir, String name, String imagePullSecret, String serviceAccount) | ||
| throws IOException { | ||
| assertThat(kubernetesDir) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json")) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml")); | ||
| List<HasMetadata> kubernetesList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("kubernetes.yml")); | ||
|
|
||
| Optional<Deployment> deployment = kubernetesList.stream() | ||
| .filter(d -> "Deployment".equals(d.getKind()) | ||
| && name.equals(d.getMetadata().getName())) | ||
| .map(d -> (Deployment) d).findAny(); | ||
|
|
||
| assertTrue(deployment.isPresent()); | ||
| assertThat(deployment).satisfies(j -> j.isPresent()); | ||
| assertThat(deployment.get()).satisfies(d -> { | ||
| assertThat(d.getMetadata()).satisfies(m -> { | ||
| assertThat(m.getName()).isEqualTo(name); | ||
| }); | ||
|
|
||
| assertThat(d.getSpec()).satisfies(deploymentSpec -> { | ||
| assertThat(deploymentSpec.getTemplate()).satisfies(t -> { | ||
| assertThat(t.getSpec()).satisfies(podSpec -> { | ||
| assertThat(podSpec.getImagePullSecrets()).singleElement() | ||
| .satisfies(s -> assertThat(s.getName()).isEqualTo(imagePullSecret)); | ||
| assertThat(podSpec.getServiceAccountName()).isEqualTo(serviceAccount); | ||
| assertThat(podSpec.getInitContainers()).singleElement().satisfies(container -> { | ||
| assertThat(container.getName()).isEqualTo("init"); | ||
| assertThat(container.getImage()).isEqualTo("groundnuty/k8s-wait-for:no-root-v1.7"); | ||
| }); | ||
|
|
||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| Optional<Job> job = kubernetesList.stream() | ||
| .filter(j -> "Job".equals(j.getKind()) && (name + "-flyway-init").equals(j.getMetadata().getName())) | ||
| .map(j -> (Job) j) | ||
| .findAny(); | ||
| assertTrue(job.isPresent()); | ||
|
|
||
| assertThat(job.get()).satisfies(j -> { | ||
| assertThat(j.getSpec()).satisfies(jobSpec -> { | ||
| assertThat(jobSpec.getCompletionMode()).isEqualTo("NonIndexed"); | ||
| assertThat(jobSpec.getTemplate()).satisfies(t -> { | ||
| assertThat(t.getSpec()).satisfies(podSpec -> { | ||
| assertThat(podSpec.getImagePullSecrets()).singleElement() | ||
| .satisfies(s -> assertThat(s.getName()).isEqualTo(imagePullSecret)); | ||
| assertThat(podSpec.getServiceAccountName()).isEqualTo(serviceAccount); | ||
| assertThat(podSpec.getRestartPolicy()).isEqualTo("OnFailure"); | ||
| assertThat(podSpec.getContainers()).singleElement().satisfies(container -> { | ||
| assertThat(container.getName()).isEqualTo(name + "-flyway-init"); | ||
| assertThat(container.getEnv()).filteredOn(env -> "QUARKUS_FLYWAY_ENABLED".equals(env.getName())) | ||
| .singleElement().satisfies(env -> { | ||
| assertThat(env.getValue()).isEqualTo("true"); | ||
| }); | ||
| assertThat(container.getEnv()) | ||
| .filteredOn(env -> "QUARKUS_INIT_AND_EXIT".equals(env.getName())).singleElement() | ||
| .satisfies(env -> { | ||
| assertThat(env.getValue()).isEqualTo("true"); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| Optional<RoleBinding> roleBinding = kubernetesList.stream().filter( | ||
| r -> r instanceof RoleBinding && (name + "-view-jobs").equals(r.getMetadata().getName())) | ||
| .map(r -> (RoleBinding) r).findFirst(); | ||
| assertTrue(roleBinding.isPresent()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...est/java/io/quarkus/it/kubernetes/KubernetesWithFlywayIntAndCustomServiceAccountTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Arrays; | ||
|
|
||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import io.quarkus.bootstrap.model.AppArtifact; | ||
| import io.quarkus.builder.Version; | ||
| import io.quarkus.test.ProdBuildResults; | ||
| import io.quarkus.test.ProdModeTestResults; | ||
| import io.quarkus.test.QuarkusProdModeTest; | ||
|
|
||
| public class KubernetesWithFlywayIntAndCustomServiceAccountTest extends KubernetesWithFlywayInitBase { | ||
|
|
||
| private static final String NAME = "kubernetes-with-flyway"; | ||
| private static final String IMAGE_PULL_SECRET = "my-pull-secret"; | ||
| private static final String SERVICE_ACCOUNT = "my-service-account"; | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
| .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class)) | ||
| .setApplicationName(NAME) | ||
| .setApplicationVersion("0.1-SNAPSHOT") | ||
| .setLogFileName("k8s.log") | ||
| .overrideConfigKey("quarkus.kubernetes.image-pull-secrets", IMAGE_PULL_SECRET) | ||
| .overrideConfigKey("quarkus.kubernetes.service-account", SERVICE_ACCOUNT) | ||
| .setForcedDependencies(Arrays.asList( | ||
| new AppArtifact("io.quarkus", "quarkus-kubernetes", Version.getVersion()), | ||
| new AppArtifact("io.quarkus", "quarkus-flyway", Version.getVersion()))); | ||
|
|
||
| @ProdBuildResults | ||
| private ProdModeTestResults prodModeTestResults; | ||
|
|
||
| @Test | ||
| public void assertGeneratedResources() throws IOException { | ||
| final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes"); | ||
| assertGeneratedResources(kubernetesDir, NAME, IMAGE_PULL_SECRET, SERVICE_ACCOUNT); | ||
| } | ||
| } |