Skip to content

Commit ed52ba9

Browse files
authored
Merge pull request #90883 from lahinson/ocpbugs-53402-hcp-kcli
[OCPBUGS-53402]: Replacing mentions of kcli from the HCP docs
2 parents 379b94d + 66208c9 commit ed52ba9

File tree

8 files changed

+49
-461
lines changed

8 files changed

+49
-461
lines changed

hosted_control_planes/hcp-disconnected/hcp-deploy-dc-bm.adoc

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ When you provision {hcp} on bare metal, you use the Agent platform. The Agent pl
1111
include::modules/hcp-dc-bm-arch.adoc[leveloffset=+1]
1212
include::modules/hcp-dc-bm-reqs.adoc[leveloffset=+1]
1313
include::modules/hcp-dc-extract.adoc[leveloffset=+1]
14-
include::modules/hcp-dc-hypervisor.adoc[leveloffset=+1]
1514
include::modules/hcp-bm-dns.adoc[leveloffset=+1]
1615
include::modules/hcp-dc-registry.adoc[leveloffset=+1]
1716
include::modules/hcp-dc-mgmt-cluster.adoc[leveloffset=+1]
17+
18+
[role="_additional-resources"]
19+
.Additional resources
20+
* link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.13/html/clusters/cluster_mce_overview#mce-install-intro[Installing and upgrading multicluster engine operator]
21+
* xref:../../hosted_control_planes/hcp-prepare/hcp-enable-disable.html#hcp-enable-manual-addon_hcp-enable-disable[Manually enabling the hypershift-addon managed cluster add-on for local-cluster]
22+
* link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.13/html/clusters/cluster_mce_overview#mce-intro[About cluster lifecycle with multicluster engine operator]
23+
1824
include::modules/hcp-dc-web-server.adoc[leveloffset=+1]
1925
include::modules/hcp-dc-image-mirror.adoc[leveloffset=+1]
2026

@@ -27,17 +33,9 @@ include::modules/hcp-dc-apply-objects.adoc[leveloffset=+1]
2733

2834
[role="_additional-resources"]
2935
.Additional resources
30-
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[Mirroring images for a disconnected installation by using the oc-mirror plugin v2].
36+
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[Mirroring images for a disconnected installation by using the oc-mirror plugin v2]
3137
32-
[id="hcp-dc-mce-bm"]
33-
== Deploying {mce-short} for a disconnected installation of {hcp}
34-
35-
The {mce} plays a crucial role in deploying clusters across providers. If you do not have {mce-short} installed, review the following documentation to understand the prerequisites and steps to install it:
36-
37-
* link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.13/html/clusters/cluster_mce_overview#mce-intro[About cluster lifecycle with multicluster engine operator]
38-
* link:https://docs.redhat.com/en/documentation/red_hat_advanced_cluster_management_for_kubernetes/2.13/html/clusters/cluster_mce_overview#mce-install-intro[Installing and upgrading multicluster engine operator]
39-
40-
include::modules/hcp-agentserviceconfig.adoc[leveloffset=+2]
38+
include::modules/hcp-agentserviceconfig.adoc[leveloffset=+1]
4139

4240
[id="hcp-dc-tls-bm"]
4341
== Configuring TLS certificates for a disconnected installation of {hcp}
@@ -55,6 +53,11 @@ A hosted cluster is an {product-title} cluster with its control plane and API en
5553
include::modules/hcp-hc-objects.adoc[leveloffset=+2]
5654
include::modules/hcp-nodepool-hc.adoc[leveloffset=+2]
5755
include::modules/hcp-dc-infraenv.adoc[leveloffset=+2]
58-
include::modules/hcp-worker-hc.adoc[leveloffset=+2]
5956
include::modules/hcp-bm-hosts.adoc[leveloffset=+2]
57+
58+
[role="_additional-resources"]
59+
.Additional resources
60+
* xref:../../installing/installing_bare_metal/upi/scaling-a-user-provisioned-cluster-with-the-bare-metal-operator.adoc#upi-provisioning-new-hosts-in-a-upi-cluster_scaling-a-user-provisioned-cluster-with-the-bare-metal-operator[Provisioning new hosts in a user-provisioned cluster by using the BMO]
61+
* xref:../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-about_nodes-pods-secrets[Understanding secrets]
62+
6063
include::modules/hcp-dc-scale-np.adoc[leveloffset=+2]

hosted_control_planes/hcp-disconnected/hcp-deploy-dc-virt.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include::modules/hcp-dc-apply-objects.adoc[leveloffset=+1]
2525

2626
[role="_additional-resources"]
2727
.Additional resources
28-
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[Mirroring images for a disconnected installation by using the oc-mirror plugin v2].
28+
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[Mirroring images for a disconnected installation by using the oc-mirror plugin v2]
2929

3030
[id="hcp-dc-mce-virt"]
3131
== Deploying {mce-short} for a disconnected installation of {hcp}

modules/hcp-agentserviceconfig.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ assisted-service-668b49548-9m7xw 2/2 Running 5
121121
122122
.Next steps
123123
124-
Configure TLS certificates by completing the steps in _Configuring TLS certificates for a disconnected installation of {hcp}_.
124+
Configure TLS certificates.

