Merge pull request #96 from alosadagrande/lab-4.16

Update Lab to 4.16

.github/workflows/docs.yml

@@ -8,6 +8,7 @@ on:
       - 'lab-4.13'
       - 'lab-4.14'
       - 'lab-4.15'
+      - 'lab-4.16'
 env:
   SITE_DIR: "gh-pages"
 jobs:

dev-site.yml

@@ -11,12 +11,12 @@ content:
   sources:
     - url: .
       branches:
-      - 'lab-4.15'
+      - 'lab-4.16'
       start_path: documentation
 
 asciidoc:
   attributes:
-    release-version: 4.15
+    release-version: 4.16
     page-pagination: true
   extensions:
     - ./lib/tab-block.js

documentation/antora.yml

@@ -1,4 +1,4 @@
-name: 4.15
+name: 4.16
 title: LAB - 5G RAN Deployments on OpenShift
 version: ~
 nav:

documentation/modules/ROOT/nav.adoc

@@ -136,11 +136,15 @@
 *** xref:crafting-deployments-iac.adoc#baremetal-node-details[Bare Metal Node Details]
 *** xref:crafting-deployments-iac.adoc#pre-reqs[Deployment Prerequesites]
 *** xref:crafting-deployments-iac.adoc#siteconfig[SiteConfig]
+*** xref:crafting-deployments-iac.adoc#reference-manifest-siteconfig[Reference Manifest Configuration]
+*** xref:crafting-deployments-iac.adoc#extra-manifest-siteconfig[Extra Manifest Configuration]
+*** xref:crafting-deployments-iac.adoc#preparing-installation[Preparing for the Installation]
 
 * xref:crafting-cluster-telco-related-infra-operators-configs.adoc[Crafting Cluster and Telco Related Infrastructure Operators Configs]
 ** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#crafting-common-policies[Crafting Common Policies]
 ** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#crafting-group-policies[Crafting Group Policies]
 ** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#crafting-site-policies[Crafting Site Policies]
+** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#crafting-custom-policies[Adding custom content]
 ** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#crafting-testing-policies[Crafting testing Policies]
 ** xref:crafting-cluster-telco-related-infra-operators-configs.adoc#configure-kustomization-for-policies[Configure Kustomization for Policies]
 
@@ -195,7 +199,6 @@
 *** xref:lab-environment.adoc#install-kcli[Install kcli]
 *** xref:lab-environment.adoc#install-oc-kubectl[Install oc/kubectl CLIs]
 *** xref:lab-environment.adoc#configure-disconnected-network[Configure Disconnected Networks]
-*** xref:lab-environment.adoc#update-qemu-sriov[Update QEMU to support SR-IOV]
 *** xref:lab-environment.adoc#configure-local-dns-dhcp-server[Configure Local DNS/DHCP Server]
 *** xref:lab-environment.adoc#configure-local-dns-as-primary-server[Configure Local DNS as Primary Server]
 *** xref:lab-environment.adoc#disable-firewall[Disable Firewall]

documentation/modules/ROOT/pages/_attributes.adoc

@@ -1,72 +1,75 @@
-:experimental:
+code:experimental:
 :source-highlighter: highlightjs
-:branch: lab-4.15
-:github-repo: https://github.com/RHsyseng/5g-ran-deployments-on-ocp-lab/blob/{branch}
+:branch: lab-4.16
+// :github-repo: https://github.com/RHsyseng/5g-ran-deployments-on-ocp-lab/blob/{branch}
+//:repo_user: RHsyseng
+:repo_user: alosadagrande
+:github-repo: https://github.com/{repo_user}/5g-ran-deployments-on-ocp-lab/blob/{branch}
 :profile: 5g-ran-lab
-:openshift-release: v4.15
+:openshift-release: v4.16
 :rds-link: https://docs.google.com/document/d/1qWUNGGaEEnzEF3hO0b00K1531YXQf0IxIUmq0FchB3I
