Skip to content

Commit 3152145

Browse files
kalexand-rhkalexand-rh
authored
Merge pull request #40403 from kalexand-rh/api-g
osdocs3148: clearing build errors
2 parents bd70a73 + ebe68d1 commit 3152145

File tree

43 files changed

+534
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+534
-401
lines changed

‎backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ include::modules/dr-restoring-cluster-state-about.adoc[leveloffset=+1]
1212

1313
// Restoring to a previous cluster state
1414
include::modules/dr-restoring-cluster-state.adoc[leveloffset=+1]
15+
include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]
1516

1617
.Additional resources
1718

‎cli_reference/developer_cli_odo/creating_and_deploying_applications_with_odo/sample-applications.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ To access the component over the web, create a URL using `odo url create`.
3333

3434

3535

36-
include::modules/developer-cli-odo-sample-applications.adoc[leveloffset=+1]
36+
include::modules/developer-cli-odo-sample-applications-git.adoc[leveloffset=+1]
37+
include::modules/developer-cli-odo-sample-applications-binary.adoc[leveloffset=+1]

‎getting_started/accessing-your-services.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Once you have an {product-title} subscription, you can access your services.
99

1010
include::modules/dedicated-creating-your-cluster.adoc[leveloffset=+1]
1111

12+
include::modules/dedicated-accessing-your-cluster.adoc[leveloffset=+1]
13+
1214
////
1315
1416
== Receiving status updates

