Skip to content

Commit 14521dd

Browse files
xenolinuxxenolinux
authored
Merge pull request #91492 from amolnar-rh/TELCODOCS-2166
TELCODOCS-2166#Clarify the GitOps ZTP update process in Edge Computing
2 parents 5854265 + 9fdacf6 commit 14521dd

File tree

4 files changed

+82
-12
lines changed

4 files changed

+82
-12
lines changed

‎edge_computing/ztp-updating-gitops.adoc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ include::modules/ztp-required-changes-to-the-git-repository.adoc[leveloffset=+1]
3434

3535
include::modules/ztp-installing-the-new-gitops-ztp-applications.adoc[leveloffset=+1]
3636

37+
include::modules/ztp-pulling-ocp-images.adoc[leveloffset=+1]
38+
39+
[role="_additional-resources"]
40+
.Additional resources
41+
42+
* xref:../edge_computing/ztp-preparing-the-hub-cluster.adoc#enabling-assisted-installer-service-on-bare-metal_ztp-preparing-the-hub-cluster[Enabling the assisted service]
43+
3744
include::modules/ztp-roll-out-the-configuration-changes.adoc[leveloffset=+1]
3845

3946
[role="_additional-resources"]

‎modules/ztp-enabling-assisted-installer-service-on-bare-metal.adoc‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,45 @@
99

1010
.Prerequisites
1111

12-
* You have installed the OpenShift CLI (`oc`).
12+
* You have installed the {oc-first}.
1313

1414
* You have logged in to the hub cluster as a user with `cluster-admin` privileges.
1515

16-
* You have {rh-rhacm} with MultiClusterHub enabled.
16+
* You have {rh-rhacm} with `MultiClusterHub` enabled.
1717

1818
.Procedure
1919

2020
. Enable the `Provisioning` resource to watch all namespaces and configure mirrors for disconnected environments. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#enable-cim[Enabling the central infrastructure management service].
2121

22-
. Update the `AgentServiceConfig` CR by running the following command:
22+
. Open the `AgentServiceConfig` CR to update the `spec.osImages` field by running the following command:
2323
+
2424
[source,terminal]
2525
----
2626
$ oc edit AgentServiceConfig
2727
----
2828

29-
. Add the following entry to the `items.spec.osImages` field in the CR:
29+
. Update the `spec.osImages` field in the `AgentServiceConfig` CR:
3030
+
3131
[source,yaml,subs="attributes+"]
3232
----
33-
- cpuArchitecture: x86_64
34-
openshiftVersion: "{product-version}"
35-
rootFSUrl: https://<host>/<path>/rhcos-live-rootfs.x86_64.img
36-
url: https://<host>/<path>/rhcos-live.x86_64.iso
33+
apiVersion: agent-install.openshift.io/v1beta1
34+
kind: AgentServiceConfig
35+
metadata:
36+
name: agent
37+
spec:
38+
# ...
39+
osImages:
40+
- cpuArchitecture: x86_64
41+
openshiftVersion: "{product-version}"
42+
rootFSUrl: https://<host>/<path>/rhcos-live-rootfs.x86_64.img
43+
url: https://<host>/<path>/rhcos-live.x86_64.iso
3744
----
3845
+
3946
where:
4047
+
4148
--
42-
<host> :: Is the fully qualified domain name (FQDN) for the target mirror registry HTTP server.
43-
<path> :: Is the path to the image on the target mirror registry.
49+
`<host>` :: Specifies the fully qualified domain name (FQDN) for the target mirror registry HTTP server.
50+
`<path>` :: Specifies the path to the image on the target mirror registry.
4451
--
45-
+
46-
Save and quit the editor to apply the changes.
52+
53+
. Save and quit the editor to apply the changes.

‎modules/ztp-pulling-ocp-images.adoc‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * scalability_and_performance/ztp_far_edge/ztp-updating-gitops-ztp.adoc
4+
5+
:_mod-docs-content-type: PROCEDURE
6+
[id="ztp-pulling-ocp-images_{context}"]
7+
= Pulling ISO images for the desired {product-title} version
8+
9+
To pull ISO images for the desired {product-title} version, update the `AgentServiceConfig` custom resource (CR) with references to the desired ISO and RootFS images that are hosted on the mirror registry HTTP server.
10+
11+
.Prerequisites
12+
13+
* You have installed the {oc-first}.
14+
15+
* You have logged in to the hub cluster as a user with `cluster-admin` privileges.
16+
17+
* You have {rh-rhacm} with `MultiClusterHub` enabled.
18+
19+
* You have enabled the assisted service.
20+
21+
.Procedure
22+
23+
. Open the `AgentServiceConfig` CR to update the `spec.osImages` field by running the following command:
24+
+
25+
[source,terminal]
26+
----
27+
$ oc edit AgentServiceConfig
28+
----
29+
30+
. Update the `spec.osImages` field in the `AgentServiceConfig` CR:
31+
+
32+
[source,yaml,subs="attributes+"]
33+
----
34+
apiVersion: agent-install.openshift.io/v1beta1
35+
kind: AgentServiceConfig
36+
metadata:
37+
name: agent
38+
spec:
39+
# ...
40+
osImages:
41+
- cpuArchitecture: x86_64
42+
openshiftVersion: "{product-version}"
43+
rootFSUrl: https://<host>/<path>/rhcos-live-rootfs.x86_64.img
44+
url: https://<host>/<path>/rhcos-live.x86_64.iso
45+
----
46+
+
47+
where:
48+
+
49+
--
50+
`<host>` :: Specifies the fully qualified domain name (FQDN) for the target mirror registry HTTP server.
51+
`<path>` :: Specifies the path to the image on the target mirror registry.
52+
--
53+
54+
. Save and quit the editor to apply the changes.

‎modules/ztp-updating-gitops-ztp.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ At a high level, the strategy for updating the {ztp} infrastructure is as follow
2323

2424
. Update required content and optional changes in the Git repository.
2525

26+
. Enable pulling the ISO images for the desired {product-title} version.
27+
2628
. Update and restart the application configuration.

0 commit comments

Comments
 (0)