Skip to content

Commit 87cad95

Browse files
committed
fix: minor fixes
Signed-off-by: Chris Butler <chris.butler@redhat.com>
1 parent f53261d commit 87cad95

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Currently supports Azure via peer-pods. Peer-pods provision confidential VMs (`S
2222

2323
Breaking change from v3. This is the first version using GA (Generally Available) releases of the CoCo stack:
2424

25-
- **OpenShift Sandboxed Containers 1.11+** (requires OCP 4.17+)
26-
- **Red Hat Build of Trustee 1.0** (first GA release; all prior versions were Technology Preview)
25+
- **OpenShift Sandboxed Containers 1.12+** (requires OCP 4.17+)
26+
- **Red Hat Build of Trustee 1.1** (GA release; all versions prior to 1.0 were Technology Preview)
2727
- External chart repositories for [Trustee](https://github.com/validatedpatterns/trustee-chart), [sandboxed-containers](https://github.com/validatedpatterns/sandboxed-containers-chart), and [sandboxed-policies](https://github.com/validatedpatterns/sandboxed-policies-chart)
2828
- Self-signed certificates via cert-manager (Let's Encrypt no longer required)
2929
- Multi-cluster support via ACM

scripts/get-pcr.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ if [ -z "$SANDBOX_CSV" ] || [ "$SANDBOX_CSV" == "null" ]; then
7676
exit 0
7777
fi
7878

79-
# Extract version from CSV (e.g., "sandboxed-containers-operator.v1.11.0" -> "1.11.0")
79+
# Extract version from CSV (e.g., "sandboxed-containers-operator.v1.12.0" -> "1.12.0")
8080
# Remove everything up to and including ".v"
8181
SANDBOX_VERSION="${SANDBOX_CSV##*.v}"
8282

8383
echo "Sandboxed container operator CSV: $SANDBOX_CSV"
8484
echo "Version: $SANDBOX_VERSION"
8585
# alternatively, use the operator-version tag.
86-
# OSC_VERSION=1.11.1
86+
# OSC_VERSION=1.12.0
8787
VERITY_IMAGE=registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image
8888

8989
TAG=$(skopeo inspect --authfile $PULL_SECRET_PATH docker://${VERITY_IMAGE}:${SANDBOX_VERSION} | jq -r .Digest)

values-spoke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ clusterGroup:
1717
source: redhat-operators
1818
channel: stable
1919
installPlanApproval: Manual
20-
csv: sandboxed-containers-operator.v1.11.0
20+
csv: sandboxed-containers-operator.v1.12.0
2121
cert-manager:
2222
name: openshift-cert-manager-operator
2323
namespace: cert-manager-operator

values-trusted-hub.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ clusterGroup:
2222
source: redhat-operators
2323
channel: stable
2424
installPlanApproval: Manual
25-
csv: trustee-operator.v1.0.0
25+
csv: trustee-operator.v1.1.0
2626
cert-manager:
2727
name: openshift-cert-manager-operator
2828
namespace: cert-manager-operator
@@ -66,11 +66,14 @@ clusterGroup:
6666
name: trustee
6767
namespace: trustee-operator-system #upstream config
6868
project: trustee
69-
chart: trustee
70-
chartVersion: 0.2.*
69+
repoURL: https://github.com/butler54/trustee-chart.git
70+
path: .
71+
chartVersion: feature/trustee-1.1-compat
7172
overrides:
7273
- name: global.coco.secured
7374
value: "true"
75+
- name: kbs.admin.format
76+
value: "v1.1"
7477
sandbox-policies:
7578
name: sandbox-policies
7679
namespace: openshift-sandboxed-containers-operator #upstream config

0 commit comments

Comments
 (0)