Skip to content

Commit ee4471b

Browse files
authored
Merge pull request #301 from lmilleri/rebase-26032026
Rebase 26032026
2 parents 4269170 + a8fd665 commit ee4471b

5 files changed

Lines changed: 26 additions & 26 deletions

.tekton/trustee-operator-bundle-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
- name: name
139139
value: init
140140
- name: bundle
141-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
141+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
142142
- name: kind
143143
value: task
144144
resolver: bundles

.tekton/trustee-operator-bundle-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
- name: name
141141
value: init
142142
- name: bundle
143-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
143+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
144144
- name: kind
145145
value: task
146146
resolver: bundles

.tekton/trustee-operator-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ spec:
153153
- name: name
154154
value: init
155155
- name: bundle
156-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
156+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
157157
- name: kind
158158
value: task
159159
resolver: bundles

.tekton/trustee-operator-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ spec:
150150
- name: name
151151
value: init
152152
- name: bundle
153-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
153+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
154154
- name: kind
155155
value: task
156156
resolver: bundles

config/templates/ear_default_attestation_policy_cpu.rego

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -183,20 +183,20 @@ hardware := 2 if {
183183
# Check TCB status (covers quote.body.tcb_svn claim check)
184184
input.tdx.tcb_status == "UpToDate"
185185

186-
# Check minimum TCB date
187-
# An alternative check to tcb_status is to define a minimum acceptable
188-
# TCB date. TCB dates are associated with TCB Recovery events to which
189-
# the platforms are certified.
190-
#
191-
# Available TCB dates can be checked using:
192-
# curl -s https://api.trustedservices.intel.com/tdx/certification/v4/tcbevaluationdatanumbers | jq
193-
#
194-
# Example: in some cases, "OutOfDate" tcb_status can be accepted as long as
195-
# the tcb_date is not older than a given date from a past TCB Recovery event:
196-
# min_tcb_date := "2025-08-13T00:00:00Z"
197-
# attester_tcb_date_ns := time.parse_rfc3339_ns(input.tdx.tcb_date)
198-
# min_tcb_date_ns := time.parse_rfc3339_ns(min_tcb_date)
199-
# attester_tcb_date_ns >= min_tcb_date_ns
186+
# Check minimum TCB date
187+
# An alternative check to tcb_status is to define a minimum acceptable
188+
# TCB date. TCB dates are associated with TCB Recovery events to which
189+
# the platforms are certified.
190+
#
191+
# Available TCB dates can be checked using:
192+
# curl -s https://api.trustedservices.intel.com/tdx/certification/v4/tcbevaluationdatanumbers | jq
193+
#
194+
# Example: in some cases, "OutOfDate" tcb_status can be accepted as long as
195+
# the tcb_date is not older than a given date from a past TCB Recovery event:
196+
# min_tcb_date := "2025-08-13T00:00:00Z"
197+
# attester_tcb_date_ns := time.parse_rfc3339_ns(input.tdx.tcb_date)
198+
# min_tcb_date_ns := time.parse_rfc3339_ns(min_tcb_date)
199+
# attester_tcb_date_ns >= min_tcb_date_ns
200200

201201
# Check collateral expiration status
202202
input.tdx.collateral_expiration_status == "0"
@@ -293,16 +293,16 @@ hardware := 2 if {
293293
input.az_tdx_vtpm.quote.header.tee_type == "81000000"
294294
input.az_tdx_vtpm.quote.header.vendor_id == "939a7233f79c4ca9940a0db3957f0607"
295295

296-
# Check TDX Module hash
297-
# input.tdx.quote.body.mr_seam in query_reference_value("mr_seam")
298-
#
299-
# Check OVMF code hash
300-
input.az_tdx_vtpm.quote.body.mr_td in query_reference_value("mr_td")
296+
# Check TDX Module hash
297+
# input.tdx.quote.body.mr_seam in query_reference_value("mr_seam")
298+
#
299+
# Check OVMF code hash
300+
input.az_tdx_vtpm.quote.body.mr_td in query_reference_value("mr_td")
301301

302-
# Check TCB status (covers quote.body.tcb_svn claim check)
303-
input.az_tdx_vtpm.tcb_status == "UpToDate"
302+
# Check TCB status (covers quote.body.tcb_svn claim check)
303+
input.az_tdx_vtpm.tcb_status == "UpToDate"
304304

305-
# Check minimum TCB date (See TDX section for details.)
305+
# Check minimum TCB date (See TDX section for details.)
306306
}
307307

308308
configuration := 2 if {

0 commit comments

Comments
 (0)