Take image-pull-policy config into account for init-containers

Fixes: quarkusio#34125
sberyozkin · Jun 21, 2023 · 1a6a680 · 1a6a680
1 parent 011030a
commit 1a6a680
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java b/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java
@@ -15,6 +15,7 @@ public static Container convert(Map.Entry<String, ContainerConfig> e) {
     private static ContainerBuilder convert(String name, ContainerConfig c) {
         ContainerBuilder b = new ContainerBuilder();
         b.withName(name);
+        b.withImagePullPolicy(c.imagePullPolicy);
         c.image.ifPresent(b::withImage);
         c.workingDir.ifPresent(b::withWorkingDir);
         c.command.ifPresent(w -> b.withCommand(w.toArray(new String[0])));

diff --git a/...src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java b/...src/test/java/io/quarkus/it/kubernetes/KubernetesWithInitContainerResourceLimitsTest.java
@@ -57,6 +57,7 @@ public void assertGeneratedResources() throws IOException {
                                 assertThat(r.getLimits().get("cpu")).isEqualTo(new Quantity("500m"));
                                 assertThat(r.getLimits().get("memory")).isEqualTo(new Quantity("128Mi"));
                             });
+                            assertThat(c.getImagePullPolicy()).isEqualTo("Always");
                         });
 
                     });

diff --git a/...standard-way/src/test/resources/kubernetes-with-init-container-resource-limits.properties b/...standard-way/src/test/resources/kubernetes-with-init-container-resource-limits.properties
@@ -4,4 +4,5 @@ quarkus.kubernetes.init-containers.foo.arguments=-c cp /some/file /somewhere/els
 quarkus.kubernetes.init-containers.foo.resources.requests.cpu=250m
 quarkus.kubernetes.init-containers.foo.resources.requests.memory=64Mi
 quarkus.kubernetes.init-containers.foo.resources.limits.cpu=500m
-quarkus.kubernetes.init-containers.foo.resources.limits.memory=128Mi
+quarkus.kubernetes.init-containers.foo.resources.limits.memory=128Mi
+quarkus.kubernetes.init-containers.foo.image-pull-policy=Always
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ public void assertGeneratedResources() throws IOException { @@
                                     assertThat(r.getLimits().get("cpu")).isEqualTo(new Quantity("500m"));
                                     assertThat(r.getLimits().get("memory")).isEqualTo(new Quantity("128Mi"));
                                 });
+                                assertThat(c.getImagePullPolicy()).isEqualTo("Always");
                             });
                         });
@@ Expand Down @@