-:policygen-common-file: common-415.yaml
-:policygen-common-label: ocp415
-:lvms-channel: stable-4.15
-:catalogsource-index-image-tag: v4.15-1711601986
-:ztp-sitegenerate-disconnected-image: infra.5g-deployment.lab:8443/openshift4/ztp-site-generate-rhel8:v4.15.0-32
-:example-sno-siteconfig-link: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.15/ztp/gitops-subscriptions/argocd/example/siteconfig/example-sno.yaml
-:example-groupdu-policygen-link: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.15/ztp/gitops-subscriptions/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
-:reference-documentation: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/ztp-vdu-validating-cluster-tuning.html#ztp-du-firmware-config-reference_vdu-config-ref
-:hub-cluster-ocp-version: v4.15.3
-:hub-cluster-kubeversion: v1.28.7+6e2789b
-:sno-cluster-version1: v4.15.0
-:sno-cluster-version2: v4.15.3
-:sno-cluster-version1-kubeversion: v1.28.7+6e2789b
-:sno-cluster-version2-kubeversion: v1.28.7+6e2789b
-:sno-cluster-version1-cvo: 4.15.0
-:sno-cluster-version2-cvo: 4.15.3
+:policygen-common-file: common-416.yaml
+:policygen-common-label: ocp416
+:lvms-channel: stable-4.16
+:catalogsource-index-image-tag: v4.16-1723045275
+:ztp-sitegenerate-disconnected-image: infra.5g-deployment.lab:8443/openshift4/ztp-site-generate-rhel8:v4.16.1-5
+:example-sno-siteconfig-link: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.16/ztp/gitops-subscriptions/argocd/example/siteconfig/example-sno.yaml
+:example-groupdu-policygen-link: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.16/ztp/gitops-subscriptions/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
+:reference-documentation: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/ztp_far_edge/ztp-vdu-validating-cluster-tuning.html#ztp-du-firmware-config-reference_vdu-config-ref
+:hub-cluster-ocp-version: v4.16.3
+:hub-cluster-kubeversion: v1.29.6+aba1e8d
+:sno-cluster-version1: v4.16.0
+:sno-cluster-version2: v4.16.3
+:sno-cluster-version1-kubeversion: v1.29.5+29c95f3
+:sno-cluster-version2-kubeversion: v1.29.6+aba1e8d
+:sno-cluster-version1-cvo: 4.16.0
+:sno-cluster-version2-cvo: 4.16.3
 :active-ocp-version-clusterimageset: infra.5g-deployment.lab:8443/openshift/release-images:{sno-cluster-version1-cvo}-x86_64
-:talm-update-file: zone-europe-upgrade-415-3.yaml
-:talm-update-channel: stable-4.15
-:talm-update-version: 4.15.3
+:talm-update-file: zone-europe-upgrade-416-3.yaml
+:talm-update-channel: stable-4.16
+:talm-update-version: 4.16.3
 // oc adm release info 4.15.3 | grep "Pull From"