modules/hcp-bm-hosts.adoc

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ A _bare metal host_ is an `openshift-machine-api` object that encompasses physic
1010

1111
.Prerequisites
1212

13-
Before you create the bare metal host and destination nodes, you must have the destination machines ready.
13+
* Before you create the bare metal host and destination nodes, you must have the destination machines ready.
14+
15+
* You have installed a {op-system-first} compute machine on bare-metal infrastructure for use in the cluster.
1416
1517
.Procedure
1618

1719
To create a bare metal host, complete the following steps:
1820

19-
. Create a YAML file with the following information:
21+
. Create a YAML file with the following information. For more information about what details to enter for the bare metal host, see "Provisioning new hosts in a user-provisioned cluster by using the BMO".
2022
+
2123
Because you have at least one secret that holds the bare metal host credentials, you need to create at least two objects for each worker node.
2224
+
@@ -25,31 +27,31 @@ Because you have at least one secret that holds the bare metal host credentials,
2527
apiVersion: v1
2628
kind: Secret
2729
metadata:
28-
name: <hosted_cluster_name>-worker0-bmc-secret \// <1>
29-
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> \// <2>
30+
name: <hosted_cluster_name>-worker0-bmc-secret # <1>
31+
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> # <2>
3032
data:
31-
password: YWRtaW4= \// <3>
32-
username: YWRtaW4= \// <4>
33+
password: YWRtaW4= # <3>
34+
username: YWRtaW4= # <4>
3335
type: Opaque
3436
# ...
3537
apiVersion: metal3.io/v1alpha1
3638
kind: BareMetalHost
3739
metadata:
3840
name: <hosted_cluster_name>-worker0
39-
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> \// <2>
41+
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> # <2>
4042
labels:
41-
infraenvs.agent-install.openshift.io: <hosted_cluster_name> \// <5>
43+
infraenvs.agent-install.openshift.io: <hosted_cluster_name> # <5>
4244
annotations:
4345
inspect.metal3.io: disabled
44-
bmac.agent-install.openshift.io/hostname: <hosted_cluster_name>-worker0 \// <6>
46+
bmac.agent-install.openshift.io/hostname: <hosted_cluster_name>-worker0 # <6>
4547
spec:
46-
automatedCleaningMode: disabled \// <7>
48+
automatedCleaningMode: disabled # <7>
4749
bmc:
48-
disableCertificateVerification: true \// <8>
49-
address: redfish-virtualmedia://[192.168.126.1]:9000/redfish/v1/Systems/local/<hosted_cluster_name>-worker0 \// <9>
50-
credentialsName: <hosted_cluster_name>-worker0-bmc-secret \// <10>
51-
bootMACAddress: aa:aa:aa:aa:02:11 \// <11>
52-
online: true // <12>
50+
disableCertificateVerification: true # <8>
51+
address: redfish-virtualmedia://[192.168.126.1]:9000/redfish/v1/Systems/local/<hosted_cluster_name>-worker0 # <9>
52+
credentialsName: <hosted_cluster_name>-worker0-bmc-secret # <10>
53+
bootMACAddress: aa:aa:aa:aa:02:11 # <11>
54+
online: true # <12>
5355
----
5456
+
5557
<1> Replace `<hosted_cluster_name>` with your hosted cluster.

modules/hcp-dc-hypervisor.adoc

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

modules/hcp-dc-image-mirror.adoc

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@ mirror:
4040
type: ocp
4141
kubeVirtContainer: true <2>
4242
graph: true
43-
additionalImages: <3>
44-
- name: quay.io/karmab/origin-keepalived-ipfailover:latest
45-
- name: quay.io/karmab/kubectl:latest
46-
- name: quay.io/karmab/haproxy:latest
47-
- name: quay.io/karmab/mdns-publisher:latest
48-
- name: quay.io/karmab/origin-coredns:latest
49-
- name: quay.io/karmab/curl:latest
50-
- name: quay.io/karmab/kcli:latest
51-
- name: quay.io/user-name/trbsht:latest
52-
- name: quay.io/user-name/hypershift:BMSelfManage-v{product-version}
53-
- name: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.10
5443
operators:
5544
- catalog: registry.redhat.io/redhat/redhat-operator-index:v{product-version}
5645
packages:
@@ -61,13 +50,12 @@ mirror:
6150
- name: mcg-operator
6251
- name: ocs-operator
6352
- name: metallb-operator
64-
- name: kubevirt-hyperconverged <4>
53+
- name: kubevirt-hyperconverged <3>
6554
----
6655
+
6756
<1> Replace `<4.x.y-build>` with the supported {product-title} version you want to use.
6857
<2> Set this optional flag to `true` if you want to also mirror the container disk image for the {op-system-first} boot image for the KubeVirt provider. This flag is available with oc-mirror v2 only.
69-
<3> Images specified in the `additionalImages` field are examples only and are not strictly needed.
70-
<4> For deployments that use the KubeVirt provider, include this line.
58+
<3> For deployments that use the KubeVirt provider, include this line.
7159

7260
. Start the mirroring process by entering the following command:
7361
+

0 commit comments

Comments
 (0)