test: fix cosign CR filename (#1425)

ratify-project · Apr 30, 2024 · 8c627f0 · 8c627f0
1 parent 9da6842
commit 8c627f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -587,6 +587,7 @@ e2e-helm-deploy-ratify:
 	--set provider.tls.cabundle="$(shell cat ${CERT_DIR}/ca.crt | base64 | tr -d '\n')" \
 	--set notationCerts[0]="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
 	--set cosignKeys[0]="$$(cat .staging/cosign/cosign.pub)" \
+	--set cosign.key="$$(cat .staging/cosign/cosign.pub)" \
 	--set oras.useHttp=true \
 	--set-file dockerConfig="mount_config.json" \
 	--set logger.level=debug
@@ -604,6 +605,7 @@ e2e-helm-deploy-ratify-without-tls-certs:
 	--set gatekeeper.version=${GATEKEEPER_VERSION} \
 	--set featureFlags.RATIFY_CERT_ROTATION=${CERT_ROTATION_ENABLED} \
 	--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
+	--set cosign.key="$$(cat .staging/cosign/cosign.pub)" \
 	--set cosignKeys[0]="$$(cat .staging/cosign/cosign.pub)" \
 	--set oras.useHttp=true \
 	--set-file dockerConfig="mount_config.json" \

diff --git a/charts/ratify/templates/verifier.yaml b/charts/ratify/templates/verifier.yaml
@@ -50,9 +50,7 @@ spec:
   name: cosign
   artifactTypes: application/vnd.dev.cosign.artifact.sig.v1+json
   parameters:
-    {{- if .Values.cosign.key }}
-    key: {{ .Values.cosign.key | quote }}
-    {{- else }}
+    {{- if gt (len .Values.cosignKeys) 0 }}
     trustPolicies:
       - name: default
         version: 1.0.0
@@ -67,6 +65,8 @@ spec:
           {{- if and .Values.azurekeyvault.enabled (gt (len .Values.azurekeyvault.keys) 0) }}
           - provider: {{ $.Release.Namespace }}/kmprovider-akv
           {{- end }}
+    {{- else }}
+    key: {{ .Values.cosign.key | quote }}
     {{- end }}
 {{- end }}
 ---

diff --git a/...config_v1beta_verifier_cosign_legacy.yaml → ...onfig_v1beta1_verifier_cosign_legacy.yaml b/...config_v1beta_verifier_cosign_legacy.yaml → ...onfig_v1beta1_verifier_cosign_legacy.yaml