Skip to content

Commit cbbc40a

Browse files
authored
Merge pull request #87753 from sr1kar99/4560-new-api-field
MULTIARCH#4560: Adding a new API field in images.config.openshift.io
2 parents 77bd94f + 194a523 commit cbbc40a

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

modules/images-configuration-parameters.adoc

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,35 @@ pods. For instance, whether or not to allow insecure access. It does not contain
4747

4848
Either `blockedRegistries` or `allowedRegistries` can be set, but not both.
4949

50+
ifndef::openshift-rosa,openshift-dedicated[]
51+
|`imageStreamImportMode`
52+
|Controls the import mode behavior of image streams.
53+
54+
You must enable the `TechPreviewNoUpgrade` feature set in the `FeatureGate` custom resource (CR) to enable the `imageStreamImportMode` feature.
55+
For more information about feature gates, see "Understanding feature gates".
56+
57+
You can set the `imageStreamImportMode` field to either of the following values:
58+
59+
* `Legacy`: Indicates that the legacy behavior must be used. The legacy behavior discards the manifest list and imports a single sub-manifest. In this case, the platform is chosen in the following order of priority:
60+
. Tag annotations: Determining the platform by using the platform-specific annotations in the image tags.
61+
. Control plane architecture or the operating system: Selecting the platform based on the architecture or the operating system of the control plane.
62+
. `linux/amd64`: If no platform is selected by the preceeding methods, the `linux/amd64` platform is selected.
63+
. The first manifest in the list is selected.
64+
65+
* `PreserveOriginal`: Indicates that the original manifest is preserved. The manifest list and its sub-manifests are imported.
66+
67+
If you specify a value for this field, the value is applied to the newly created image stream tags that do not already have this value manually set.
68+
69+
If you do not configure this field, the behavior is decided based on the payload type advertised by the `ClusterVersion` status. In this case, the platform is chosen as follows:
70+
71+
* The single architecture payload implies that the `Legacy` mode is applicable.
72+
* The multi payload implies that the `PreserveOriginal` mode is applicable.
73+
74+
For information about importing manifest lists, see "Working with manifest lists".
75+
76+
:FeatureName: `imageStreamImportMode`
77+
include::snippets/technology-preview.adoc[]
78+
endif::openshift-rosa,openshift-dedicated[]
5079
|===
5180

5281
[WARNING]

modules/nodes-cluster-enabling-features-about.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ The following Technology Preview features are enabled by this feature set:
2828
** Dynamic Resource Allocation API. Enables a new API for requesting and sharing resources between pods and containers. This is an internal feature that most users do not need to interact with. (`DynamicResourceAllocation`)
2929
** Pod security admission enforcement. Enables the restricted enforcement mode for pod security admission. Instead of only logging a warning, pods are rejected if they violate pod security standards. (`OpenShiftPodSecurityAdmission`)
3030
** StatefulSet pod availability upgrading limits. Enables users to define the maximum number of statefulset pods unavailable during updates which reduces application downtime. (`MaxUnavailableStatefulSet`)
31+
** Image mode behavior of image streams. Enables a new API for controlling the import mode behavior of image streams. (`imageStreamImportMode`)
3132
** `OVNObservability` resource allows you to verify expected network behavior. Supports the following network APIs: `NetworkPolicy`, `AdminNetworkPolicy`, `BaselineNetworkPolicy`, `UserDefinesdNetwork` isolation, multicast ACLs, and egress firewalls. When enabled, you can view network events in the terminal.
3233
** `gcpLabelsTags`
3334
** `vSphereStaticIPs`

openshift_images/image-configuration.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ Use the following procedure to configure image registries.
1010

1111
include::modules/images-configuration-parameters.adoc[leveloffset=+1]
1212

13+
ifndef::openshift-rosa,openshift-dedicated[]
14+
[role="_additional-resources"]
15+
.Additional resources
16+
17+
* xref:../openshift_images/image-streams-manage.adoc#images-imagestream-import-import-mode_image-streams-managing[Working with manifest lists]
18+
19+
* xref:../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling-features-about_nodes-cluster-enabling[Understanding feature gates]
20+
endif::openshift-rosa,openshift-dedicated[]
21+
1322
include::modules/images-configuration-file.adoc[leveloffset=+1]
1423
1524
include::modules/images-configuration-allowed.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)