Skip to content

Commit d00de6c

Browse files
author
Shubha Narayanan
committed
IPI improvements
1 parent e547ecc commit d00de6c

7 files changed

+68
-88
lines changed

installing/installing_azure/ipi/installing-azure-government-region.adoc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ Microsoft Azure into a government region. To configure the government region,
1111
you modify parameters in the `install-config.yaml` file before you install the
1212
cluster.
1313

14-
== Prerequisites
15-
16-
* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
17-
* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
18-
* You xref:../../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster and determined the tested and validated government region to deploy the cluster to.
19-
* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
20-
* If the cloud identity and access management (IAM) APIs are not accessible in your environment, or if you do not want to store an administrator-level credential secret in the `kube-system` namespace, you can xref:../../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[manually create and maintain long-term credentials].
21-
* If you use customer-managed encryption keys, you xref:../../../installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc#preparing-disk-encryption-sets_installing-azure-preparing-ipi[prepared your Azure environment for encryption].
22-
2314
include::modules/installation-azure-about-government-region.adoc[leveloffset=+1]
2415

2516
include::modules/private-clusters-default.adoc[leveloffset=+1]

installing/installing_azure/ipi/installing-azure-network-customizations.adoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ You must set most of the network configuration parameters during installation,
1616
and you can modify only `kubeProxy` configuration parameters in a running
1717
cluster.
1818

19-
== Prerequisites
20-
21-
* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
22-
* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
23-
* You xref:../../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster and determined the tested and validated region to deploy the cluster to.
24-
* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
25-
* If you use customer-managed encryption keys, you xref:../../../installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc#preparing-disk-encryption-sets_installing-azure-preparing-ipi[prepared your Azure environment for encryption].
26-
2719
include::modules/installation-initializing.adoc[leveloffset=+1]
2820

2921
[role="_additional-resources"]

installing/installing_azure/ipi/installing-azure-private.adoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ toc::[]
88

99
In {product-title} version {product-version}, you can install a private cluster into an existing Azure Virtual Network (VNet) on Microsoft Azure. The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster.
1010

11-
== Prerequisites
12-
13-
* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
14-
* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
15-
* You xref:../../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster and determined the tested and validated region to deploy the cluster to.
16-
* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
17-
* If you use customer-managed encryption keys, you xref:../../../installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc#preparing-disk-encryption-sets_installing-azure-preparing-ipi[prepared your Azure environment for encryption].
18-
1911
include::modules/private-clusters-default.adoc[leveloffset=+1]
2012

2113
include::modules/private-clusters-about-azure.adoc[leveloffset=+2]

installing/installing_azure/ipi/installing-azure-vnet.adoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ toc::[]
88

99
In {product-title} version {product-version}, you can install a cluster into an existing Azure Virtual Network (VNet) on Microsoft Azure. The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster.
1010

11-
== Prerequisites
12-
13-
* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
14-
* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
15-
* You xref:../../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster and determined the tested and validated region to deploy the cluster to.
16-
* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
17-
* If you use customer-managed encryption keys, you xref:../../../installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc#preparing-disk-encryption-sets_installing-azure-preparing-ipi[prepared your Azure environment for encryption].
18-
1911
include::modules/installation-about-custom-azure-vnet.adoc[leveloffset=+1]
2012

2113
[role="_additional-resources"]

installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ You can install an {product-title} cluster by using mirrored installation releas
1616
[id="prerequisites_installing-restricted-networks-azure-installer-provisioned"]
1717
== Prerequisites
1818

19-
* You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
20-
* You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
21-
* You xref:../../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[configured an Azure account] to host the cluster and determined the tested and validated region to deploy the cluster.
2219
* You xref:../../../installing/disconnected_install/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[mirrored the images for a disconnected installation] to your registry and obtained the `imageContentSources` data for your version of {product-title}.
2320
+
2421
[IMPORTANT]
2522
====
2623
Because the installation media is on the mirror host, you can use that computer to complete all installation steps.
2724
====
2825
* You have an existing VNet in Azure. While installing a cluster in a restricted network that uses installer-provisioned infrastructure, you cannot use the installer-provisioned VNet. You must use a user-provisioned VNet that satisfies one of the following requirements:
29-
** The VNet contains the mirror registry
30-
** The VNet has firewall rules or a peering connection to access the mirror registry hosted elsewhere
31-
* If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
32-
* If you use customer-managed encryption keys, you xref:../../../installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc#preparing-disk-encryption-sets_installing-azure-preparing-ipi[prepared your Azure environment for encryption].
26+
** The VNet contains the mirror registry.
27+
** The VNet has firewall rules or a peering connection to access the mirror registry hosted elsewhere.
3328

