Merge pull request #84989 from aireilly/prow-test-2

Resetting prow-test-2 to main

Author: aireilly

.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": {

.github/CODEOWNERS

@@ -1 +1 @@
- @abhatt-rh @abrennan89 @adellape @aireilly @apinnick @bburt-rh @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @kelbrown20 @michaelryanpeter @mjpytlak @opayne1 @ousleyp @rolfedh @sjhala-ccs @snarayan-redhat @Srivaralakshmi
+ @abhatt-rh @abrennan89 @adellape @aireilly @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @michaelryanpeter @opayne1 @ousleyp @sjhala-ccs @snarayan-redhat @Srivaralakshmi

.github/pull_request_template.md

@@ -1,6 +1,8 @@
 <!--- PR title format: [GH#<gh-issue-id>][BZ#<bz-issue-id>][OCPBUGS#<jira-issue-id>][OSDOCS#<jira-issue-id>]: <short-description-of-the-pr> --->
 
 <!--- If your changes apply to the latest release and/or in-development version of OpenShift, open your PR against the `main` branch.
+Do not create or rename a top-level directory (or any subdirectory in a directory that contains a hugebook.flag file) in the repository and topic map without checking with a docs program manager first.
+If a book is being created or modified, there are changes on the Customer Portal that must also be made.
 
 * For more details about the information requested in this template, see:
   https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/create_or_edit_content.adoc#submit-PR --->

.s2i/httpd-cfg/01-commercial.conf

@@ -159,20 +159,20 @@ 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\.14)/virt/about_virt/about-virt.html
-    # RewriteRule ^(latest|4\.14)/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\.17)/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\.14)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about_virt/about-virt.html [NE,R=302]
+    # RewriteRule ^(latest|4\.17)/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.
     # To activate the redirects, uncomment the next line and update the version number to the pending release.
-    # RewriteRule ^(latest|4\.14)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
-    # RewriteRule ^(latest|4\.14)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
+    # RewriteRule ^(latest|4\.15)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
+    # RewriteRule ^(latest|4\.15)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
 
   </Directory>
 </IfModule>

.s2i/httpd-cfg/01-community.conf

@@ -10,10 +10,6 @@ Vocab = OpenShiftDocs
 [[!.]*.adoc]
 BasedOnStyles = RedHat, AsciiDoc, OpenShiftAsciiDoc
 
-# Optional: pass doc attributes to asciidoctor before linting
-#[asciidoctor]
-#openshift-enterprise = YES
-
 # Disabling rules (NO)
 RedHat.ReleaseNotes = NO
 
@@ -27,3 +23,10 @@ OpenShiftAsciiDoc.NoNestingInModules = NO
 OpenShiftAsciiDoc.NoXrefInModules = NO
 OpenShiftAsciiDoc.IdHasContextVariable = NO
 OpenShiftAsciiDoc.NoTocInModules = NO
+
+# Optional: pass doc attributes to asciidoctor before linting
+# Temp values are used for Prow CI comment linting only
+[asciidoctor]
+temp-ifdef = YES
+temp-ifndef = NO
+temp-ifeval = temp

.vale.ini

@@ -1,16 +1,16 @@
 # Regex terms added to accept.txt are ignored by the Vale linter and override RedHat Vale rules.
 # Add terms that have a corresponding incorrectly capitalized form to reject.txt.
-# URL slugs
-(.*/)+
-(?<!.*-)operator
 [Ff]ronthaul
+[Mm][Bb]ps
 [Mm]idhaul
+[Oo]n-premise
 [Pp]assthrough
 [Pp]ostinstall
 [Pp]recaching
 [Pp]reinstall
 [Rr]ealtime
 [Tt]elco
+[Uu]npause
 Assisted Installer
 Control Plane Machine Set Operator
 custom resources?
@@ -20,13 +20,11 @@ gpspipe
 hyperthreads?
 KPIs?
 linuxptp
-Mbps
-MBps
 Mellanox
 MetalLB
 NICs?
-Operators?
 pmc
 ubxtool
+vDUs?
 VFs?
 Westport

.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt

@@ -1,7 +1,6 @@
 # Regex terms added to reject.txt are highlighted as errors by the Vale linter and override RedHat Vale rules.
 # Add terms that have a corresponding correctly capitalized form to accept.txt.
 
-(?<!.*-)operators
 [Dd]eployment [Cc]onfigs?
 [Dd]eployment [Cc]onfigurations?
 [Oo]peratorize

.vale/styles/config/vocabularies/OpenShiftDocs/reject.txt

@@ -7,43 +7,42 @@
 {{- $s := 0 -}}
 
 {{- /* Range over the linted files */ -}}
-
 [
 {{- range $jdx, $file := .Files -}}
-
-{{- $path := .Path -}}
-
-{{- /* Range over the file's alerts */ -}}
-
-{{- if $jdx -}},{{- end -}}
-{{- range $idx, $a := .Alerts -}}
-
-{{- $error := "" -}}
-{{- if eq .Severity "error" -}}
-    {{- $error = "error" -}}
-    {{- $e = add1 $e  -}}
-{{- else if eq .Severity "warning" -}}
-    {{- $error = "warning" -}}
-    {{- $w = add1 $w -}}
-{{- else -}}
-    {{- $error = "suggestion" -}}
-    {{- $s = add1 $s -}}
-{{- end}}
-
-{{- /* Variables setup */ -}}
-
-{{- $loc := printf "%d" .Line -}}
-{{- $check := printf "%s" .Check -}}
-{{- $message := printf "%s" .Message -}}
-{{- if $idx -}},{{- end -}}
-
-{{- /* Output */ -}}
-
-  {
-    "body": "🤖 **[{{ $error }}] {{$check}}**: {{ $message }}",
-    "path": "{{ $path }}",
-    "line": {{ $loc }}
-  }
-{{end -}}
+    {{- $path := .Path -}}
+    {{- /* Range over the file's alerts */ -}}
+    {{- if $jdx -}},{{- end -}}
+    {{- range $idx, $a := .Alerts -}}
+
+        {{- $error := "" -}}
+        {{- if eq .Severity "error" -}}
+            {{- $error = "error" -}}
+            {{- $e = add1 $e  -}}
+        {{- else if eq .Severity "warning" -}}
+            {{- $error = "warning" -}}
+            {{- $w = add1 $w -}}
+        {{- else -}}
+            {{- $error = "suggestion" -}}
+            {{- $s = add1 $s -}}
+        {{- end}}
+
+        {{- /* Variables setup */ -}}
+        {{- $loc := printf "%d" .Line -}}
+        {{- $check := printf "%s" .Check -}}
+        {{- $message := printf "%s" .Message -}}
+        {{- /* Only add a link for RedHat rule errors */ -}}
+        {{- $link := "" -}}
+        {{- if contains "RedHat." .Check -}}
+            {{- $link = printf "For more information, see [%s](https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/%s)." .Check (lower (trimPrefix "RedHat." .Check)) -}}
+        {{- end -}}
+        {{- if $idx -}},{{- end -}}
+
+        {{- /* Output */ -}}
+        {
+            "body": "🤖 **[{{ $error }}] {{$check}}**: {{ $message }} {{ $link }}",
+            "path": "{{ $path }}",
+            "line": {{ $loc }}
+        }
+    {{end -}}
 {{end -}}
 ]

.vale/templates/bot-comment-output.tmpl

@@ -167,7 +167,7 @@ <h1>Not found</h1>
     <div class="container">
         <div class="row">
             <div class="col-sm-2">
-                <img src="https://assets.openshift.com/hubfs/images/logos/Logo-RedHat-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
+                <img src="https://assets.openshift.net/content/img/Logo-Red_Hat-OpenShift-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
             </div>
 
             <div class="col-sm-3">