diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 708ff272becf..e7733f6ceb43 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "image":"mcr.microsoft.com/devcontainers/universal:2", - "postCreateCommand": "sleep 30 && docker run --rm -it -v `pwd`:/docs:Z quay.io/openshift-cs/asciibinder sh -c \"git config --global --add safe.directory /docs && asciibinder build --distro openshift-rosa && asciibinder build --distro openshift-enterprise\" && python3 -m http.server -d ./_preview", + "postCreateCommand": "sleep 60 && docker run --rm -it -v `pwd`:/docs:Z quay.io/openshift-cs/asciibinder sh -c \"git config --global --add safe.directory /docs && asciibinder build --distro openshift-rosa && asciibinder build --distro openshift-enterprise\" && python3 -m http.server -d ./_preview", "customizations": { "vscode": { "settings": { diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf index 6d20294e6584..6951c6d9a7de 100644 --- a/.s2i/httpd-cfg/01-commercial.conf +++ b/.s2i/httpd-cfg/01-commercial.conf @@ -138,13 +138,13 @@ AddType text/vtt vtt # ACS Redirects to go to the latest version - change here when a new version drops # it should probably be best to combine the next few lines in one reg exp but for clarity keeping them separate # the first one redirects - RewriteRule ^acs/?$ /acs/4.4/welcome/index.html [R=301] + RewriteRule ^acs/?$ /acs/4.5/welcome/index.html [R=301] # redirect to the latest release notes - RewriteRule ^acs/release_notes/?$ /acs/4.4/release_notes/44-release-notes.html [R=301,NE] + RewriteRule ^acs/release_notes/?$ /acs/4.5/release_notes/45-release-notes.html [R=301,NE] # redirect from ACS CLoud Service page - RewriteRule ^acs/installing/install-ocp-operator.html /acs/4.4/installing/installing_ocp/init-bundle-ocp.html [NE,R=301] - RewriteRule ^acs/(\D.*)$ /acs/4.4/$1 [NE,R=301] - RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70|3\.71|3\.72|3\.73|3\.74|4\.0|4\.1|4\.2|4\.3|4\.4)/?$ /acs/$1/welcome/index.html [L,R=301] + RewriteRule ^acs/installing/install-ocp-operator.html /acs/4.5/installing/installing_ocp/init-bundle-ocp.html [NE,R=301] + RewriteRule ^acs/(\D.*)$ /acs/4.5/$1 [NE,R=301] + RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70|3\.71|3\.72|3\.73|3\.74|4\.0|4\.1|4\.2|4\.3|4\.4|4\.5)/?$ /acs/$1/welcome/index.html [L,R=301] #redirect for 4.0 Manage vulneribility page RewriteRule ^(acs/(?:4\.0/)?)?operating/manage-vulnerabilities\.html$ /acs/4.0/operating/manage-vulnerabilities/vulnerability-management.html [NE,R=301] #redirect for missing 4.3 page @@ -153,13 +153,15 @@ AddType text/vtt vtt RewriteRule ^(acs/(?:4\.4/)?)?installing/acs-installation-platforms\.html$ /acs/4.4/installing/acs-high-level-overview.html [NE,R=301] #redirect Architecture page for ACS Cloud into Cloud directory RewriteRule ^acs/(4\.4)/architecture/acscs-architecture\.html$ /acs/latest/cloud_service/acscs-architecture.html [NE,R=302] + #redirect Managing compliance and Compliance Operator pages as per https://github.com/openshift/openshift-docs/pull/78035 + RewriteRule ^acs/(4\.5)/operating/manage-compliance-operator/compliance-operator-rhacs\.html$ /acs/latest/operating/compliance-operator-rhacs.html [NE,R=302] - # remove aro docs to just the welcome page + #remove aro docs to just the welcome page RewriteRule aro/4/(?!welcome)(.*)?$ /container-platform/latest/$1 [L,R=301] # Redirects for "latest" version RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301] - RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.15/$2 [NE,R=301] + RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.16/$2 [NE,R=301] RewriteRule ^(online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|latest)/?(.*)$ /$1/pro/$3 [NE,R=301] # Release notes redirects @@ -173,6 +175,9 @@ AddType text/vtt vtt # Redirect for renamed external DNS page RewriteRule ^container-platform/4\.10/networking/external_dns_operator/nw-installing-external-dns-operator.html /container-platform/4.10/networking/external_dns_operator/nw-installing-external-dns-operator-on-cloud-providers.html [NE,R=301] + # Redirect for renamed Ingress Controller document + RewriteRule ^container-platform/(4\.1[2-6])/networking/nw-ingress-controller-endpoint-publishing-strategies\.html$ /container-platform/$1/networking/nw-configuring-ingress-controller-endpoint-publishing-strategy.html [NE,R=302,L] + # Redirect for cluster logging per Ashleigh Brennan RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/troubleshooting/cluster-logging-must-gather.html /container-platform/$1/logging/cluster-logging-support.html [NE,R=302] RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/config/cluster-logging-maintenance-support.html /container-platform/$1/logging/cluster-logging-support.html [NE,R=302] @@ -182,42 +187,32 @@ AddType text/vtt vtt RewriteRule ^(rosa|dedicated)/logging/config/cluster-logging-moving-nodes.html /$1/logging/scheduling_resources/logging-node-selectors.html [NE,R=302] RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/logging/config/cluster-logging-log-store.html /container-platform/$1/logging/log_storage/logging-config-es-store.html [NE,R=302] - # Redirects for observability rework per https://github.com/openshift/openshift-docs/pull/71248 - RewriteRule ^container-platform/4.14/power_monitoring/(.*)$ /container-platform/4.14/observability/power_monitoring/$1 [NE,R=302,L] - - # Redirects for observability/monitoring per https://github.com/openshift/openshift-docs/pull/74679/ - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/observability/monitoring/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.html /container-platform/$1/observability/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.html [NE,R=302] - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/observability/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.html /container-platform/$1/observability/cluster_observability_operator/installing-the-cluster-observability-operator.html [NE,R=302] - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/observability/monitoring/cluster_observability_operator/cluster-observability-operator-overview.html /container-platform/$1/observability/cluster_observability_operator/cluster-observability-operator-overview.html [NE,R=302] - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/observability/monitoring/cluster_observability_operator/cluster-observability-operator-release-notes.html /container-platform/$1/observability/cluster_observability_operator/cluster-observability-operator-release-notes.html [NE,R=302] - - # Redirects for observability reorg per mleonov and https://github.com/openshift/openshift-docs/pull/74104 - # including logging per https://github.com/openshift/openshift-docs/pull/74819 - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/distr_tracing/distr_tracing_rn/distr-tracing-rn-?(.*)$ /container-platform/$1/observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.html [NE,R=302] - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/otel/otel_rn/otel-rn-?(.*)$ /container-platform/$1/observability/otel/otel_rn/otel-rn-past-releases.html [NE,R=302] - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/(logging|monitoring|distr_tracing|otel)/?(.*)$ /container-platform/$1/observability/$2/$3 [NE,R=302] - RewriteRule ^container-platform/4.13/distr_tracing/distr_tracing_otel/distr-tracing-otel-installing.html /container-platform/4.13/observability/otel/otel-installing.html [NE,R=302] - RewriteRule ^container-platform/4.13/distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.html /container-platform/4.13/observability/otel/otel-installing.html [NE,R=302] - RewriteRule ^container-platform/4.9/distr_tracing/distributed-tracing-release-notes.html /container-platform/latest/observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.html [NE,R=302] - RewriteRule ^container-platform/4.9/distr_tracing/distr_tracing_install/distr-tracing-installing.html /container-platform/latest/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.html [NE,R=302] + # Consolidated redirects for observability, monitoring, logging, and network observability + + # Generic rule for moving sections under observability + RewriteRule ^container-platform/(4\.1[2-5]|latest)/(logging|monitoring|distr_tracing|otel|network_observability)/?(.*)$ /container-platform/$1/observability/$2/$3 [NE,R=302] + + # Generic rule for ROSA and OpenShift Dedicated RewriteRule ^(rosa|dedicated)/(logging|monitoring)/?(.*)$ /$1/observability/$2/$3 [NE,R=302] + # Specific rules for Cluster Observability Operator + RewriteRule ^container-platform/(4\.1[2-5]|latest)/monitoring/cluster_observability_operator/(.*)$ /container-platform/$1/observability/cluster_observability_operator/$2 [NE,R=302] - # Redirects for network observability per https://github.com/openshift/openshift-docs/pull/73554 - RewriteRule ^container-platform/(4\.12|4\.13|4\.14|4\.15)/network_observability/?(.*)$ /container-platform/$1/observability/network_observability/$2 [NE,R=302] + # Specific redirects for distributed tracing and OpenTelemetry + RewriteRule ^container-platform/(4\.1[2-5]|latest)/distr_tracing/distr_tracing_rn/distr-tracing-rn-?(.*)$ /container-platform/$1/observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-5]|latest)/otel/otel_rn/otel-rn-?(.*)$ /container-platform/$1/observability/otel/otel_rn/otel-rn-past-releases.html [NE,R=302] - # Redirect for log collection forwarding per https://github.com/openshift/openshift-docs/pull/64406 - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/config/cluster-logging-collector.html /container-platform/$1/logging/log_collection_forwarding/cluster-logging-collector.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/cluster-logging-eventrouter.html /container-platform/$1/logging/log_collection_forwarding/cluster-logging-eventrouter.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/cluster-logging-enabling-json-logging.html /container-platform/$1/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/logging/cluster-logging-external.html /container-platform/$1/logging/log_collection_forwarding/log-forwarding.html [NE,R=302] + # Specific redirects for older versions and special cases + RewriteRule ^container-platform/(4\.13|latest)/distr_tracing/distr_tracing_otel/distr-tracing-otel-installing.html /container-platform/$1/observability/otel/otel-installing.html [NE,R=302] + RewriteRule ^container-platform/(4\.13|latest)/distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.html /container-platform/$1/observability/otel/otel-installing.html [NE,R=302] + RewriteRule ^container-platform/4.9/distr_tracing/distributed-tracing-release-notes.html /container-platform/latest/observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.html [NE,R=302] + RewriteRule ^container-platform/4.9/distr_tracing/distr_tracing_install/distr-tracing-installing.html /container-platform/latest/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.html [NE,R=302] + + # Redirects for log collection forwarding (for versions 4.11 to 4.13 and latest) + RewriteRule ^container-platform/(4\.1[1-3]|latest)/logging/(.*)$ /container-platform/$1/logging/log_collection_forwarding/$2 [NE,R=302] - # Redirect for network observability per https://github.com/openshift/openshift-docs/pull/65770 - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/networking/network_observability/network-observability-operator-release-notes.html /container-platform/$1/network_observability/network-observability-operator-release-notes.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/networking/network_observability/installing-operators.html /container-platform/$1/network_observability/installing-operators.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/networking/network_observability/observing-network-traffic.html /container-platform/$1/network_observability/observing-network-traffic.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/networking/network_observability/understanding-network-observability-operator.html /container-platform/$1/network_observability/understanding-network-observability-operator.html [NE,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13)/networking/network_observability/configuring-operator.html /container-platform/$1/network_observability/configuring-operator.html [NE,R=302] + # Redirect for power monitoring (specific to 4.14 and latest) + RewriteRule ^container-platform/(4\.14|latest)/power_monitoring/(.*)$ /container-platform/$1/observability/power_monitoring/$2 [NE,R=302,L] # Redirects for Telco ZTP changes delivered in https://github.com/openshift/openshift-docs/pull/35889 RewriteRule ^container-platform/(4\.10|4\.11)/scalability_and_performance/ztp-deploying-disconnected.html /container-platform/$1/scalability_and_performance/ztp_far_edge/ztp-deploying-far-edge-clusters-at-scale.html [NE,R=302] @@ -236,6 +231,17 @@ AddType text/vtt vtt RewriteRule ^container-platform/(4\.12|4\.13)/scalability_and_performance/low_latency_tuning/cnf-tuning-low-latency-nodes-with-perf-profile.html /container-platform/$1/scalability_and_performance/cnf-low-latency-tuning.html [NE,R=302] RewriteRule ^container-platform/(4\.12|4\.13)/scalability_and_performance/low_latency_tuning/cnf-provisioning-low-latency-workloads.html /container-platform/$1/scalability_and_performance/cnf-low-latency-tuning.html [NE,R=302] + #Install redirects per https://github.com/openshift/openshift-docs/pull/79711 + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/index.html /container-platform/$1/installing/overview/index.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-preparing.html /container-platform/$1/installing/overview/installing-preparing.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/cluster-capabilities.html /container-platform/$1/installing/overview/cluster-capabilities.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-fips.html /container-platform/$1/installing/overview/installing-fips.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/validating-an-installation.html /container-platform/$1/installing/validation_and_troubleshooting/validating-an-installation.html [NE,R=302] + RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-troubleshooting.html /container-platform/$1/installing/validation_and_troubleshooting/installing-troubleshooting.html [NE,R=302] + + + # ingress sharding redirect per https://github.com/openshift/openshift-docs/pull/76916 + RewriteRule ^container-platform/(4\.1[2-6]|latest)/networking/ingress-sharding.html /container-platform/$1/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.html [NE,R=302] # Redirects for new ZTP edge computing section RewriteRule ^container-platform/(4\.15|4\.16)/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html /container-platform/$1/edge_computing/cnf-talm-for-cluster-upgrades.html [NE,R=302] @@ -295,66 +301,82 @@ AddType text/vtt vtt RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12)/serverless/develop/serverless-traffic-management.html /container-platform/$1/serverless/knative-serving/traffic-splitting/traffic-splitting-overview.html [NE,R=302] - # redirect latest to 1.32 + # redirect latest to 1.33 RewriteRule ^serverless/?$ /serverless/latest [R=302] - RewriteRule ^serverless/latest/?(.*)$ /serverless/1\.32/$1 [NE,R=302] + RewriteRule ^serverless/latest/?(.*)$ /serverless/1\.33/$1 [NE,R=302] # redirect top-level without filespec to the about file - RewriteRule ^serverless/(1\.28|1\.29|1\.30|1\.31|1\.32)/?$ /serverless/$1/about/about-serverless.html [L,R=302] + RewriteRule ^serverless/(1\.28|1\.29|1\.30|1\.31|1\.32|1\.33)/?$ /serverless/$1/about/about-serverless.html [L,R=302] # redirect rel notes - RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/serverless/serverless-release-notes.html$ /serverless/1.32/about/serverless-release-notes.html [L,R=302] - RewriteRule ^(rosa|dedicated)/serverless/serverless-release-notes.html$ /serverless/1.32/about/serverless-release-notes.html [L,R=302] + RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14)/serverless/serverless-release-notes.html$ /serverless/1.33/about/serverless-release-notes.html [L,R=302] + RewriteRule ^(rosa|dedicated)/serverless/serverless-release-notes.html$ /serverless/1.33/about/serverless-release-notes.html [L,R=302] # redirect any links to existing OCP embedded content to standalone equivalent - RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/serverless/?(.*)$ /serverless/1.32/$2 [L,R=302] + RewriteRule ^container-platform/(4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/serverless/?(.*)$ /serverless/1.33/$2 [L,R=302] # redirect any links to existing ROSA/Dedicated embedded content to standalone equivalent - RewriteRule ^(rosa|dedicated)/serverless/?(.*)$ /serverless/1.32/$2 [L,R=302] + RewriteRule ^(rosa|dedicated)/serverless/?(.*)$ /serverless/1.33/$2 [L,R=302] - # redirect builds latest to 1.0 + # redirect builds latest to 1.1 RewriteRule ^builds/?$ /builds/latest [R=302] - RewriteRule ^builds/latest/?(.*)$ /builds/1.0/$1 [NE,R=302] + RewriteRule ^builds/latest/?(.*)$ /builds/1.1/$1 [NE,R=302] # redirect top-level without filespec to the about file - RewriteRule ^builds/(1\.0)/?$ /builds/$1/about/overview-openshift-builds.html [L,R=302] + RewriteRule ^builds/(1\.0|1\.1)/?$ /builds/$1/about/overview-openshift-builds.html [L,R=302] # Builds using Shipwright landing page RewriteRule ^container-platform/(4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/builds_using_shipwright/overview-openshift-builds.html /builds/latest/about/overview-openshift-builds.html [L,R=302] - # redirect gitops latest to 1.12 + # redirect gitops latest to 1.14 RewriteRule ^gitops/?$ /gitops/latest [R=302] - RewriteRule ^gitops/latest/?(.*)$ /gitops/1\.12/$1 [NE,R=302] + RewriteRule ^gitops/latest/?(.*)$ /gitops/1\.14/$1 [NE,R=302] # redirect top-level without filespec to the about file - RewriteRule ^gitops/(1\.8|1\.9|1\.10|1\.11|1\.12)/?$ /gitops/$1/understanding_openshift_gitops/about-redhat-openshift-gitops.html [L,R=302] + RewriteRule ^gitops/(1\.8|1\.9|1\.10|1\.11|1\.12|1\.13|1\.14)/?$ /gitops/$1/understanding_openshift_gitops/about-redhat-openshift-gitops.html [L,R=302] # GitOps landing page RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/about-redhat-openshift-gitops.html /gitops/latest/understanding_openshift_gitops/about-redhat-openshift-gitops.html [L,R=302] # redirect any links to existing OCP embedded content to standalone equivalent for each assembly - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/gitops-release-notes.html/ /gitops/latest/release_notes/gitops-release-notes.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/understanding-openshift-gitops.html /gitops/latest/understanding_openshift_gitops/about-redhat-openshift-gitops.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/installing-openshift-gitops.html /gitops/latest/installing_gitops/installing-openshift-gitops.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/uninstalling-openshift-gitops.html /gitops/latest/removing_gitops/uninstalling-openshift-gitops.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/setting-up-argocd-instance.html /gitops/latest/argocd_instance/setting-up-argocd-instance.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/monitoring-argo-cd-instances.html /gitops/latest/observability/monitoring/monitoring-argo-cd-instances.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/using-argo-rollouts-for-progressive-deployment-delivery.html /gitops/latest/argo_rollouts/using-argo-rollouts-for-progressive-deployment-delivery.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.html /gitops/latest/declarative_clusterconfig/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/deploying-a-spring-boot-application-with-argo-cd.html /gitops/latest/argocd_applications/deploying-a-spring-boot-application-with-argo-cd.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/argo-cd-custom-resource-properties.html /gitops/latest/argocd_instance/argo-cd-cr-component-properties.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-secure-communication-with-redis.html /gitops/latest/securing_openshift_gitops/configuring-secure-communication-with-redis.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/health-information-for-resources-deployment.html /gitops/latest/observability/monitoring/health-information-for-resources-deployment.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-sso-on-argo-cd-using-dex.html /gitops/latest/accesscontrol_usermanagement/configuring-sso-on-argo-cd-using-dex.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-sso-for-argo-cd-using-keycloak.html /gitops/latest/accesscontrol_usermanagement/configuring-sso-for-argo-cd-using-keycloak.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-argo-cd-rbac.html /gitops/latest/accesscontrol_usermanagement/configuring-argo-cd-rbac.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/configuring-resource-quota.html /gitops/latest/managing_resource/configuring-resource-quota.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.html /gitops/latest/observability/monitoring/monitoring-argo-cd-custom-resource-workloads.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/viewing-argo-cd-logs.html /gitops/latest/observability/logging/viewing-argo-cd-logs.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.html /gitops/latest/gitops_workloads_infranodes/run-gitops-control-plane-workload-on-infra-nodes.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/about-sizing-requirements-gitops.html /gitops/latest/installing_gitops/preparing-gitops-install.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/collecting-debugging-data-for-support.html /gitops/latest/understanding_openshift_gitops/gathering-gitops-diagnostic-information-for-support.html [L,R=302] - RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14)/cicd/gitops/troubleshooting-issues-in-GitOps.html /gitops/latest/troubleshooting_gitops_issues/auto-reboot-during-argo-cd-sync-with-machine-configurations.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/gitops-release-notes.html/ /gitops/latest/release_notes/gitops-release-notes-1-14.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/understanding-openshift-gitops.html /gitops/latest/understanding_openshift_gitops/about-redhat-openshift-gitops.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/installing-openshift-gitops.html /gitops/latest/installing_gitops/installing-openshift-gitops.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/uninstalling-openshift-gitops.html /gitops/latest/removing_gitops/uninstalling-openshift-gitops.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/setting-up-argocd-instance.html /gitops/latest/argocd_instance/setting-up-argocd-instance.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/monitoring-argo-cd-instances.html /gitops/latest/observability/monitoring/monitoring-argo-cd-instances.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/using-argo-rollouts-for-progressive-deployment-delivery.html /gitops/latest/argo_rollouts/using-argo-rollouts-for-progressive-deployment-delivery.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.html /gitops/latest/declarative_clusterconfig/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/deploying-a-spring-boot-application-with-argo-cd.html /gitops/latest/argocd_applications/deploying-a-spring-boot-application-with-argo-cd.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/argo-cd-custom-resource-properties.html /gitops/latest/argocd_instance/argo-cd-cr-component-properties.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-secure-communication-with-redis.html /gitops/latest/securing_openshift_gitops/configuring-secure-communication-with-redis.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/health-information-for-resources-deployment.html /gitops/latest/observability/monitoring/health-information-for-resources-deployment.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-sso-on-argo-cd-using-dex.html /gitops/latest/accesscontrol_usermanagement/configuring-sso-on-argo-cd-using-dex.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-sso-for-argo-cd-using-keycloak.html /gitops/latest/accesscontrol_usermanagement/configuring-sso-for-argo-cd-using-keycloak.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-argo-cd-rbac.html /gitops/latest/accesscontrol_usermanagement/configuring-argo-cd-rbac.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/configuring-resource-quota.html /gitops/latest/managing_resource/configuring-resource-quota.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.html /gitops/latest/observability/monitoring/monitoring-argo-cd-custom-resource-workloads.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/viewing-argo-cd-logs.html /gitops/latest/observability/logging/viewing-argo-cd-logs.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.html /gitops/latest/gitops_workloads_infranodes/run-gitops-control-plane-workload-on-infra-nodes.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/about-sizing-requirements-gitops.html /gitops/latest/installing_gitops/preparing-gitops-install.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/collecting-debugging-data-for-support.html /gitops/latest/understanding_openshift_gitops/gathering-gitops-diagnostic-information-for-support.html [L,R=302] + RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/troubleshooting-issues-in-GitOps.html /gitops/latest/troubleshooting_gitops_issues/auto-reboot-during-argo-cd-sync-with-machine-configurations.html [L,R=302] + + # Lightspeed handling unversioned and latest links + RewriteRule ^lightspeed/?$ /lightspeed/latest [R=302] + RewriteRule ^lightspeed/latest/?(.*)$ /lightspeed/1\.0tp1/$1 [NE,R=302] + + # Lightspeed landing page + + RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/lightspeed/about/ols-openshift-lightspeed-overview.html /lightspeed/latest/about/ols-about-openshift-lightspeed.html [NE,R=302] + + # Service Mesh handling unversioned and latest links + RewriteRule ^service-mesh/?$ /service-mesh/latest [R=302] + RewriteRule ^servce-mesh/latest/?(.*)$ /service-mesh/3\.0.0tp1/$1 [NE,R=302] + + # Service Mesh landing page + + RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/service-mesh/about/ossm-about-openshift-service-mesh.html /service-mesh/latest/about/ossm-about-openshift-service-mesh.html [NE,R=302] # Pipelines handling unversioned and latest links RewriteRule ^pipelines/?$ /pipelines/latest [R=302] @@ -446,6 +468,9 @@ AddType text/vtt vtt # ROSA UI short-term redirect https://issues.redhat.com/browse/OSDOCS-3511 RewriteRule rosa/post_installation_configuration/machine-configuration-tasks.html rosa/rosa_getting_started/rosa-getting-started.html#rosa-getting-started-configure-an-idp-and-grant-access_rosa-getting-started [NE,R=301] + # ROSA outdated log forwarding tutorial redirect https://issues.redhat.com/browse/OSDOCS-10983 + RewriteRule rosa/cloud_experts_tutorials/cloud-experts-rosa-cloudwatch-sts.html rosa/observability/logging/log_collection_forwarding/configuring-log-forwarding.html#rosa-cluster-logging-collector-log-forward-sts-cloudwatch_configuring-log-forwarding [NE,R=301] + # ACS welcome page redirect to StackRox docs # RewriteRule ^acs/?(.*)$ https://help.stackrox.com/ [NE,R=301] @@ -502,15 +527,15 @@ AddType text/vtt vtt RewriteRule ^container-platform/(4\.4|4\.5)/authentication/(allowing-javascript-access-api-server|encrypting-etcd|certificate-types-descriptions)\.html$ /container-platform/$1/security/$2\.html [NE,R=301] - # The following rule prevents an infinite redirect loop when browsing to /container-platform/4.15/virt/about_virt/about-virt.html - # RewriteRule ^container-platform/4\.15/virt/about_virt/about-virt.html$ - [L] + # The following rule prevents an infinite redirect loop when browsing to /container-platform/4.16/virt/about_virt/about-virt.html + #RewriteRule ^container-platform/4\.16/virt/about_virt/about-virt.html$ - [L] # OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301. # When uncommented, this redirects all `virt` directory traffic to the about-virt page. # Pay mind to the redirect directly above this which prevents redirect loops. # To activate the redirects, uncomment the next and previous lines and update the version number to the pending release. - # RewriteRule container-platform/4\.15/virt/(?!about-virt\.html)(.+)$ /container-platform/4.15/virt/about_virt/about-virt.html [NE,R=302] + #RewriteRule container-platform/4\.16/virt/(?!about-virt\.html)(.+)$ /container-platform/4.16/virt/about_virt/about-virt.html [NE,R=302] # Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301. @@ -659,7 +684,7 @@ AddType text/vtt vtt RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301] RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301] RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301] - RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15)/?$ /container-platform/$1/welcome/index.html [L,R=301] + RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16)/?$ /container-platform/$1/welcome/index.html [L,R=301] RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301] diff --git a/.s2i/httpd-cfg/01-community.conf b/.s2i/httpd-cfg/01-community.conf index 67d21aa3f38e..da610fe5860c 100644 --- a/.s2i/httpd-cfg/01-community.conf +++ b/.s2i/httpd-cfg/01-community.conf @@ -159,14 +159,14 @@ AddType text/vtt vtt RewriteRule ^latest/install_config/upgrades\.html(.*)$ /latest/install_config/upgrading/index.html$1 [NE,R=301] RewriteRule ^latest/install_config/upgrading/(.*)$ /latest/upgrading/$1 [NE,R=301] - # The following rule prevents an infinite redirect loop when browsing to /(latest|4\.15)/virt/about_virt/about-virt.html - # RewriteRule ^(latest|4\.15)/virt/about_virt/about-virt.html$ - [L] + # The following rule prevents an infinite redirect loop when browsing to /(latest|4\.16)/virt/about_virt/about-virt.html + #RewriteRule ^(latest|4\.16)/virt/about_virt/about-virt.html$ - [L] # OpenShift Virtualization (CNV) catchall redirect; use when CNV releases asynchronously from OCP. Do not change the 302 to a 301. # When uncommented, this redirects all `virt` directory traffic to the about-virt page. # Pay mind to the redirect directly above this which prevents redirect loops. # To activate the redirects, uncomment the next and previous lines and update the version number to the pending release. - # RewriteRule ^(latest|4\.15)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302] + #RewriteRule ^(latest|4\.16)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302] # Red Hat OpenShift support for Windows Containers (WMCO) catchall redirect; use when WMCO releases asynchronously from OCP. Do not change the 302 to a 301. # When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page. diff --git a/404-commercial.html b/404-commercial.html index 28058c3c38d1..21599e7c3c2c 100644 --- a/404-commercial.html +++ b/404-commercial.html @@ -167,7 +167,7 @@

Not found

- Red Hat + Red Hat
diff --git a/OWNERS-ALIASES b/OWNERS-ALIASES deleted file mode 100644 index 59adbf2276f8..000000000000 --- a/OWNERS-ALIASES +++ /dev/null @@ -1,31 +0,0 @@ -# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#OWNERS_ALIASES -# Do not change indents. Incorrect indents break the Prow CI - -aliases: - merge-rights: - - abhatt-rh - - abrennan89 - - adellape - - aireilly - - bburt-rh - - bergerhoffer - - bscott-rh - - gabriel-rh - - jab-rh - - jeana-redhat - - JoeAldinger - - kalexand-rh - - kcarmichael08 - - michaelryanpeter - - opayne1 - - ousleyp - - sjhala-ccs - - snarayan-redhat - - Srivaralakshmi - approve-rights: - - adellape - - bergerhoffer - - JoeAldinger - - kalexand-rh - - ousleyp - - sjhala-ccs diff --git a/_attributes/attributes-microshift.adoc b/_attributes/attributes-microshift.adoc index 730441cfa0a0..60b01b28c806 100644 --- a/_attributes/attributes-microshift.adoc +++ b/_attributes/attributes-microshift.adoc @@ -4,21 +4,24 @@ :experimental: :imagesdir: images :OCP: OpenShift Container Platform -:ocp-version: 4.16 +:ocp-version: 4.17 :oc-first: pass:quotes[OpenShift CLI (`oc`)] +//OpenShift Kubernetes Engine +:oke: OpenShift Kubernetes Engine :product-title-first: Red Hat build of MicroShift (MicroShift) :microshift-short: MicroShift :product-registry: OpenShift image registry -:product-version: 4.16 +:product-version: 4.17 :rhel-major: rhel-9 :op-system-base-full: Red Hat Enterprise Linux (RHEL) -:op-system: RHEL :op-system-base: RHEL :op-system-ostree-first: Red Hat Enterprise Linux for Edge (RHEL for Edge) :op-system-ostree: RHEL for Edge +:op-system-rt-kernel: Red Hat Enterprise Linux for Real Time (real-time kernel) +:op-system-rtk: real-time kernel :op-system-version: 9.4 :op-system-version-major: 9 :op-system-bundle: Red Hat Device Edge -:rpm-repo-version: rhocp-4.16 +:rpm-repo-version: rhocp-4.17 :rhde-version: 4 :VirtProductName: OpenShift Virtualization diff --git a/_attributes/attributes-openshift-dedicated.adoc b/_attributes/attributes-openshift-dedicated.adoc index 409b9f96fac4..9a3cd800719a 100644 --- a/_attributes/attributes-openshift-dedicated.adoc +++ b/_attributes/attributes-openshift-dedicated.adoc @@ -8,6 +8,7 @@ :OCP-short: OpenShift :ocp-version: 4.14 :op-system-first: Red Hat Enterprise Linux CoreOS (RHCOS) +:oc-first: pass:quotes[OpenShift CLI (`oc`)] :cluster-manager-first: Red Hat OpenShift Cluster Manager :cluster-manager: OpenShift Cluster Manager :cluster-manager-url: link:https://console.redhat.com/openshift[OpenShift Cluster Manager] @@ -17,6 +18,7 @@ :hybrid-console-url: link:https://console.redhat.com[Red Hat Hybrid Cloud Console] :AWS: Amazon Web Services (AWS) :GCP: Google Cloud Platform (GCP) +:openshift-networking: Red Hat OpenShift Networking :product-registry: OpenShift image registry :kebab: image:kebab.png[title="Options menu"] :rhq-short: Red Hat Quay diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index cac86a5414d5..47cb0623c4b9 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -38,7 +38,7 @@ endif::[] :oadp-first: OpenShift API for Data Protection (OADP) :oadp-full: OpenShift API for Data Protection :oadp-short: OADP -:oadp-version: 1.3.1 +:oadp-version: 1.4.1 :oc-first: pass:quotes[OpenShift CLI (`oc`)] :product-registry: OpenShift image registry :product-mirror-registry: Mirror registry for Red Hat OpenShift @@ -46,24 +46,20 @@ endif::[] :rh-storage: OpenShift Data Foundation :rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM) :rh-rhacm: RHACM -:rh-rhacm-version: 2.10 -:sandboxed-containers-first: OpenShift sandboxed containers -:sandboxed-containers-operator: OpenShift sandboxed containers Operator -:sandboxed-containers-version: 1.5 -:sandboxed-containers-version-z: 1.5.0 -:sandboxed-containers-legacy-version: 1.4.1 +:rh-rhacm-version: 2.11 +:osc: OpenShift sandboxed containers :cert-manager-operator: cert-manager Operator for Red Hat OpenShift :secondary-scheduler-operator-full: Secondary Scheduler Operator for Red Hat OpenShift :secondary-scheduler-operator: Secondary Scheduler Operator :descheduler-operator: Kube Descheduler Operator // Backup and restore :velero-domain: velero.io -:velero-version: 1.12 +:velero-version: 1.14 :launch: image:app-launcher.png[title="Application Launcher"] :mtc-short: MTC :mtc-full: Migration Toolkit for Containers :mtc-version: 1.8 -:mtc-version-z: 1.8.3 +:mtc-version-z: 1.8.4 // builds (Valid only in 4.11 and later) :builds-v2title: Builds for Red Hat OpenShift :builds-v2shortname: OpenShift Builds v2 @@ -95,8 +91,8 @@ endif::[] :opp: OpenShift Platform Plus //openshift virtualization (cnv) :VirtProductName: OpenShift Virtualization -:VirtVersion: 4.15 -:HCOVersion: 4.15.0 +:VirtVersion: 4.16 +:HCOVersion: 4.16.0 :CNVNamespace: openshift-cnv :CNVOperatorDisplayName: OpenShift Virtualization Operator :CNVSubscriptionSpecSource: redhat-operators @@ -136,6 +132,9 @@ ifdef::telco-core[] :rds: telco core :rds-caps: Telco core endif::[] +//lightspeed +:ols-official: Red Hat OpenShift Lightspeed +:ols: OpenShift Lightspeed //logging :logging: logging :logging-uc: Logging @@ -147,6 +146,10 @@ endif::[] //observability :ObservabilityLongName: Red Hat OpenShift Observability :ObservabilityShortName: Observability +// Cluster Monitoring Operator +:cmo-first: Cluster Monitoring Operator (CMO) +:cmo-full: Cluster Monitoring Operator +:cmo-short: CMO //power monitoring :PM-title-c: Power monitoring for Red Hat OpenShift :PM-title: power monitoring for Red Hat OpenShift @@ -164,8 +167,8 @@ endif::[] :product-rosa: Red Hat OpenShift Service on AWS :SMProductName: Red Hat OpenShift Service Mesh :SMProductShortName: Service Mesh -:SMProductVersion: 2.5.2 -:MaistraVersion: 2.5 +:SMProductVersion: 2.6.1 +:MaistraVersion: 2.6 :KialiProduct: Kiali Operator provided by Red Hat :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin :SMPluginShort: OSSMC plugin @@ -208,10 +211,12 @@ endif::[] :olm: OLM //Initial version of OLM that shipped with OCP 4, aka "v0" :olmv0: legacy OLM +:olmv0-caps: Legacy OLM :olmv0-first: legacy Operator Lifecycle Manager (OLM) -//Next-gen (OCP 4.14+) Operator Lifecycle Manager, aka "v1" -:olmv1: OLM 1.0 -:olmv1-first: Operator Lifecycle Manager (OLM) 1.0 +:olmv0-first-caps: Legacy Operator Lifecycle Manager (OLM) +//Next-gen (OCP 4.14+) Operator Lifecycle Manager, f/k/a "1.0" +:olmv1: OLM v1 +:olmv1-first: Operator Lifecycle Manager (OLM) v1 // :ztp-first: GitOps Zero Touch Provisioning (ZTP) :ztp: GitOps ZTP @@ -235,10 +240,6 @@ endif::[] //IBU :lcao: Lifecycle Agent - - - - // Cloud provider names // Alibaba Cloud :alibaba: Alibaba Cloud @@ -308,9 +309,14 @@ endif::openshift-origin[] //Microsoft Entra Workload ID (FKA Azure Active Directory Workload Identities) :entra-first: Microsoft Entra Workload ID :entra-short: Workload ID +//Google Cloud Platform Workload Identity +:gcp-wid-first: Google Cloud Platform Workload Identity +:gcp-wid-short: GCP Workload Identity -// Cluster API Providers +// Cluster API terminology +// Cluster CAPI Operator +:cluster-capi-operator: Cluster CAPI Operator // Cluster API Provider Amazon Web Services (AWS) :cap-aws-first: Cluster API Provider Amazon Web Services (AWS) :cap-aws-short: Cluster API Provider AWS diff --git a/_distro_map.yml b/_distro_map.yml index cccb8a0a1c27..a0af90b864df 100644 --- a/_distro_map.yml +++ b/_distro_map.yml @@ -39,6 +39,9 @@ openshift-origin: enterprise-4.15: name: '4.15' dir: '4.15' + enterprise-4.16: + name: '4.16' + dir: '4.16' enterprise-3.6: name: '3.6' dir: '3.6' @@ -148,6 +151,9 @@ openshift-enterprise: enterprise-4.16: name: '4.16' dir: container-platform/4.16 + enterprise-4.17: + name: '4.17' + dir: container-platform/4.17 openshift-dedicated: name: OpenShift Dedicated author: OpenShift Documentation Project @@ -158,7 +164,7 @@ openshift-dedicated: enterprise-3.11: name: '3' dir: dedicated/3 - enterprise-4.15: + enterprise-4.16: name: '' dir: dedicated/ openshift-aro: @@ -181,12 +187,25 @@ openshift-rosa: site_name: Documentation site_url: https://docs.openshift.com/ branches: - enterprise-4.15: + enterprise-4.16: name: '' dir: rosa/ rosa-preview: name: '' dir: rosa-preview/ +openshift-rosa-hcp: + name: Red Hat OpenShift Service on AWS + author: OpenShift Documentation Project + site: commercial + site_name: Documentation + site_url: https://docs.openshift.com/ + branches: + enterprise-4.16: + name: '' + dir: rosa-hcp/ + rosa-preview: + name: '' + dir: rosa-hcp-preview/ openshift-rosa-portal: name: Red Hat OpenShift Service on AWS author: OpenShift Documentation Project @@ -194,7 +213,7 @@ openshift-rosa-portal: site_name: Documentation site_url: https://docs.openshift.com/ branches: - enterprise-4.15: + enterprise-4.16: name: '' dir: rosa-portal/ openshift-webscale: @@ -291,6 +310,9 @@ openshift-acs: rhacs-docs-4.4: name: '4.4' dir: acs/4.4 + rhacs-docs-4.5: + name: '4.5' + dir: acs/4.5 microshift: name: Red Hat build of MicroShift author: OpenShift Documentation Project @@ -326,6 +348,12 @@ openshift-serverless: serverless-docs-1.32: name: '1.32' dir: serverless/1.32 + serverless-docs-1.33: + name: '1.33' + dir: serverless/1.33 + serverless-docs-1.34: + name: '1.34' + dir: serverless/1.34 openshift-gitops: name: Red Hat OpenShift GitOps author: OpenShift documentation team @@ -351,6 +379,9 @@ openshift-gitops: gitops-docs-1.13: name: '1.13' dir: gitops/1.13 + gitops-docs-1.14: + name: '1.14' + dir: gitops/1.14 openshift-pipelines: name: Red Hat OpenShift Pipelines author: OpenShift documentation team @@ -376,6 +407,9 @@ openshift-pipelines: pipelines-docs-1.15: name: '1.15' dir: pipelines/1.15 + pipelines-docs-1.16: + name: '1.16' + dir: pipelines/1.16 openshift-builds: name: builds for Red Hat OpenShift author: OpenShift documentation team @@ -386,6 +420,9 @@ openshift-builds: build-docs-1.0: name: '1.0' dir: builds/1.0 + build-docs-1.1: + name: '1.1' + dir: builds/1.1 openshift-lightspeed: name: Red Hat OpenShift Lightspeed author: OpenShift documentation team @@ -395,4 +432,14 @@ openshift-lightspeed: branches: lightspeed-docs-1.0tp1: name: '1.0tp1' - dir: lightspeed/1.0tp1 + dir: lightspeed/1.0tp1 +openshift-service-mesh: + name: Red Hat OpenShift Service Mesh + author: OpenShift documentation team + site: commercial + site_name: Documentation + site_url: https://docs.openshift.com/ + branches: + service-mesh-docs-3.0.0tp1: + name: '3.0.0tp1' + dir: service-mesh/3.0.0tp1 diff --git a/_templates/_footer_origin.html.erb b/_templates/_footer_origin.html.erb index 6f7d6c38ccbc..4ad78401c080 100644 --- a/_templates/_footer_origin.html.erb +++ b/_templates/_footer_origin.html.erb @@ -24,14 +24,10 @@
-
-
- - Powered by OpenShift Online + Red Hat
+
AsciiBinder diff --git a/_templates/_footer_other.html.erb b/_templates/_footer_other.html.erb index f948664a1316..c07d1cc41f0e 100644 --- a/_templates/_footer_other.html.erb +++ b/_templates/_footer_other.html.erb @@ -4,7 +4,7 @@
- Red Hat + Red Hat
diff --git a/_templates/_page_openshift.html.erb b/_templates/_page_openshift.html.erb index 37f781542a70..35e6fb342dbb 100644 --- a/_templates/_page_openshift.html.erb +++ b/_templates/_page_openshift.html.erb @@ -67,7 +67,23 @@ <% end %> - <% if (version == "4.16") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %> + <% if (distro_key == "openshift-lightspeed") %> + + + + <% end %> + + <% if (distro_key == "openshift-service-mesh") %> + + + + <% end %> + + <% if (version == "4.17") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu" && distro_key != "rosa-hcp") %>