3429
include::modules/installation-about-restricted-network.adoc[leveloffset=+1]
3530

@@ -44,10 +39,6 @@ include::modules/installation-about-custom-azure-vnet.adoc[leveloffset=+1]
4439

4540
* xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[Configuring your firewall]
4641

47-
include::modules/cluster-entitlements.adoc[leveloffset=+1]
48-
49-
include::modules/ssh-agent-using.adoc[leveloffset=+1]
50-
5142
include::modules/installation-initializing.adoc[leveloffset=+1]
5243

5344
[role="_additional-resources"]
@@ -67,9 +58,6 @@ include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
6758

6859
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
6960

70-
//Installing the OpenShift CLI by downloading the binary: Moved up to precede manual cred (short and long) steps, which require the use of `oc`
71-
include::modules/cli-installing-cli.adoc[leveloffset=+1]
72-
7361
[id="installing-azure-manual-modes_{context}"]
7462
== Alternatives to storing administrator-level secrets in the kube-system project
7563

@@ -101,13 +89,6 @@ include::modules/installation-launching-installer.adoc[leveloffset=+1]
10189

10290
include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
10391

104-
include::modules/cluster-telemetry.adoc[leveloffset=+1]
105-
106-
[role="_additional-resources"]
107-
.Additional resources
108-
109-
* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service
110-
11192
== Next steps
11293

11394
* xref:../../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster].

modules/installation-azure-confidential-vms.adoc

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,31 @@ Confidential VMs are currently not supported on 64-bit ARM architectures.
4040
4141
.Procedure
4242

43-
* Use a text editor to edit the `install-config.yaml` file prior to deploying your cluster and add the following stanza:
43+
* Edit the `install-config.yaml` file before deploying your cluster:
44+
45+
** Enable confidential VMs only on control plane by adding the following stanza:
4446
+
4547
[source,yaml]
4648
----
47-
controlPlane: <1>
49+
controlPlane:
4850
platform:
4951
azure:
5052
settings:
51-
securityType: ConfidentialVM <2>
53+
securityType: ConfidentialVM
5254
confidentialVM:
5355
uefiSettings:
54-
secureBoot: Enabled <3>
55-
virtualizedTrustedPlatformModule: Enabled <4>
56+
secureBoot: Enabled
57+
virtualizedTrustedPlatformModule: Enabled
5658
osDisk:
5759
securityProfile:
58-
securityEncryptionType: VMGuestStateOnly <5>
60+
securityEncryptionType: VMGuestStateOnly
5961
----
60-
<1> Specify `controlPlane.platform.azure` or `compute.platform.azure` to deploy confidential VMs on only control plane or compute nodes respectively. Specify `platform.azure.defaultMachinePlatform` to deploy confidential VMs on all nodes.
61-
<2> Enable confidential VMs.
62-
<3> Enable secure boot. For more information, see the Azure documentation about link:https://learn.microsoft.com/en-us/azure/virtual-machines/trusted-launch#secure-boot[secure boot].
63-
<4> Enable the virtualized Trusted Platform Module. For more information, see the Azure documentation about link:https://learn.microsoft.com/en-us/windows/security/hardware-security/tpm/trusted-platform-module-overview[virtualized Trusted Platform Modules].
64-
<5> Specify `VMGuestStateOnly` to encrypt the VM guest state.
6562

