fix (gradle-plugin) : OpenShiftExtension should pick up `jkube.build.…

…pushSecret` property (#2414) Add getOpenshiftPushSecretOrDefault method in OpenShiftExtension to pick up configuration value from property if it's not provided in groovy dsl Signed-off-by: Rohan Kumar <[email protected]>
eclipse-jkube · Oct 6, 2023 · 767bde0 · 767bde0
1 parent d9e23dc
commit 767bde0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ Usage:
 * Fix #2393: Remove timestamp from `org.label-schema.build-date` LABEL to utilize docker cache
 * Fix #2399: Helm no longer generates default function; broadens support for different value types
 * Fix #2400: Helm supports complex values in `values.yaml` fragments (such as annotations or arrays)
+* Fix #2414: OpenShift Gradle Plugin picks up `jkube.build.pushSecret` property
 
 _**Note**_:
 - Container Images generated using jkube opinionated defaults no longer contain full timestamp in `org.label-schema.build-date` label. The label contains the build date in the format `yyyy-MM-dd`.

diff --git a/...le-plugin/openshift/src/main/java/org/eclipse/jkube/gradle/plugin/OpenShiftExtension.java b/...le-plugin/openshift/src/main/java/org/eclipse/jkube/gradle/plugin/OpenShiftExtension.java
@@ -88,6 +88,10 @@ public String getOpenshiftPullSecretOrDefault() {
     return getOrDefaultString("jkube.build.pullSecret", this::getOpenshiftPullSecret, DEFAULT_OPENSHIFT_PULLSECRET);
   }
 
+  public String getOpenshiftPushSecretOrDefault() {
+    return getOrDefaultString("jkube.build.pushSecret", this::getOpenshiftPushSecret, null);
+  }
+
   public String getS2iBuildNameSuffixOrDefault() {
     return getOrDefaultString("jkube.s2i.buildNameSuffix", this::getS2iBuildNameSuffix, DEFAULT_S2I_BUILDNAME_SUFFIX);
   }

diff --git a/...ugin/openshift/src/main/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftBuildTask.java b/...ugin/openshift/src/main/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftBuildTask.java
@@ -34,7 +34,7 @@ protected BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder
         .openshiftPullSecret(getOpenShiftExtension().getOpenshiftPullSecretOrDefault())
         .s2iBuildNameSuffix(getOpenShiftExtension().getS2iBuildNameSuffixOrDefault())
         .s2iImageStreamLookupPolicyLocal(getOpenShiftExtension().getS2iImageStreamLookupPolicyLocalOrDefault())
-        .openshiftPushSecret(getOpenShiftExtension().getOpenshiftPushSecret().getOrNull())
+        .openshiftPushSecret(getOpenShiftExtension().getOpenshiftPushSecretOrDefault())
         .resourceConfig(getOpenShiftExtension().resources)
         .buildOutputKind(getOpenShiftExtension().getBuildOutputKindOrDefault())
         .enricherTask(e -> {

diff --git a/...enshift/src/test/java/org/eclipse/jkube/gradle/plugin/OpenShiftExtensionPropertyTest.java b/...enshift/src/test/java/org/eclipse/jkube/gradle/plugin/OpenShiftExtensionPropertyTest.java
@@ -56,6 +56,7 @@ static Stream<Arguments> defaultValues() {
     return Stream.of(
         arguments("getBuildStrategyOrDefault", JKubeBuildStrategy.s2i),
         arguments("getOpenshiftPullSecretOrDefault", "pullsecret-jkube"),
+        arguments("getOpenshiftPushSecretOrDefault", null),
         arguments("getS2iBuildNameSuffixOrDefault", "-s2i"),
         arguments("getS2iImageStreamLookupPolicyLocalOrDefault", true),
         arguments("getBuildOutputKindOrDefault", "ImageStreamTag"),
@@ -82,8 +83,8 @@ static Stream<Arguments> propertiesAndValues() {
     return Stream.of(
         arguments("getBuildStrategyOrDefault", "jkube.build.strategy", "jib", JKubeBuildStrategy.jib),
         arguments("getBuildStrategyOrDefault", "jkube.build.strategy", "docker", JKubeBuildStrategy.docker),
-        arguments("getOpenshiftPullSecretOrDefault", "jkube.build.pullSecret", "pullsecret-other", "pullsecret-other",
-            "pullsecret-jkube"),
+        arguments("getOpenshiftPullSecretOrDefault", "jkube.build.pullSecret", "pullsecret-other", "pullsecret-other"),
+        arguments("getOpenshiftPushSecretOrDefault", "jkube.build.pushSecret", "pushsecret-other", "pushsecret-other"),
         arguments("getS2iBuildNameSuffixOrDefault", "jkube.s2i.buildNameSuffix", "-other", "-other"),
         arguments("getS2iImageStreamLookupPolicyLocalOrDefault", "jkube.s2i.imageStreamLookupPolicyLocal", "false", false),
         arguments("getBuildOutputKindOrDefault", "jkube.build.buildOutput.kind", "DockerImage", "DockerImage"),