Fix tests

package/config/setup-namespaces.yml

@@ -138,10 +138,10 @@ metadata:
 secrets:
   #@ if/end is_oci_registry_secret_available():
   - name: #@ data.values.oci_registry.secret.name
-  #@ if/end is_git_secret_available():
-  - name: #@ data.values.git.secret.name
   #@ if/end is_cosign_secret_available():
   - name: #@ data.values.cosign.secret.name
+  #@ if/end is_git_secret_available():
+  - name: #@ data.values.git.secret.name
 imagePullSecrets:
   - name: #@ image_pull_secret_name
   #@ if/end is_oci_registry_secret_available():

test/integration/default/00-prepare.yaml

@@ -0,0 +1,43 @@
+# Namespace
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kadras-packages
+
+#! OCI Registry
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-registry-credentials
+  namespace: kadras-packages
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: e30K
+
+#! Cosign
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-cosign-key-pair
+  namespace: kadras-packages
+stringData:
+  cosign.key: key
+  cosign.password: pass
+  cosign.pub: pub
+
+#! Git
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-git-credentials 
+  namespace: kadras-packages
+stringData:
+  username: user
+  password: pass

test/integration/default/00-assert.yaml → test/integration/default/01-assert.yaml

@@ -7,18 +7,52 @@ metadata:
   annotations:
     kapp.k14s.io/create-strategy: fallback-on-update
 
-#! OCI Registry
+#! Image Pull Placeholder Secret
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: supply-chain-registry-credentials
+  name: canonical-registry-credentials
   namespace: test-default
   annotations:
     secretgen.carvel.dev/image-pull-secret: ""
     kapp.k14s.io/create-strategy: fallback-on-update
 type: kubernetes.io/dockerconfigjson
 
+#! OCI Registry
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-registry-credentials
+  namespace: test-default
+  annotations:
+    kapp.k14s.io/create-strategy: fallback-on-update
+
+#! Cosign
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-cosign-key-pair
+  namespace: test-default
+  annotations:
+    kapp.k14s.io/create-strategy: fallback-on-update
+
+#! Git
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: supply-chain-git-credentials
+  namespace: test-default
+  annotations:
+    tekton.dev/git-0: https://github.com
+    kapp.k14s.io/create-strategy: fallback-on-update
+
 #! RBAC
 ---
 apiVersion: v1
@@ -30,7 +64,10 @@ metadata:
     kapp.k14s.io/create-strategy: fallback-on-update
 secrets:
   - name: supply-chain-registry-credentials
+  - name: supply-chain-cosign-key-pair
+  - name: supply-chain-git-credentials
 imagePullSecrets:
+  - name: canonical-registry-credentials
   - name: supply-chain-registry-credentials
 
 ---

test/integration/default/config/values.yml

@@ -7,8 +7,20 @@ metadata:
 stringData:
   values.yaml: |
     namespaces:
-      - name: test-default     
+      - name: test-default
+ 
     oci_registry:
       secret:
         name: supply-chain-registry-credentials
         namespace: kadras-packages
+
+    cosign:
+      secret:
+        name: supply-chain-cosign-key-pair
+        namespace: kadras-packages
+
+    git:
+      server: https://github.com
+      secret:
+        name: supply-chain-git-credentials
+        namespace: kadras-packages