Skip to content

Commit d4f7265

Browse files
committed
Temporarily remove Support for FIPS cryptography topic
1 parent 8ac8d88 commit d4f7265

File tree

9 files changed

+24
-9
lines changed

9 files changed

+24
-9
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,6 @@ Topics:
549549
- Name: Troubleshooting installation issues
550550
File: installing-troubleshooting
551551
Distros: openshift-origin,openshift-enterprise
552-
- Name: Support for FIPS cryptography
553-
File: installing-fips
554-
Distros: openshift-enterprise,openshift-online
555552
---
556553
Name: Post-installation configuration
557554
Dir: post_installation_configuration

installing/install_config/installing-customizing.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ include::modules/installation-special-config-chrony.adoc[leveloffset=+1]
4848

4949
* For information on Butane, see xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-butane_installing-customizing[Creating machine configs with Butane].
5050

51+
////
5152
ifndef::openshift-origin[]
5253
* For information on FIPS support, see xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography].
5354
endif::[]
55+
56+
////

installing/installing-preparing.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif::openshift-origin[]
3232
* {ibmzProductName} or {linuxoneProductName}
3333
* {ibmzProductName} or {linuxoneProductName} for {op-system-base-full} KVM
3434
* {ibmpowerProductName}
35-
* {ibmpowerProductName} Virtual Server
35+
* {ibmpowerProductName} Virtual Server
3636
* Nutanix
3737
* VMware vSphere
3838
* VMware Cloud (VMC) on AWS
@@ -80,6 +80,7 @@ If you need to install your cluster that has limited access to the internet, suc
8080

8181
If you need to deploy your cluster to an xref:../installing/installing_aws/installing-aws-government-region.adoc#installing-aws-government-region[AWS GovCloud region], xref:../installing/installing_aws/installing-aws-china.adoc#installing-aws-china-region[AWS China region], or xref:../installing/installing_azure/installing-azure-government-region.adoc#installing-azure-government-region[Azure government region], you can configure those custom regions during an installer-provisioned infrastructure installation.
8282

83+
////
8384
ifndef::openshift-origin[]
8485
You can also configure the cluster machines to use xref:../installing/installing-fips.adoc#installing-fips[FIPS Validated / Modules in Process cryptographic libraries] during installation.
8586
@@ -89,6 +90,7 @@ The use of FIPS Validated / Modules in Process cryptographic libraries is only s
8990
====
9091
9192
endif::[]
93+
////
9294

9395
////
9496
[id="installing-preparing-single-node"]
@@ -129,7 +131,7 @@ Not all installation options are supported for all platforms, as shown in the fo
129131
//This table is for all flavors of OpenShift, except OKD. A separate table is required because OKD does not support multiple AWS architecture types. Trying to maintain one table using conditions, while convenient, is very fragile and prone to publishing errors.
130132
ifndef::openshift-origin[]
131133
|===
132-
||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM)|Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} |{ibmpowerProductName} Virtual Server
134+
||Alibaba |AWS (64-bit x86) |AWS (64-bit ARM) |Azure (64-bit x86) |Azure (64-bit ARM)|Azure Stack Hub |GCP |Nutanix |{rh-openstack} |RHV |Bare metal (64-bit x86) |Bare metal (64-bit ARM) |vSphere |VMC |IBM Cloud VPC |{ibmzProductName} |{ibmpowerProductName} |{ibmpowerProductName} Virtual Server
133135

134136
|Default
135137
|xref:../installing/installing_alibaba/installing-alibaba-default.adoc#installing-alibaba-default[✓]

installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ include::modules/agent-installer-configuring-fips-compliance.adoc[leveloffset=+1
2828

2929
* link:https://access.redhat.com/articles/5059881[OpenShift Security Guide Book]
3030

31+
////
3132
* xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
33+
////
3234

3335
include::modules/agent-install-networking.adoc[leveloffset=+1]
3436

operators/operator_sdk/osdk-generating-csvs.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ include::modules/osdk-csv-manual-annotations.adoc[leveloffset=+2]
4141
* xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#osdk-suggested-namespace-default-node_osdk-generating-csvs[Setting a suggested namespace with default node selector]
4242
* xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#olm-enabling-operator-for-restricted-network_osdk-generating-csvs[Enabling your Operator for restricted network environments] (disconnected mode)
4343
* xref:../../operators/operator_sdk/osdk-generating-csvs.adoc#osdk-hiding-internal-objects_osdk-generating-csvs[Hiding internal objects]
44+
////
4445
* xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS crytography]
46+
////
4547
4648
include::modules/olm-enabling-operator-restricted-network.adoc[leveloffset=+1]
4749
include::modules/olm-enabling-operator-for-multi-arch.adoc[leveloffset=+1]

security/container_security/security-compliance.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ standards or the organization's corporate governance framework.
1313

1414
// Compliance and the NIST risk management model
1515
include::modules/security-compliance-nist.adoc[leveloffset=+1]
16+
17+
////
1618
ifndef::openshift-origin[]
1719

1820
[role="_additional-resources"]
1921
.Additional resources
2022
* xref:../../installing/installing-fips.adoc#installing-fips-mode_installing-fips[Installing a cluster in FIPS mode]
2123
endif::[]
24+
////

security/container_security/security-hardening.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ include::modules/security-hardening-how.adoc[leveloffset=+1]
4444
* xref:../../nodes/nodes/nodes-nodes-managing.adoc#nodes-nodes-kernel-arguments_nodes-nodes-managing[Adding kernel arguments to Nodes]
4545
ifndef::openshift-origin[]
4646
* xref:../../installing/installing_aws/installing-aws-customizations.adoc#installation-configuration-parameters_installing-aws-customizations[Installation configuration parameters] - see `fips`
47-
* xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
4847
* link:https://access.redhat.com/articles/3359851[{op-system-base} core crypto components]
48+
////
49+
* xref:../../installing/installing-fips.adoc#installing-fips[Support for FIPS cryptography]
50+
////
4951
endif::[]

security/container_security/security-hosts-vms.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ include::modules/security-hosts-vms-rhcos.adoc[leveloffset=+1]
2626
* xref:../../architecture/architecture-rhcos.adoc#rhcos-about-ignition_architecture-rhcos[Ignition]
2727
* xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-kargs_installing-customizing[Kernel arguments]
2828
* xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-kmod_installing-customizing[Kernel modules]
29-
ifndef::openshift-origin[]
30-
* xref:../../installing/installing-fips.adoc#installing-fips[FIPS cryptography]
31-
endif::[]
3229
* xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-encrypt-disk_installing-customizing[Disk encryption]
3330
* xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Chrony time service]
3431
* xref:../../updating/understanding-openshift-updates.adoc#update-service-about_understanding-openshift-updates[About the OpenShift Update Service]
32+
////
33+
ifndef::openshift-origin[]
34+
* xref:../../installing/installing-fips.adoc#installing-fips[FIPS cryptography]
35+
endif::[]
36+
////
3537
3638
// Virtualization versus containers
3739
include::modules/security-hosts-vms-vs-containers.adoc[leveloffset=+1]

virt/install/preparing-cluster-for-virt.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ Review this section before you install {VirtProductName} to ensure that your clu
1313
You can use any installation method, including user-provisioned, installer-provisioned, or assisted installer, to deploy {product-title}. However, the installation method and the cluster topology might affect {VirtProductName} functionality, such as snapshots or live migration.
1414
====
1515

16+
////
1617
.FIPS mode
1718

1819
If you install your cluster in xref:../../installing/installing-fips.adoc#installing-fips-mode_installing-fips[FIPS mode], no additional setup is required for {VirtProductName}.
20+
////
1921

2022
.IPv6
2123

0 commit comments

Comments
 (0)