Skip to content

Commit 4a8255b

Browse files
authored
Merge pull request #101796 from lahinson/osdocs-17180-hcp-env-namespace
[OSDOCS-17180]: Correct env namespace in HCP disconnected docs
2 parents 29a9301 + 2383f8a commit 4a8255b

File tree

2 files changed

+49
-33
lines changed

2 files changed

+49
-33
lines changed

modules/hcp-bm-hosts.adoc

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,45 +27,58 @@ Because you have at least one secret that holds the bare metal host credentials,
2727
apiVersion: v1
2828
kind: Secret
2929
metadata:
30-
name: <hosted_cluster_name>-worker0-bmc-secret # <1>
31-
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> # <2>
30+
name: <hosted_cluster_name>-worker0-bmc-secret
31+
namespace: <hosted_cluster_namespace>
3232
data:
33-
password: YWRtaW4= # <3>
34-
username: YWRtaW4= # <4>
33+
password: YWRtaW4=
34+
username: YWRtaW4=
3535
type: Opaque
3636
# ...
3737
apiVersion: metal3.io/v1alpha1
3838
kind: BareMetalHost
3939
metadata:
4040
name: <hosted_cluster_name>-worker0
41-
namespace: <hosted_cluster_namespace>-<hosted_cluster_name> # <2>
41+
namespace: <hosted_cluster_namespace>
4242
labels:
43-
infraenvs.agent-install.openshift.io: <hosted_cluster_name> # <5>
43+
infraenvs.agent-install.openshift.io: <hosted_cluster_name>
4444
annotations:
4545
inspect.metal3.io: disabled
46-
bmac.agent-install.openshift.io/hostname: <hosted_cluster_name>-worker0 # <6>
46+
bmac.agent-install.openshift.io/hostname: <hosted_cluster_name>-worker0
4747
spec:
48-
automatedCleaningMode: disabled # <7>
48+
automatedCleaningMode: disabled
4949
bmc:
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>
50+
disableCertificateVerification: true
51+
address: redfish-virtualmedia://[192.168.126.1]:9000/redfish/v1/Systems/local/<hosted_cluster_name>-worker0
52+
credentialsName: <hosted_cluster_name>-worker0-bmc-secret
53+
bootMACAddress: aa:aa:aa:aa:02:11
54+
online: true
5555
----
5656
+
57-
<1> Replace `<hosted_cluster_name>` with your hosted cluster.
58-
<2> Replace `<hosted_cluster_name>` with your hosted cluster. Replace `<hosted_cluster_namespace>` with the name of your hosted cluster namespace.
59-
<3> Specify the password of the baseboard management controller (BMC) in Base64 format.
60-
<4> Specify the user name of the BMC in Base64 format.
61-
<5> Replace `<hosted_cluster_name>` with your hosted cluster. The `infraenvs.agent-install.openshift.io` field serves as the link between the Assisted Installer and the `BareMetalHost` objects.
62-
<6> Replace `<hosted_cluster_name>` with your hosted cluster. The `bmac.agent-install.openshift.io/hostname` field represents the node name that is adopted during deployment.
63-
<7> The `automatedCleaningMode` field prevents the node from being erased by the Metal3 Operator.
64-
<8> The `disableCertificateVerification` field is set to `true` to bypass certificate validation from the client.
65-
<9> Replace `<hosted_cluster_name>` with your hosted cluster. The `address` field denotes the BMC address of the worker node.
66-
<10> Replace `<hosted_cluster_name>` with your hosted cluster. The `credentialsName` field points to the secret where the user and password credentials are stored.
67-
<11> The `bootMACAddress` field indicates the interface MAC address that the node starts from.
68-
<12> The `online` field defines the state of the node after the `BareMetalHost` object is created.
57+
where:
58+
59+
<hosted_cluster_name>:: Specifies the name of your hosted cluster.
60+
61+
<hosted_cluster_namespace>:: Specifies the name of your hosted cluster namespace.
62+
63+
password:: Specifies the password of the baseboard management controller (BMC) in Base64 format.
64+
65+
username:: Specifies the user name of the BMC in Base64 format.
66+
67+
infraenvs.agent-install.openshift.io:: Serves as the link between the Assisted Installer and the `BareMetalHost` objects.
68+
69+
bmac.agent-install.openshift.io/hostname:: Represents the node name that is adopted during deployment.
70+
71+
automatedCleaningMode:: Prevents the node from being erased by the Metal3 Operator.
72+
73+
disableCertificateVerification:: Is set to `true` to bypass certificate validation from the client.
74+
75+
address:: Denotes the BMC address of the worker node.
76+
77+
credentialsName:: Points to the secret where the user and password credentials are stored.
78+
79+
bootMACAddress:: Indicates the interface MAC address that the node starts from.
80+
81+
online:: Defines the state of the node after the `BareMetalHost` object is created.
6982

