Skip to content

chore(EC-2153): remove RH-specific policy digest defaults #3573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsmid1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(EC-2153): remove RH-specific policy digest defaults #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ paths can be provided by using the `:` separator.
*Default*: `false`
*EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
*POLICY_BUNDLE_DIGEST* (`string`):: Optional OCI digest to pin the release policy bundle. When provided, the policy configuration is resolved and the reference oci::quay.io/conforma/release-policy:konflux is replaced with oci::quay.io/conforma/release-policy@<digest>. Accepts a full digest (sha256:abc123...) or just the hex hash (abc123...).
+
*Default*: `sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2`
*WORKERS* (`string`):: Number of parallel workers to use for policy evaluation.

+
Expand Down
2 changes: 0 additions & 2 deletions docs/modules/ROOT/pages/verify-enterprise-contract.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ paths can be provided by using the `:` separator.
*Default*: `false`
*EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
*POLICY_BUNDLE_DIGEST* (`string`):: Optional OCI digest to pin the release policy bundle. When provided, the policy configuration is resolved and the reference oci::quay.io/conforma/release-policy:konflux is replaced with oci::quay.io/conforma/release-policy@<digest>. Accepts a full digest (sha256:abc123...) or just the hex hash (abc123...).
+
*Default*: `sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2`
*WORKERS* (`string`):: Number of parallel workers to use for policy evaluation.
+
*Default*: `1`
Expand Down
3 changes: 1 addition & 2 deletions features/__snapshots__/ta_task_validate_image.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

[TestFeatures/Golden container image with trusted artifacts:pin-policy-bundle - 1]
Applying policy bundle digest override: sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2
'oci::quay.io/conforma/release-policy:konflux' not found in policy configuration, nothing to do.
POLICY_BUNDLE_DIGEST is empty, skipping policy bundle digest override.

---

Expand Down
3 changes: 1 addition & 2 deletions features/__snapshots__/task_validate_image.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ Error: Get "http://tuf.invalid/root.json": dial tcp: lookup tuf.invalid on 10.96
---

[TestFeatures/Golden container image:pin-policy-bundle - 1]
Applying policy bundle digest override: sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2
'oci::quay.io/conforma/release-policy:konflux' not found in policy configuration, nothing to do.
POLICY_BUNDLE_DIGEST is empty, skipping policy bundle digest override.

---

Expand Down
59 changes: 0 additions & 59 deletions hack/update-policy-digest-in-tasks.sh
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,7 @@ spec:
oci::quay.io/conforma/release-policy:konflux is replaced with
oci::quay.io/conforma/release-policy@<digest>. Accepts a full digest
(sha256:abc123...) or just the hex hash (abc123...).
# For Konflux stability we want to try pinning the policy bundle rather
# than use the floating oci::quay.io/conforma/release-policy:konflux tag.
# Instead of needing to bump this in hundreds of separate ECPs, we'll do
# it here instead. If you don't want this behavior then provide an empty
# string value for this param. To update this digest use the script in
# hack/update-policy-digest-in-tasks.sh
default: "sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2"
default: ""

- name: WORKERS
type: string
Expand Down
8 changes: 1 addition & 7 deletions tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,7 @@ spec:
oci::quay.io/conforma/release-policy:konflux is replaced with
oci::quay.io/conforma/release-policy@<digest>. Accepts a full digest
(sha256:abc123...) or just the hex hash (abc123...).
# For Konflux stability we want to try pinning the policy bundle rather
# than use the floating oci::quay.io/conforma/release-policy:konflux tag.
# Instead of needing to bump this in hundreds of separate ECPs, we'll do
# it here instead. If you don't want this behavior then provide an empty
# string value for this param. To update this digest use the script in
# hack/update-policy-digest-in-tasks.sh
default: "sha256:f904979d405a39a3cc492439b379b4b117c622bbe7126a0e1ba76527ec3ce6a2"
default: ""

- name: WORKERS
type: string
Expand Down
Loading