Skip to content

Commit

Permalink
Merge pull request #908 from lcarva/HACBS-2400
Browse files Browse the repository at this point in the history
  • Loading branch information
zregvart authored Aug 8, 2023
2 parents dc207d9 + 7409084 commit c9aa614
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion configs/default/policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Use the policy rules from the "minimal" collection. This and other collections are defined in
https://enterprisecontract.dev/docs/ec-policies/release_policy.html#_available_rule_collections
publicKey: "k8s://tekton-chains/public-key"
publicKey: "k8s://openshift-pipelines/public-key"

sources:
- name: Default
Expand Down
2 changes: 1 addition & 1 deletion configs/everything/policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Identical to the default configuration, but use every rule instead of just the rules
in the minimal collection.
publicKey: "k8s://tekton-chains/public-key"
publicKey: "k8s://openshift-pipelines/public-key"

sources:
- name: Everything
Expand Down
2 changes: 1 addition & 1 deletion configs/slsa3/policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: >
two and three of the SLSA v0.1 specification. The minimal and slsa collections are defined in
https://enterprisecontract.dev/docs/ec-policies/release_policy.html#_available_rule_collections
publicKey: "k8s://tekton-chains/public-key"
publicKey: "k8s://openshift-pipelines/public-key"

sources:
- name: Default
Expand Down
2 changes: 1 addition & 1 deletion hack/rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ echo "${IMAGES}" > "${HACK_DIR}/images.txt"
cat <<< "$(jq --rawfile images <(echo "$IMAGES") '.components |= [$images | capture("(?<containerImage>.*\/(?<name>.*)@.*)";"g")]' "${HACK_DIR}/application_snapshot.json")" > "${HACK_DIR}/application_snapshot.json"

# update cosign public key
kubectl get secret -n tekton-chains signing-secrets -o jsonpath='{.data.cosign\.pub}'|base64 -d > "${HACK_DIR}/work/cosign.pub"
kubectl get secret -n openshift-pipelines signing-secrets -o jsonpath='{.data.cosign\.pub}'|base64 -d > "${HACK_DIR}/work/cosign.pub"
5 changes: 1 addition & 4 deletions hack/simple-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ components:
# The key defined here should work, but if it doesn't then you can get a fresh one from the cluster:
# - Visit https://oauth-openshift.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/oauth/token/request
# - Authenticate and get a token, then use the oc login to authenticate
# - kubectl get -n tekton-chains secret public-key -o json | jq -r '.data."cosign.pub" | @base64d'
#
# The key might also be available here but currently it's out of date:
# https://raw.githubusercontent.com/redhat-appstudio/infra-deployments/main/components/pipeline-service/public/tekton-chains-signing-secret.pub
# - kubectl get -n openshift-pipelines secret public-key -o json | jq -r '.data."cosign.pub" | @base64d'
#
PUBLIC_KEY=${PUBLIC_KEY:-"-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZP/0htjhVt2y0ohjgtIIgICOtQtA
Expand Down

0 comments on commit c9aa614

Please sign in to comment.