66-
// commenting out the second option until https://issues.redhat.com/browse/OCPBUGS-18379 is fixed
67-
////
68-
+
69-
.. To use confidential VMs that encrypt both the VM guest state and the OS disk:
63+
** Enable confidential VMs only on compute nodes by adding the following stanza:
7064
+
7165
[source,yaml]
7266
----
73-
controlPlane:
67+
compute:
7468
platform:
7569
azure:
7670
settings:
@@ -81,12 +75,23 @@ controlPlane:
8175
virtualizedTrustedPlatformModule: Enabled
8276
osDisk:
8377
securityProfile:
84-
securityEncryptionType: DiskWithVMGuestState <1>
85-
diskEncryptionSet: <2>
86-
resourceGroup: <your-resource-group-name>
87-
name: <your-des-name>
88-
subscriptionId: <subscription-uuid>
78+
securityEncryptionType: VMGuestStateOnly
79+
----
80+
81+
** Enable confidential VMs on all nodes by adding the following stanza:
82+
+
83+
84+
[source,yaml]
8985
----
90-
<1> Enable OS disk and VM guest state encryption.
91-
<2> Specify disk encryption set parameters for user-managed encryption, or omit the `diskEncryptionSet` stanza for platform-managed encryption.
92-
////
86+
platform:
87+
azure:
88+
settings:
89+
securityType: ConfidentialVM
90+
confidentialVM:
91+
uefiSettings:
92+
secureBoot: Enabled
93+
virtualizedTrustedPlatformModule: Enabled
94+
osDisk:
95+
securityProfile:
96+
securityEncryptionType: VMGuestStateOnly
97+
----

modules/installation-azure-trusted-launch.adoc

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
You can enable two trusted launch features when installing your cluster on Azure: link:https://learn.microsoft.com/en-us/azure/virtual-machines/trusted-launch#secure-boot[secure boot] and link:https://learn.microsoft.com/en-us/windows/security/hardware-security/tpm/trusted-platform-module-overview[virtualized Trusted Platform Modules].
1010

11-
See the Azure documentation about link:https://learn.microsoft.com/en-us/azure/virtual-machines/trusted-launch#virtual-machines-sizes[virtual machine sizes] to learn what sizes of virtual machines support these features.
11+
For more information about the sizes of virtual machines that support the trusted launch features, see link:https://learn.microsoft.com/en-us/azure/virtual-machines/trusted-launch#virtual-machines-sizes[Virtual machine sizes].
1212

1313
:FeatureName: Trusted launch
1414

@@ -19,21 +19,48 @@ include::snippets/technology-preview.adoc[]
1919
2020
.Procedure
2121

22-
* Use a text editor to edit the `install-config.yaml` file prior to deploying your cluster and add the following stanza:
22+
* Edit the `install-config.yaml` file before deploying your cluster:
23+
24+
** Enable trusted launch only on control plane by adding the following stanza:
2325
+
2426
[source,yaml]
2527
----
26-
controlPlane: <1>
28+
controlPlane:
2729
platform:
2830
azure:
2931
settings:
30-
securityType: TrustedLaunch <2>
32+
securityType: TrustedLaunch
3133
trustedLaunch:
3234
uefiSettings:
33-
secureBoot: Enabled <3>
34-
virtualizedTrustedPlatformModule: Enabled <4>
35+
secureBoot: Enabled
36+
virtualizedTrustedPlatformModule: Enabled
37+
----
38+
39+
** Enable trusted launch only on compute node by adding the following stanza:
40+
+
41+
[source,yaml]
42+
----
43+
compute:
44+
platform:
45+
azure:
46+
settings:
47+
securityType: TrustedLaunch
48+
trustedLaunch:
49+
uefiSettings:
50+
secureBoot: Enabled
51+
virtualizedTrustedPlatformModule: Enabled
52+
----
53+
54+
** Enable trusted launch on all nodes by adding the following stanza:
55+
+
56+
[source,yaml]
3557
----
36-
<1> Specify `controlPlane.platform.azure` or `compute.platform.azure` to enable trusted launch on only control plane or compute nodes respectively. Specify `platform.azure.defaultMachinePlatform` to enable trusted launch on all nodes.
37-
<2> Enable trusted launch features.
38-
<3> Enable secure boot. For more information, see the Azure documentation about link:https://learn.microsoft.com/en-us/azure/virtual-machines/trusted-launch#secure-boot[secure boot].
39-
<4> Enable the virtualized Trusted Platform Module. For more information, see the Azure documentation about link:https://learn.microsoft.com/en-us/windows/security/hardware-security/tpm/trusted-platform-module-overview[virtualized Trusted Platform Modules].
58+
platform:
59+
azure:
60+
settings:
61+
securityType: TrustedLaunch
62+
trustedLaunch:
63+
uefiSettings:
64+
secureBoot: Enabled
65+
virtualizedTrustedPlatformModule: Enabled
66+
----

0 commit comments

Comments
 (0)