-:talm-update-image: infra.5g-deployment.lab:8443/openshift/release-images@sha256:8e8c6c2645553e6df8eb7985d8cb322f333a4152453e2aa85fff24ac5e0755b0
-:talm-update-policy-name: version-415-3
-:rhacm-version: v2.10
-:rhacm-template-processing: https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html/governance/governance#template-processing
-:mce-version: v2.5
-:policygentool-version: v4.15
-:kcli-tools-tag: 4.15
-:rhcos-rootfs-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.15/4.15.0/rhcos-4.15.0-x86_64-live-rootfs.x86_64.img
-:rhcos-rootfs-filename: rhcos-4.15.0-x86_64-live-rootfs.x86_64.img
-:rhcos-liveiso-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.15/4.15.0/rhcos-4.15.0-x86_64-live.x86_64.iso
-:rhcos-liveiso-filename: rhcos-4.15.0-x86_64-live.x86_64.iso
-:disconnected-registry-docs: https://docs.openshift.com/container-platform/4.15/installing/disconnected_install/installing-mirroring-disconnected.html
-:openshift-gitops-docs: https://docs.openshift.com/gitops/1.11/understanding_openshift_gitops/about-redhat-openshift-gitops.html
-:cnf-features-source-crs: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.15/ztp/source-crs
-:cnf-features-siteconfig-gen: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.15/ztp/siteconfig-generator
-:cnf-features-policy-gen: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.15/ztp/policygenerator
-:cnf-features-clustersgo: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.15/ztp/siteconfig-generator/siteConfig/clusterCRsV1.go
-:cnf-features-siteconfig-plugin: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.15/ztp/siteconfig-generator-kustomize-plugin
-:cnf-features-policygen-plugin: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.15/ztp/policygenerator-kustomize-plugin
-:rhacm-governance-doc: https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html/governance/governance
-:ocp-cli-docs: https://docs.openshift.com/container-platform/4.15/cli_reference/openshift_cli/getting-started-cli.html
-:sno-preparing-docs: https://docs.openshift.com/container-platform/4.15/installing/installing_sno/install-sno-preparing-to-install-sno.html#install-sno-requirements-for-installing-on-a-single-node_install-sno-preparing
-:sno-installing-docs: https://docs.openshift.com/container-platform/4.15/installing/installing_sno/install-sno-installing-sno.html#installing-single-node-openshift-using-the-assisted-installer
-:sno-install-manually-docs: https://docs.openshift.com/container-platform/4.15/installing/installing_sno/install-sno-installing-sno.html#install-sno-installing-sno-manually
-:talm-recovery-from-failed-upgrade-doc: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html#talo-backup-recovery_cnf-topology-aware-lifecycle-manager
-:talm-cluster-upgrades-doc: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html
+:talm-update-image: infra.5g-deployment.lab:8443/openshift/release-images@sha256:3ec3a43ded1decc18134e5677f56037d8929f4442930f5d1156e7a77cdf1b9b3
+:talm-update-policy-name: version-416-3
+:rhacm-version: v2.11
+:rhacm-template-processing: https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/governance/governance#template-processing
+:mce-version: v2.6
+:policygentool-version: v4.16
+:kcli-tools-tag: 4.16
+:rhcos-rootfs-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.16/4.16.0/rhcos-4.16.0-x86_64-live-rootfs.x86_64.img
+:rhcos-rootfs-filename: rhcos-4.16.0-x86_64-live-rootfs.x86_64.img
+:rhcos-liveiso-url: https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.16/4.16.0/rhcos-4.16.0-x86_64-live.x86_64.iso
+:rhcos-liveiso-filename: rhcos-4.16.0-x86_64-live.x86_64.iso
+:disconnected-registry-docs: https://docs.openshift.com/container-platform/4.16/installing/disconnected_install/installing-mirroring-disconnected.html
+:openshift-gitops-docs: https://docs.openshift.com/gitops/1.13/understanding_openshift_gitops/about-redhat-openshift-gitops.html
+:cnf-features-source-crs: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.16/ztp/source-crs
+:cnf-features-siteconfig-gen: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.16/ztp/siteconfig-generator
+:cnf-features-policy-gen: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.16/ztp/policygenerator
+:cnf-features-clustersgo: https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.16/ztp/siteconfig-generator/siteConfig/clusterCRsV1.go
+:cnf-features-siteconfig-plugin: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.16/ztp/siteconfig-generator-kustomize-plugin
+:cnf-features-policygen-plugin: https://github.com/openshift-kni/cnf-features-deploy/tree/release-4.16/ztp/policygenerator-kustomize-plugin
+:rhacm-governance-doc: https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/governance/governance
+:ocp-cli-docs: https://docs.openshift.com/container-platform/4.16/cli_reference/openshift_cli/getting-started-cli.html
+:sno-preparing-docs: https://docs.openshift.com/container-platform/4.16/installing/installing_sno/install-sno-preparing-to-install-sno.html#install-sno-requirements-for-installing-on-a-single-node_install-sno-preparing
+:sno-installing-docs: https://docs.openshift.com/container-platform/4.16/installing/installing_sno/install-sno-installing-sno.html#installing-single-node-openshift-using-the-assisted-installer
+:sno-install-manually-docs: https://docs.openshift.com/container-platform/4.16/installing/installing_sno/install-sno-installing-sno.html#install-sno-installing-sno-manually
+:talm-recovery-from-failed-upgrade-doc: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html#talo-backup-recovery_cnf-topology-aware-lifecycle-manager
+:talm-cluster-upgrades-doc: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html
 :talm-upstream-project: https://github.com/openshift-kni/cluster-group-upgrades-operator
