fix: render build git-credentials only if secretName specified (#2062)

Author: j-zimnowoda

charts/team-ns/templates/builds/buildpack.yaml

@@ -116,13 +116,17 @@ spec:
                 requests:
                   storage: 1Gi
             status: {}
+        {{- if .externalRepo}}
+          {{- if .secretName }}
         - name: git-credentials
           secret:
-            {{- if .externalRepo }}
             secretName: {{ .secretName }}
-            {{- else }}
+          {{- end }}
+        {{- else }}
+        - name: git-credentials
+          secret:
             secretName: gitea-credentials
-            {{- end }}
+        {{- end }}
         - name: docker-credentials
           secret:
             secretName: harbor-pushsecret-builds
@@ -156,13 +160,17 @@ spec:
           requests:
             storage: 1Gi
       status: {}
+  {{- if .externalRepo}}
+    {{- if .secretName }}
   - name: git-credentials
     secret:
-      {{- if .externalRepo }}
       secretName: {{ .secretName }}
-      {{- else }}
+    {{- end }}
+  {{- else }}
+  - name: git-credentials
+    secret:
       secretName: gitea-credentials
-      {{- end }}
+  {{- end }}
   - name: docker-credentials
     secret:
       secretName: harbor-pushsecret-builds

charts/team-ns/templates/builds/docker.yaml

@@ -114,13 +114,17 @@ spec:
                 requests:
                   storage: 1Gi
             status: {}
+        {{- if .externalRepo}}
+          {{- if .secretName }}
         - name: git-credentials
           secret:
-            {{- if .externalRepo }}
             secretName: {{ .secretName }}
-            {{- else }}
+          {{- end }}
+        {{- else }}
+        - name: git-credentials
+          secret:
             secretName: gitea-credentials
-            {{- end }}
+        {{- end }}
         - name: docker-credentials
           secret:
             secretName: harbor-pushsecret-builds
@@ -154,13 +158,17 @@ spec:
           requests:
             storage: 1Gi
       status: {}
+  {{- if .externalRepo}}
+    {{- if .secretName }}
   - name: git-credentials
     secret:
-      {{- if .externalRepo }}
       secretName: {{ .secretName }}
-      {{- else }}
+    {{- end }}
+  {{- else }}
+  - name: git-credentials
+    secret:
       secretName: gitea-credentials
-      {{- end }}
+  {{- end }}
   - name: docker-credentials
     secret:
       secretName: harbor-pushsecret-builds

tests/fixtures/env/teams/demo/builds/demo-ext-repo-buildpacks-public-trigger.yaml

@@ -0,0 +1,22 @@
+kind: AplTeamBuild
+metadata:
+    name: demo-ext-repo-buildpacks-public-trigger
+    labels:
+        apl.io/teamId: demo
+spec:
+    externalRepo: false
+    mode:
+        buildpacks:
+            envVars:
+                - name: TEST1
+                  value: test1
+                - name: TEST2
+                  value: test2
+            path: apps/java-maven
+            repoUrl: https://github.com/buildpacks/samples
+            revision: HEAD
+        type: buildpacks
+    imageName: demo-java2
+    scanSource: false
+    tag: v0.0.1
+    trigger: true

tests/fixtures/env/teams/demo/builds/demo-ext-repo-private-trigger.yaml

@@ -0,0 +1,18 @@
+kind: AplTeamBuild
+metadata:
+    name: demo-ext-repo-private-trigger
+    labels:
+        apl.io/teamId: demo
+spec:
+    externalRepo: true
+    secretName: demo-ext-repo-private
+    mode:
+        docker:
+            path: ./Dockerfile
+            repoUrl: https://github.com/buildpacks/samples
+            revision: HEAD
+        type: docker
+    imageName: demo-java1
+    scanSource: true
+    tag: v0.0.1
+    trigger: true

tests/fixtures/env/teams/demo/builds/demo-ext-repo-private.yaml

@@ -0,0 +1,18 @@
+kind: AplTeamBuild
+metadata:
+    name: demo-ext-repo-private
+    labels:
+        apl.io/teamId: demo
+spec:
+    externalRepo: true
+    secretName: demo-ext-repo-private
+    mode:
+        docker:
+            path: ./Dockerfile
+            repoUrl: https://github.com/buildpacks/samples
+            revision: HEAD
+        type: docker
+    imageName: demo-java1
+    scanSource: true
+    tag: v0.0.1
+    trigger: false

tests/fixtures/env/teams/demo/builds/demo-ext-repo-public-trigger.yaml

@@ -0,0 +1,17 @@
+kind: AplTeamBuild
+metadata:
+    name: demo-ext-repo-public-trigger
+    labels:
+        apl.io/teamId: demo
+spec:
+    externalRepo: true
+    mode:
+        docker:
+            path: ./Dockerfile
+            repoUrl: https://github.com/buildpacks/samples
+            revision: HEAD
+        type: docker
+    imageName: demo-java1
+    scanSource: true
+    tag: v0.0.1
+    trigger: true

tests/fixtures/env/teams/demo/builds/demo-ext-repo-public.yaml

@@ -0,0 +1,17 @@
+kind: AplTeamBuild
+metadata:
+    name: demo-ext-repo-public
+    labels:
+        apl.io/teamId: demo
+spec:
+    externalRepo: true
+    mode:
+        docker:
+            path: ./Dockerfile
+            repoUrl: https://github.com/buildpacks/samples
+            revision: HEAD
+        type: docker
+    imageName: demo-java1
+    scanSource: true
+    tag: v0.0.1
+    trigger: false