7083
. Deploy the `BareMetalHost` object by entering the following command:
7184
+

modules/hcp-dc-infraenv.adoc

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="hcp-dc-infraenv_{context}"]
77
= Creating an InfraEnv resource for the hosted cluster
88

9-
The `InfraEnv` resource is an Assisted Service object that includes essential details, such as the `pullSecretRef` and the `sshAuthorizedKey`. Those details are used to create the Red Hat Enterprise Linux CoreOS (RHCOS) boot image that is customized for the hosted cluster.
9+
The `InfraEnv` resource is an Assisted Service object that includes essential details, such as the `pullSecretRef` and the `sshAuthorizedKey`. Those details are used to create the {op-system-first} boot image that is customized for the hosted cluster.
1010

1111
You can host more than one `InfraEnv` resource, and each one can adopt certain types of hosts. For example, you might want to divide your server farm between a host that has greater RAM capacity.
1212

@@ -20,17 +20,20 @@ apiVersion: agent-install.openshift.io/v1beta1
2020
kind: InfraEnv
2121
metadata:
2222
name: <hosted_cluster_name>
23-
namespace: <hosted-cluster-namespace>-<hosted_cluster_name> <1> <2>
23+
namespace: <hosted_cluster_namespace>
2424
spec:
25-
pullSecretRef: <3>
25+
pullSecretRef:
2626
name: pull-secret
27-
sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDk7ICaUE+/k4zTpxLk4+xFdHi4ZuDi5qjeF52afsNkw0w/glILHhwpL5gnp5WkRuL8GwJuZ1VqLC9EKrdmegn4MrmUlq7WTsP0VFOZFBfq2XRUxo1wrRdor2z0Bbh93ytR+ZsDbbLlGngXaMa0Vbt+z74FqlcajbHTZ6zBmTpBVq5RHtDPgKITdpE1fongp7+ZXQNBlkaavaqv8bnyrP4BWahLP4iO9/xJF9lQYboYwEEDzmnKLMW1VtCE6nJzEgWCufACTbxpNS7GvKtoHT/OVzw8ArEXhZXQUS1UY8zKsX2iXwmyhw5Sj6YboA8WICs4z+TrFP89LmxXY0j6536TQFyRz1iB4WWvCbH5n6W+ABV2e8ssJB1AmEy8QYNwpJQJNpSxzoKBjI73XxvPYYC/IjPFMySwZqrSZCkJYqQ023ySkaQxWZT7in4KeMu7eS2tC+Kn4deJ7KwwUycx8n6RHMeD8Qg9flTHCv3gmab8JKZJqN3hW1D378JuvmIX4V0= <4>
27+
sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDk7ICaUE+/k4zTpxLk4+xFdHi4ZuDi5qjeF52afsNkw0w/glILHhwpL5gnp5WkRuL8GwJuZ1VqLC9EKrdmegn4MrmUlq7WTsP0VFOZFBfq2XRUxo1wrRdor2z0Bbh93ytR+ZsDbbLlGngXaMa0Vbt+z74FqlcajbHTZ6zBmTpBVq5RHtDPgKITdpE1fongp7+ZXQNBlkaavaqv8bnyrP4BWahLP4iO9/xJF9lQYboYwEEDzmnKLMW1VtCE6nJzEgWCufACTbxpNS7GvKtoHT/OVzw8ArEXhZXQUS1UY8zKsX2iXwmyhw5Sj6YboA8WICs4z+TrFP89LmxXY0j6536TQFyRz1iB4WWvCbH5n6W+ABV2e8ssJB1AmEy8QYNwpJQJNpSxzoKBjI73XxvPYYC/IjPFMySwZqrSZCkJYqQ023ySkaQxWZT7in4KeMu7eS2tC+Kn4deJ7KwwUycx8n6RHMeD8Qg9flTHCv3gmab8JKZJqN3hW1D378JuvmIX4V0=
2828
----
2929
+
30-
<1> Replace `<hosted_cluster_name>` with your hosted cluster.
31-
<2> Replace `<hosted_cluster_namespace>` with the name of your hosted cluster namespace.
32-
<3> The `pullSecretRef` refers to the config map reference in the same namespace as the `InfraEnv`, where the pull secret is used.
33-
<4> The `sshAuthorizedKey` represents the SSH public key that is placed in the boot image. The SSH key allows access to the worker nodes as the `core` user.
30+
where:
31+
32+
<hosted_cluster_namespace>:: Specifies the name of your hosted cluster namespace.
33+
34+
pullSecretRef:: Specifies the config map reference in the same namespace as the `InfraEnv`, where the pull secret is used.
35+
36+
sshAuthorizedKey:: Specifies the SSH public key that is placed in the boot image. The SSH key allows access to the worker nodes as the `core` user.
3437

3538
. Create the `InfraEnv` resource by entering the following command:
3639
+

0 commit comments

Comments
 (0)