-:talm-precachingconfig-doc:https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/ztp-talm-updating-managed-policies.html#talm-prechache-user-specified-images-concept_ztp-talm
-:workload-hints-doc: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/cnf-low-latency-tuning.html#cnf-understanding-workload-hints_cnf-master
-:ztp-gitops-docs: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/ztp-preparing-the-hub-cluster.html#installing-disconnected-rhacm_ztp-preparing-the-hub-cluster
-:nto-docs: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/using-node-tuning-operator.html
-:sriov-docs: https://docs.openshift.com/container-platform/4.15/networking/hardware_networks/about-sriov.html
-:sriov-supported-nics: https://docs.openshift.com/container-platform/4.15/networking/hardware_networks/about-sriov.html#supported-devices_about-sriov
-:ptp-docs: https://docs.openshift.com/container-platform/4.15/networking/using-ptp.html
-:workload-partitioning-docs: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/enabling-workload-partitioning.html
-:advanced-ztp-policy-config: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/ztp-advanced-policy-config.html#ztp-adding-new-content-to-gitops-ztp_ztp-advanced-policy-config
-:ztp-precaching-config-docs: https://docs.openshift.com/container-platform/4.15/scalability_and_performance/ztp_far_edge/ztp-talm-updating-managed-policies.html#talm-prechache-user-specified-images-concept_ztp-talm
+:talm-precachingconfig-doc: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/ztp_far_edge/ztp-talm-updating-managed-policies.html#talm-prechache-user-specified-images-concept_ztp-talm
+:workload-hints-doc: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/cnf-low-latency-tuning.html#cnf-understanding-workload-hints_cnf-master
+:ztp-gitops-docs: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/ztp_far_edge/ztp-preparing-the-hub-cluster.html#installing-disconnected-rhacm_ztp-preparing-the-hub-cluster
+:nto-docs: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/using-node-tuning-operator.html
+:sriov-docs: https://docs.openshift.com/container-platform/4.16/networking/hardware_networks/about-sriov.html
+:sriov-supported-nics: https://docs.openshift.com/container-platform/4.16/networking/hardware_networks/about-sriov.html#supported-devices_about-sriov
+:ptp-docs: https://docs.openshift.com/container-platform/4.16/networking/ptp/about-ptp.html
+:workload-partitioning-docs: https://docs.openshift.com/container-platform/4.16/scalability_and_performance/enabling-workload-partitioning.html
+:advanced-ztp-policy-config: https://docs.openshift.com/container-platform/4.16/edge_computing/policygentemplate_for_ztp/ztp-advanced-policy-config.html#ztp-adding-new-content-to-gitops-ztp_ztp-advanced-policy-config
+:ztp-precaching-config-docs: https://docs.openshift.com/container-platform/4.16/edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.html#talm-prechache-user-specified-images-concept_ztp-talm
 :ssh-pub-key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5pFKFLOuxrd9Q/TRu9sRtwGg2PV+kl2MHzBIGUhCcR0LuBJk62XG9tQWPQYTQ3ZUBKb6pRTqPXg+cDu5FmcpTwAKzqgUb6ArnjECxLJzJvWieBJ7k45QzhlZPeiN2Omik5bo7uM/P1YIo5pTUdVk5wJjaMOb7Xkcmbjc7r22xY54cce2Wb7B1QDtLWJkq++eJHSX2GlEjfxSlEvQzTN7m2N5pmoZtaXpLKcbOqtuSQSVKC4XPgb57hgEs/ZZy/LbGGHZyLAW5Tqfk1JCTFGm6Q+oOd3wAOF1SdUxM7frdrN3UOB12u/E6YuAx3fDvoNZvcrCYEpjkfrsjU91oz78aETZV43hOK9NWCOhdX5djA7G35/EMn1ifanVoHG34GwNuzMdkb7KdYQUztvsXIC792E2XzWfginFZha6kORngokZ2DwrzFj3wgvmVyNXyEOqhwi6LmlsYdKxEvUtiYhdISvh2Y9GPrFcJ5DanXe7NVAKXe5CyERjBnxWktqAPBzXJa36FKIlkeVF5G+NWgufC6ZWkDCD98VZDiPP9sSgqZF8bSR4l4/vxxAW4knKIZv11VX77Sa1qZOR9Ml12t5pNGT7wDlSOiDqr5EWsEexga/2s/t9itvfzhcWKt+k66jd8tdws2dw6+8JYJeiBbU63HBjxCX+vCVZASrNBjiXhFw==
 :aap-docs: https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4/
 :aap-hub-docs: https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4/html/deploying_the_red_hat_ansible_automation_platform_operator_on_openshift_container_platform/installing-hub-operator
 :aap-controller-docs: https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4/html/deploying_the_red_hat_ansible_automation_platform_operator_on_openshift_container_platform/installing-controller-operator
 :aap-get-manifest-docs: https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4/html/red_hat_ansible_automation_platform_operations_guide/assembly-aap-obtain-manifest-files
 :sriov-channel: stable
