Skip to content

Commit 794776d

Browse files
anurag-rajawatmanusa
authored andcommitted
fix(gradle-plugin/k8s): Pick docker credentials from ~/.docker/config.json file (#2290)
Signed-off-by: Anurag Rajawat <[email protected]>
1 parent fcdcbdf commit 794776d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Usage:
2929
* Fix #2219: Kind/Filename mappings include optional apiVersion configuration
3030
* Fix #2224: Quarkus native base image read from properties (configurable)
3131
* Fix #2228: Quarkus native base image uses UBI 8.7
32+
* Fix #2290: JKube is not picking docker credentials from `~/.docker/config.json` file
3233
* Fix #2302 Bump Kubernetes Client version to 6.8.0
3334

3435
### 1.13.1 (2023-06-16)

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/KubernetesExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ public boolean getForcePullOrDefault() {
604604
}
605605

606606
public String getRegistryOrDefault() {
607-
return getOrDefaultString("jkube.docker.registry", this::getRegistry, "docker.io");
607+
return getOrDefaultString("jkube.docker.registry", this::getRegistry, null);
608608
}
609609

610610
public String getBuildRecreateOrDefault() {

gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/KubernetesExtensionPropertyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ static Stream<Arguments> defaultValues() {
9595
arguments("getCertPathOrNull", null),
9696
arguments("getSkipMachineOrDefault", false),
9797
arguments("getForcePullOrDefault", false),
98-
arguments("getRegistryOrDefault", "docker.io"),
99-
arguments("getPullRegistryOrDefault", "docker.io"),
98+
arguments("getRegistryOrDefault", null),
99+
arguments("getPullRegistryOrDefault", null),
100100
arguments("getBuildSourceDirectoryOrDefault", "src/main/docker"),
101101
arguments("getBuildOutputDirectoryOrDefault", "build/docker"),
102102
arguments("getResourceSourceDirectoryOrDefault", BASE.toPath().resolve(Paths.get("src", "main", "jkube")).toFile()),

0 commit comments

Comments
 (0)