Skip to content

Commit eb638d2

Browse files
authored
Merge pull request #51495 from deads2k/gate
update to release.openshift.io/feature-set to match OCP 4.12
2 parents e817ad0 + 1c30c44 commit eb638d2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/installation-user-infra-generate-k8s-manifest-ignition.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ stringData:
419419

420420
[IMPORTANT]
421421
====
422-
The release image includes `CredentialsRequest` objects for Technology Preview features that are enabled by the `TechPreviewNoUpgrade` feature set. You can identify these objects by their use of the `release.openshift.io/feature-gate: TechPreviewNoUpgrade` annotation.
422+
The release image includes `CredentialsRequest` objects for Technology Preview features that are enabled by the `TechPreviewNoUpgrade` feature set. You can identify these objects by their use of the `release.openshift.io/feature-set: TechPreviewNoUpgrade` annotation.
423423
424424
* If you are not using any of these features, do not create secrets for these objects. Creating secrets for Technology Preview features that you are not using can cause the installation to fail.
425425
@@ -430,13 +430,13 @@ The release image includes `CredentialsRequest` objects for Technology Preview f
430430
+
431431
[source,terminal]
432432
----
433-
$ grep "release.openshift.io/feature-gate" *
433+
$ grep "release.openshift.io/feature-set" *
434434
----
435435
+
436436
.Example output
437437
[source,terminal]
438438
----
439-
0000_30_capi-operator_00_credentials-request.yaml: release.openshift.io/feature-gate: TechPreviewNoUpgrade
439+
0000_30_capi-operator_00_credentials-request.yaml: release.openshift.io/feature-set: TechPreviewNoUpgrade
440440
----
441441
// Right now, only the CAPI Operator is an issue, but it might make sense to update `0000_30_capi-operator_00_credentials-request.yaml` to `<tech_preview_credentials_request>.yaml` for the future.
442442

modules/manually-create-identity-access-management.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ endif::google-cloud-platform[]
202202
+
203203
[IMPORTANT]
204204
====
205-
The release image includes `CredentialsRequest` objects for Technology Preview features that are enabled by the `TechPreviewNoUpgrade` feature set. You can identify these objects by their use of the `release.openshift.io/feature-gate: TechPreviewNoUpgrade` annotation.
205+
The release image includes `CredentialsRequest` objects for Technology Preview features that are enabled by the `TechPreviewNoUpgrade` feature set. You can identify these objects by their use of the `release.openshift.io/feature-set: TechPreviewNoUpgrade` annotation.
206206
207207
* If you are not using any of these features, do not create secrets for these objects. Creating secrets for Technology Preview features that you are not using can cause the installation to fail.
208208
@@ -213,13 +213,13 @@ The release image includes `CredentialsRequest` objects for Technology Preview f
213213
+
214214
[source,terminal]
215215
----
216-
$ grep "release.openshift.io/feature-gate" *
216+
$ grep "release.openshift.io/feature-set" *
217217
----
218218
+
219219
.Example output
220220
[source,terminal]
221221
----
222-
0000_30_capi-operator_00_credentials-request.yaml: release.openshift.io/feature-gate: TechPreviewNoUpgrade
222+
0000_30_capi-operator_00_credentials-request.yaml: release.openshift.io/feature-set: TechPreviewNoUpgrade
223223
----
224224
// Right now, only the CAPI Operator is an issue, but it might make sense to update `0000_30_capi-operator_00_credentials-request.yaml` to `<tech_preview_credentials_request>.yaml` for the future.
225225

0 commit comments

Comments
 (0)