‎installing/installing_bare_metal_ipi/ipi-install-configuration-files.adoc

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,42 @@ include::modules/ipi-install-extracting-the-openshift-installer.adoc[leveloffset
1515

1616
include::modules/ipi-install-creating-an-rhcos-images-cache.adoc[leveloffset=+1]
1717

18-
ifdef::upstream[]
19-
include::ipi-install-configuration-files.adoc[leveloffset=+1]
20-
endif::[]
18+
[id="ipi-install-configuration-files"]
19+
== Configuration files
20+
21+
include::modules/ipi-install-configuring-the-install-config-file.adoc[leveloffset=+2]
22+
23+
include::modules/ipi-install-setting-proxy-settings-within-install-config.adoc[leveloffset=+2]
24+
25+
include::modules/ipi-install-modifying-install-config-for-no-provisioning-network.adoc[leveloffset=+2]
26+
27+
include::modules/ipi-install-modifying-install-config-for-dual-stack-network.adoc[leveloffset=+2]
28+
29+
include::modules/ipi-install-configuring-managed-secure-boot-in-the-install-config-file.adoc[leveloffset=+2]
30+
31+
include::modules/ipi-install-additional-install-config-parameters.adoc[leveloffset=+2]
32+
33+
include::modules/ipi-install-bmc-addressing.adoc[leveloffset=+2]
2134

22-
ifndef::upstream[]
23-
include::installing/installing_bare_metal_ipi/ipi-install-configuration-files.adoc[leveloffset=+1]
35+
include::modules/ipi-install-bmc-addressing-for-dell-idrac.adoc[leveloffset=+2]
36+
37+
include::modules/ipi-install-bmc-addressing-for-hpe-ilo.adoc[leveloffset=+2]
38+
39+
include::modules/ipi-install-bmc-addressing-for-fujitsu-irmc.adoc[leveloffset=+2]
40+
41+
include::modules/ipi-install-root-device-hints.adoc[leveloffset=+2]
42+
43+
include::modules/ipi-install-creating-the-openshift-manifests.adoc[leveloffset=+2]
44+
45+
include::modules/ipi-install-configuring-ntp-for-disconnected-clusters.adoc[leveloffset=+2]
46+
47+
include::modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc[leveloffset=+2]
48+
49+
ifeval::[{product-version} > 4.8]
50+
include::modules/ipi-install-configuring-bios-for-worker-node.adoc[leveloffset=+2]
2451
endif::[]
2552

53+
2654
include::modules/ipi-install-creating-a-disconnected-registry.adoc[leveloffset=+1]
2755

2856
include::modules/ipi-install-deploying-routers-on-worker-nodes.adoc[leveloffset=+1]

‎migrating_from_ocp_3_to_4/about-mtc-3-4.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ The service catalog is deprecated in {product-title} 4. You can migrate workload
2323
include::modules/migration-terminology.adoc[leveloffset=+1]
2424
include::modules/migration-mtc-workflow.adoc[leveloffset=+1]
2525
include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
26+
include::modules/migration-direct-volume-migration-and-direct-image-migration.adoc[leveloffset=+1]

‎migration_toolkit_for_containers/about-mtc.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ See xref:../migration_toolkit_for_containers/advanced-migration-options-mtc.adoc
2626
include::modules/migration-terminology.adoc[leveloffset=+1]
2727
include::modules/migration-mtc-workflow.adoc[leveloffset=+1]
2828
include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
29+
include::modules/migration-direct-volume-migration-and-direct-image-migration.adoc[leveloffset=+1]

‎modules/api-support-tiers-mapping.adoc

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * rest_api/understanding-api-support-tiers.adoc
4+
5+
[id="api-support-tiers-mapping_{context}"]
6+
= Mapping API tiers to API groups
7+
8+
For each API tier defined by Red Hat, we provide a mapping table for specific API groups where the upstream communities are committed to maintain forward compatibility. Any API group that does not specify an explicit compatibility level is assigned API tier 3 by default.
9+
10+
[id="mapping-support-tiers-to-kubernetes-api-groups_{context}"]
11+
== Support for Kubernetes API groups
12+
13+
API groups that end with the suffix `*.k8s.io` or have the form `version.<name>` with no suffix are governed by the Kubernetes deprecation policy and follow a general mapping between API version exposed and corresponding support tier unless otherwise specified.
14+
15+
[cols="2",options="header"]
16+
|===
17+
|API version example
18+
|API tier
19+
20+
|`v1`
21+
|Tier 1
22+
23+
|`v1beta1`
24+
|Tier 2
25+
26+
|`v1alpha1`
27+
|Tier 4
28+
29+
|===
30+
31+
[id="mapping-support-tiers-to-openshift-api-groups_{context}"]
32+
== Support for OpenShift API groups
33+
34+
API groups that end with the suffix `*.openshift.io` are governed by the {product-title} deprecation policy and follow a general mapping between API version exposed and corresponding compatibility level unless otherwise specified.
35+
36+
[cols="2",options="header"]
37+
|===
38+
|API version example
39+
|API tier
40+
41+
|`apps.openshift.io/v1`
42+
|Tier 1
43+
44+
|`authorization.openshift.io/v1`
45+
|Tier 1, some tier 1 deprecated
46+
47+
|`build.openshift.io/v1`
48+
|Tier 1, some tier 1 deprecated
49+
50+
|`config.openshift.io/v1`
51+
|Tier 1
52+
53+
|`image.openshift.io/v1`
54+
|Tier 1
55+
56+
|`network.openshift.io/v1`
57+
|Tier 1
58+
59+
|`network.operator.openshift.io/v1`
60+
|Tier 1
61+
62+
|`oauth.openshift.io/v1`
63+
|Tier 1
64+
65+
|`imagecontentsourcepolicy.operator.openshift.io/v1alpha1`
66+
|Tier 1
67+
68+
|`project.openshift.io/v1`
69+
|Tier 1
70+
71+
|`quota.openshift.io/v1`
72+
|Tier 1
73+
74+
|`route.openshift.io/v1`
75+
|Tier 1
76+
77+
|`quota.openshift.io/v1`
78+
|Tier 1
79+
80+
|`security.openshift.io/v1`
81+
|Tier 1 except for `RangeAllocation` (tier 4) and `*Reviews` (tier 2)
82+
83+
|`template.openshift.io/v1`
84+
|Tier 1
85+
86+
|`console.openshift.io/v1`
87+
|Tier 2
88+
89+
|===
90+
91+
[id="mapping-support-tiers-to-monitoring-api-groups_{context}"]
92+
== Support for Monitoring API groups
93+
94+
API groups that end with the suffix `monitoring.coreos.com` have the following mapping:
95+
96+
[cols="2",options="header"]
97+
|===
98+
|API version example
99+
|API tier
100+
101+
|`v1`
102+
|Tier 1
103+
104+
|===

‎modules/api-support-tiers.adoc

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -30,104 +30,3 @@ Components and developer tools that receive continuous updates through the Opera
3030
No compatibility is provided. API and AOE can change at any point. These capabilities should not be used by applications needing long-term support.
3131

3232
It is common practice for Operators to use custom resource definitions (CRDs) internally to accomplish a task. These objects are not meant for use by actors external to the Operator and are intended to be hidden. If any CRD is not meant for use by actors external to the Operator, the `operators.operatorframework.io/internal-objects` annotation in the Operators `ClusterServiceVersion` (CSV) must be specified, and that signals that the corresponding resource is internal use only.
33-
34-
[id="mapping-support-tiers-to-api-groups_{context}"]
35-
= Mapping API tiers to API groups
36-
37-
For each API tier defined by Red Hat, we provide a mapping table for specific API groups where the upstream communities are committed to maintain forward compatibility. Any API group that does not specify an explicit compatibility level is assigned API tier 3 by default.
38-
39-
[id="mapping-support-tiers-to-kubernetes-api-groups_{context}"]
40-
== Support for Kubernetes API groups
41-
42-
API groups that end with the suffix `*.k8s.io` or have the form `version.<name>` with no suffix are governed by the Kubernetes deprecation policy and follow a general mapping between API version exposed and corresponding support tier unless otherwise specified.
43-
44-
[cols="2",options="header"]
45-
|===
46-
|API version example
47-
|API tier
48-
49-
|`v1`
50-
|Tier 1
51-
52-
|`v1beta1`
53-
|Tier 2
54-
55-
|`v1alpha1`
56-
|Tier 4
57-
58-
|===
59-
60-
[id="mapping-support-tiers-to-openshift-api-groups_{context}"]
61-
== Support for OpenShift API groups
62-
63-
API groups that end with the suffix `*.openshift.io` are governed by the {product-title} deprecation policy and follow a general mapping between API version exposed and corresponding compatibility level unless otherwise specified.
64-
65-
[cols="2",options="header"]
66-
|===
67-
|API version example
68-
|API tier
69-
70-
|`apps.openshift.io/v1`
71-
|Tier 1
72-
73-
|`authorization.openshift.io/v1`
74-
|Tier 1, some tier 1 deprecated
75-
76-
|`build.openshift.io/v1`
77-
|Tier 1, some tier 1 deprecated
78-
79-
|`config.openshift.io/v1`
80-
|Tier 1
81-
82-
|`image.openshift.io/v1`
83-
|Tier 1
84-
85-
|`network.openshift.io/v1`
86-
|Tier 1
87-
88-
|`network.operator.openshift.io/v1`
89-
|Tier 1
90-
91-
|`oauth.openshift.io/v1`
92-
|Tier 1
93-
94-
|`imagecontentsourcepolicy.operator.openshift.io/v1alpha1`
95-
|Tier 1
96-
97-
|`project.openshift.io/v1`
98-
|Tier 1
99-
100-
|`quota.openshift.io/v1`
101-
|Tier 1
102-
103-
|`route.openshift.io/v1`
104-
|Tier 1
105-
106-
|`quota.openshift.io/v1`
107-
|Tier 1
108-
109-
|`security.openshift.io/v1`
110-
|Tier 1 except for `RangeAllocation` (tier 4) and `*Reviews` (tier 2)
111-
112-
|`template.openshift.io/v1`
113-
|Tier 1
114-
115-
|`console.openshift.io/v1`
116-
|Tier 2
117-
118-
|===
119-
120-
[id="mapping-support-tiers-to-monitoring-api-groups_{context}"]
121-
== Support for Monitoring API groups
122-
123-
API groups that end with the suffix `monitoring.coreos.com` have the following mapping:
124-
125-
[cols="2",options="header"]
126-
|===
127-
|API version example
128-
|API tier
129-
130-
|`v1`
131-
|Tier 1
132-
133-
|===

‎modules/dedicated-accessing-your-cluster.adoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * getting_started/accessing-your-services.adoc
4+
5+
[id="dedicated-accessing-your-cluster_{context}"]
6+
= Accessing your cluster
7+
8+
Use the following steps to access your {product-title} cluster.
9+
10+
.Procedure
11+
12+
. From link:https://console.redhat.com/openshift[console.redhat.com/openshift], click
13+
on the cluster you want to access.
14+
15+
. Click *Launch Console*.

0 commit comments

Comments
 (0)