From 4d01f324a3fd92cfa7370649c800726f3b40f772 Mon Sep 17 00:00:00 2001 From: EricPonvelle Date: Wed, 18 Sep 2024 09:00:27 -0400 Subject: [PATCH] Adding the Upgrading HCP cherrypick --- _topic_maps/_topic_map_rosa_hcp.yml | 92 +++++++++++++++++++++++++++++ upgrading/rosa-hcp-upgrading.adoc | 21 ++++++- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml index 602daf9a4b..7a278cac44 100644 --- a/_topic_maps/_topic_map_rosa_hcp.yml +++ b/_topic_maps/_topic_map_rosa_hcp.yml @@ -511,6 +511,32 @@ Topics: - Name: Cluster notifications File: rosa-cluster-notifications Distros: openshift-rosa-hcp +- Name: Cluster configurations + File: rosa-cluster-notifications +--- +Name: Security and compliance +Dir: security +Distros: openshift-rosa-hcp +Topics: +- Name: Adding additional constraints for IP-based AWS role assumption + File: rosa-adding-additional-constraints-for-ip-based-aws-role-assumption +# --- +# Name: Cluster administration +# Dir: rosa_cluster_admin +# Distros: openshift-rosa-hcp +# Topics: +# - Name: Cluster configurations +# File: rosa-cluster-config +# - Name: Cluster authentication +# File: rosa-cluster-auth +# - Name: Authorization and RBAC +# File: rosa-auth-rbac +- Name: Cluster notifications + File: rosa-cluster-notifications + Distros: openshift-rosa-hcp +# - Name: Cluster notifications +# File: rosa-cluster-notifications +# Distros: openshift-rosa-hcp # - Name: Configuring private connections # Dir: cloud_infrastructure_access # Distros: openshift-rosa-hcp @@ -543,6 +569,9 @@ Topics: - Name: Configuring PID limits File: rosa-configuring-pid-limits Distros: openshift-rosa +# - Name: Configuring PID limits +# File: rosa-configuring-pid-limits +# Distros: openshift-rosa-hcp # --- # Name: Security and compliance # Dir: security @@ -552,6 +581,11 @@ Topics: # File: audit-log-view # - Name: Adding additional constraints for IP-based AWS role assumption # File: rosa-adding-additional-constraints-for-ip-based-aws-role-assumption +#- Name: Audit logs +# File: audit-log-view +# - Name: Adding additional constraints for IP-based AWS role assumption +# File: rosa-adding-additional-constraints-for-ip-based-aws-role-assumption +# --- # - Name: Security # File: rosa-security # - Name: Application and cluster compliance @@ -636,6 +670,7 @@ Topics: # - Name: Manual mode with short-term credentials for components # File: cco-short-term-creds #--- +--- Name: Upgrading Dir: upgrading Distros: openshift-rosa-hcp @@ -759,6 +794,8 @@ Topics: # File: image-configuration # - Name: Image configuration resources (HCP) # File: image-configuration-classic-hcp +# - Name: Image configuration resources +# File: image-configuration # Distros: openshift-rosa-hcp # - Name: Using templates # File: using-templates @@ -817,6 +854,42 @@ Topics: # --- # Name: Registry # Dir: registry +# Name: Backing up and restoring applications +# Dir: rosa_backing_up_and_restoring_applications +# --- +# Name: Storage +# Dir: storage +# Distros: openshift-rosa-hcp +# Topics: +# - Name: Storage overview +# File: index +# - Name: Understanding ephemeral storage +# File: understanding-ephemeral-storage +# - Name: Understanding persistent storage +# File: understanding-persistent-storage +# - Name: Configuring persistent storage +# Dir: persistent_storage +# Topics: +# - Name: Persistent storage using AWS Elastic Block Store +# File: persistent-storage-aws +# - Name: Using Container Storage Interface (CSI) +# Dir: container_storage_interface +# Topics: +# - Name: Configuring CSI volumes +# File: persistent-storage-csi +# - Name: Managing the default storage class +# File: persistent-storage-csi-sc-manage +# - Name: AWS Elastic Block Store CSI Driver Operator +# File: persistent-storage-csi-ebs +# - Name: AWS Elastic File Service CSI Driver Operator +# File: persistent-storage-csi-aws-efs +# - Name: Generic ephemeral volumes +# File: generic-ephemeral-vols +# - Name: Dynamic provisioning +# File: dynamic-provisioning +# # --- +# Name: Registry +# Dir: registry # Distros: openshift-rosa-hcp # Topics: # - Name: Registry overview @@ -1160,6 +1233,20 @@ Distros: openshift-rosa-hcp Topics: - Name: Overview of nodes File: index +# --- +# Name: Backing up and restoring applications +# Dir: rosa_backing_up_and_restoring_applications +# Distros: openshift-rosa-hcp +# Topics: +# - Name: Installing OADP on ROSA with STS +# File: backing-up-applications +# --- +# Name: Nodes +# Dir: nodes +# Distros: openshift-rosa-hcp +# Topics: +# - Name: Overview of nodes +# File: index # - Name: Working with pods # Dir: pods # Topics: @@ -1428,6 +1515,10 @@ Topics: # File: cluster-logging-dashboards # - Name: Log visualization with Kibana # File: logging-kibana +# - Name: Accessing the service logs +# File: sd-accessing-the-service-logs +# - Name: Viewing cluster logs in the AWS Console +# File: rosa-viewing-logs # - Name: Configuring your Logging deployment # Dir: config # Topics: @@ -1903,4 +1994,5 @@ Topics: # File: virt-restoring-vms # - Name: Collecting OKD Virtualization data for community report # File: virt-collecting-virt-data +# Distros: openshift-origin # Distros: openshift-origin \ No newline at end of file diff --git a/upgrading/rosa-hcp-upgrading.adoc b/upgrading/rosa-hcp-upgrading.adoc index a5d79f7de8..2abb03831d 100644 --- a/upgrading/rosa-hcp-upgrading.adoc +++ b/upgrading/rosa-hcp-upgrading.adoc @@ -16,7 +16,20 @@ include::modules/rosa-hcp-upgrade-options.adoc[leveloffset=+1] [id="rosa-lifecycle-policy_{context}"] == Life cycle policies and planning +<<<<<<< HEAD To plan an upgrade, review the xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle]. +======= +<<<<<<< HEAD +To plan an upgrade, review the +ifdef::openshift-rosa[] +xref:../rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.adoc#rosa-life-cycle[{product-title} update life cycle]. +endif::openshift-rosa[] +ifdef::openshift-rosa-hcp[] +xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle]. +endif::openshift-rosa-hcp[] +======= +>>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick) +>>>>>>> 35bf785d38 (Adding the Upgrading HCP cherrypick) The life cycle page includes release definitions, support and upgrade requirements, installation policy information and life cycle dates. @@ -44,4 +57,10 @@ Upgrading the entire cluster involves upgrading both the hosted control plane an include::modules/rosa-hcp-upgrading-cli-control-plane.adoc[leveloffset=+2] include::modules/rosa-hcp-upgrading-cli-machinepool.adoc[leveloffset=+2] -include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1] \ No newline at end of file +<<<<<<< HEAD +include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1] +======= + +ifdef::prevcontext[:context: {prevcontext}] +ifndef::prevcontext[:!context:] +>>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick)