Skip to content

Commit 4db7a3a

Browse files
authored
Merge pull request #103803 from mburke5678/nodes-ga-byopki
OSDOCS 17653 GA-BYOPKI for image verification in OCP
2 parents 3c85f83 + f009426 commit 4db7a3a

File tree

3 files changed

+1
-53
lines changed

3 files changed

+1
-53
lines changed

modules/nodes-sigstore-configure-cluster-policy.adoc

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The default `ClusterImagePolicy` object, named `openshift`, provides sigstore su
2121
* You have a sigstore-supported public key infrastructure (PKI) key, a Bring Your Own Public Key Infrastructure (BYOPKI) certificate, or provide a link:https://docs.sigstore.dev/cosign/signing/overview/[Cosign public and private key pair] for signing operations.
2222
* You have a signing process in place to sign your images.
2323
* You have access to a registry that supports Cosign signatures, if you are using Cosign signatures.
24-
* If registry mirrors are configured for the {product-title} release image repositories, `quay.io/openshift-release-dev/ocp-release` and `quay.io/openshift-release-dev/ocp-v4.0-art-dev`, before enabling the Technology Preview feature set, you must mirror the sigstore signatures for the {product-title} release images into your mirror registry. Otherwise, the default `openshift` cluster image policy, which enforces signature verification for the release repository, blocks the ability of the Cluster Version Operator to move the CVO pod to new nodes, preventing the node update that results from the feature set change.
24+
* If a mirror registry is configured for the {product-title} release image repositories, `quay.io/openshift-release-dev/ocp-release` and `quay.io/openshift-release-dev/ocp-v4.0-art-dev`, you must mirror the sigstore signatures for the {product-title} release images into your mirror registry. Otherwise, the default `openshift` cluster image policy, which enforces signature verification for the release repository, blocks the ability of the Cluster Version Operator to move the CVO pod to new nodes, preventing the node update.
2525
+
2626
You can use the `oc image mirror` command to mirror the signatures. For example:
2727
+
@@ -31,30 +31,6 @@ $ oc image mirror quay.io/openshift-release-dev/ocp-release:sha256-1234567890abc
3131
mirror.com/image/repo:sha256-1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef.sig
3232
----
3333
34-
* If you are using a BYOPKI certificate as the root of trust, you enabled the required Technology Preview features for your cluster by editing the `FeatureGate` CR named `cluster`.
35-
+
36-
[source,terminal]
37-
----
38-
$ oc edit featuregate cluster
39-
----
40-
+
41-
.Example `FeatureGate` CR
42-
[source,yaml]
43-
----
44-
apiVersion: config.openshift.io/v1
45-
kind: FeatureGate
46-
metadata:
47-
name: cluster
48-
spec:
49-
featureSet: TechPreviewNoUpgrade <1>
50-
----
51-
<1> Enables the required `SigstoreImageVerificationPKI` feature.
52-
+
53-
[WARNING]
54-
====
55-
Enabling the `TechPreviewNoUpgrade` feature set on your cluster cannot be undone and prevents minor version updates. This feature set allows you to enable these Technology Preview features on test clusters, where you can fully test them. Do not enable this feature set on production clusters.
56-
====
57-
5834
.Procedure
5935

6036
. Create a cluster image policy object similar to the following examples. See "About image policy parameters" for specific details on these parameters.

modules/nodes-sigstore-configure-image-policy.adoc

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,6 @@ The following example shows general guidelines on how to configure an `ImagePoli
2020
* You have a sigstore-supported public key infrastructure (PKI) key, a Bring Your Own Public Key Infrastructure (BYOPKI) certificate, or provide a link:https://docs.sigstore.dev/cosign/signing/overview/[Cosign public and private key pair] for signing operations.
2121
* You have a signing process in place to sign your images.
2222
* You have access to a registry that supports Cosign signatures, if you are using Cosign signatures.
23-
* If you are using a BYOPKI certificate as the root of trust, you enabled the required Technology Preview features for your cluster by editing the `FeatureGate` CR named `cluster`:
24-
+
25-
[source,terminal]
26-
----
27-
$ oc edit featuregate cluster
28-
----
29-
+
30-
.Example `FeatureGate` CR
31-
[source,yaml]
32-
----
33-
apiVersion: config.openshift.io/v1
34-
kind: FeatureGate
35-
metadata:
36-
name: cluster
37-
spec:
38-
featureSet: TechPreviewNoUpgrade <1>
39-
----
40-
<1> Enables the required `SigstoreImageVerification` feature.
41-
+
42-
[WARNING]
43-
====
44-
Enabling the `TechPreviewNoUpgrade` feature set on your cluster cannot be undone and prevents minor version updates. This feature set allows you to enable these Technology Preview features on test clusters, where you can fully test them. Do not enable this feature set on production clusters.
45-
====
4623
4724
.Procedure
4825

modules/nodes-sigstore-configure.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ If a scoped image or repository in an image policy is nested under one of the sc
5858
* `rootOfTrust`: Specifies the root of trust for the policy. Configure either a public key, a Bring Your Own Public Key Infrastructure (BYOPKI) certificate, or a link:https://docs.sigstore.dev/certificate_authority/overview/[Fulcio certificate].
5959
** `publicKey`: Indicates that the policy relies on a sigstore public key. You must specify a base64-encoded PEM format public key. You can optionally include link:https://docs.sigstore.dev/logging/overview/[Rekor verification].
6060
** `PKI` Indicates that the policy relies on a certificate from your own public key infrastructure (PKI) that is compatible with Cosign Bring Your Own Public Key Infrastructure (BYOPKI) verification. You must specify a base64-encoded PEM format public key. BYOPKI enables you to validate container images using an existing X.509 certificate while aligning with Cosign's bring-your-own PKI signing workflow.
61-
+
62-
--
63-
:FeatureName: sigstore BYOPKI support
64-
include::snippets/technology-preview.adoc[]
65-
--
6661
** `FulcioCAWithRekor`: Indicates that the policy is based on a Fulcio certificate. You must specify the following parameters:
6762
*** A base64-encoded PEM-format Fulcio CA
6863
*** An OpenID Connect (OIDC) issuer

0 commit comments

Comments
 (0)