-:last-update-date: 2024-04-12
+:last-update-date: 2024-09-12

documentation/modules/ROOT/pages/crafting-cluster-telco-related-infra-operators-configs.adoc

@@ -357,6 +357,25 @@ EOF
 
 More information about Template processing can be found in {rhacm-template-processing}[Red Hat Advanced Cluster Management documentation].
 
+[#crafting-custom-policies]
+== Adding custom content
+
+If you require cluster configuration changes outside of the base GitOps Zero Touch Provisioning (ZTP) pipeline configuration, you can add content to the GitOps ZTP library. The base source custom resources (CRs) that are included in the ztp-generate container that you deploy with the GitOps ZTP pipeline can be augmented with custom content as required.
+
+WARNING: We recommend a directory structure to keep reference manifests corresponding to the y-stream release.
+
+In this lab we do not need extra content, however we are going to pave the way for future requirements. Let's first extract the predefined source-crs from the ztp-generate container 4.16 version to the reference-crs folder.
+
+[.console-input]
+[source,bash,subs="attributes+,+macros"]
+-----
+podman login infra.5g-deployment.lab:8443 -u admin -p r3dh4t1! --tls-verify=false
+podman run --log-driver=none --rm --tls-verify=false {ztp-sitegenerate-disconnected-image} extract /home/ztp/source-crs --tar | tar x -C ~/5g-deployment-lab/ztp-repository/site-policies/fleet/active/source-crs/reference-crs/
+-----
+
+Notice that we can add content not included in the ZTP container image by creating the required source CR in the `source-crs/custom-crs` folder. Once pushed to our Git repo, we can reference it in any of the common, group or site policies we have already created. More information on Deploying additional changes to cluster can be found in the {advanced-ztp-policy-config}[docs]
+
+
 [#crafting-testing-policies]
 == Crafting testing Policies