Skip to content

CORS-4414: Use regional KMS key for GCP KMS encryption #82811

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

Merged
openshift-merge-bot merged 1 commit into from
Aug 3, 2026
+7 −6
Merged

CORS-4414: Use regional KMS key for GCP KMS encryption #82811

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: 1 addition & 1 deletion ci-operator/step-registry/gcp/provision/kms-key/gcp-provision-kms-key-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ then
gcloud config set project "${GOOGLE_PROJECT_ID}"
fi

LOCATION="global"
LOCATION="${LEASED_RESOURCE}"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
KEY_RING_NAME="openshift-ci"
KEY_NAME="openshift-ci-e2e"

Expand Down
5 changes: 3 additions & 2 deletions ci-operator/step-registry/gcp/provision/kms-key/gcp-provision-kms-key-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ ref:
memory: 100Mi
documentation: |-
Ensure a shared GCP Cloud KMS key ring and crypto key exist for CI testing.
Uses a global location so the key is accessible from any region. Both the
Uses the LEASED_RESOURCE region so the key is co-located with the cluster.
GCS (used for bootstrap ignition) requires a regional KMS key. Both the
key ring (openshift-ci) and key (openshift-ci-e2e) are created only if they
do not already exist, and are reused across all CI runs.
do not already exist, and are reused across all CI runs in that region.
The key details are saved to SHARED_DIR for use by subsequent steps
(e.g., ipi-conf-gcp-osdisk-encryption-key).
6 changes: 3 additions & 3 deletions ...-registry/openshift/e2e/gcp/kms-encryption/openshift-e2e-gcp-kms-encryption-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ workflow:
- chain: ipi-gcp-post
documentation: |-
The GCP KMS encryption workflow ensures a shared customer-managed KMS key
exists (global location, reused across runs), configures install-config
exists (regional, co-located with the cluster), configures install-config
with OS disk encryption, installs a cluster, verifies KMS encryption is
applied to GCS buckets (bootstrap ignition and image registry), and runs
the conformance suite.
Note: The KMS keyring and key are NOT deleted after the test completes.
This is intentional because GCP does not allow deletion of KMS keys (they
can only be disabled). The same key is reused across all CI runs to avoid
resource accumulation.
can only be disabled). The same key is reused across all CI runs in the
Comment thread
coderabbitai[bot] marked this conversation as resolved.
same region to avoid resource accumulation.