openshift · nebelsprachen · Jan 22, 2024 · Jan 19, 2024 · Jan 23, 2024 · Jan 23, 2024
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -0,0 +1,4 @@
+build_root_image:
+  namespace: openshift
+  name: release
+  tag: golang-1.15
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,24 +1,15 @@
 {
-  "name": "ruby 2",
-
-  "image": "mcr.microsoft.com/vscode/devcontainers/ruby:2.7",
-  //"image": "quay.io/rhn_support_gmcgoldr/vscode-ruby27-asciibinder",
-
-  "postCreateCommand": "gem install asciidoctor asciidoctor-diagram ascii_binder && asciibinder build --distro=openshift-enterprise && BR=\"$(git branch --show-current)\" && cd _preview/openshift-enterprise/$BR &&  ln -s welcome/index.html index.html && ruby -run -ehttpd . -p8000"
-  //"postCreateCommand": "asciibinder build --distro=openshift-enterprise && cd _preview/openshift-enterprise/main &&  ln -s welcome/index.html index.html && ruby -run -ehttpd . -p8000"
-
-  // Features to add to the dev container. More info: https://containers.dev/features.a
-  // "features": {},
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
-
-  // Use 'postCreateCommand' to run commands after the container is created.
-  // "postCreateCommand": "pip3 install --user -r requirements.txt",
-
-  // Configure tool-specific properties.
-  // "customizations": {},
-
-  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  // "remoteUser": "root"
-}
+  "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",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "search.followSymlinks": false,
+        "workbench.editor.enablePreview": false
+      },
+      "extensions": [
+        "asciidoctor.asciidoctor-vscode"
+      ]
+    }
+  }
+}
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-@kalexand-rh @JoeAldinger @bergerhoffer @adellape @sjhala-ccs @apinnick @ousleyp
+ @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
diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf
diff --git a/.s2i/httpd-cfg/01-community.conf b/.s2i/httpd-cfg/01-community.conf
@@ -159,10 +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]
+
     # 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]
+
+    # 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\.12)/virt/(?!about-virt\.html)(.+)$ /$1/virt/about-virt.html [NE,R=302]
+    # 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]
 
   </Directory>
 </IfModule>

diff --git a/.travis.yml b/.travis.yml
diff --git a/.travis.yml.old b/.travis.yml.old
@@ -0,0 +1,36 @@
+language: python
+cache:
+  pip: true
+
+git:
+  depth: 10
+jobs:
+  include:
+    - name: "Preview, validate, and build"
+      before_install:
+      - if [ "$TRAVIS_BRANCH" != "main" ]; then chmod +x autopreview.sh && ./autopreview.sh; fi
+      install:
+        - gem install --local _gemfiles/asciidoctor-2.0.20.gem _gemfiles/asciidoctor-diagram-plantuml-1.2023.10.gem _gemfiles/asciidoctor-diagram-ditaamini-1.0.3.gem _gemfiles/rexml-3.2.6.gem _gemfiles/asciidoctor-diagram-2.2.14.gem _gemfiles/rouge-4.1.3.gem
+        - pip3 install pyyaml aura.tar.gz
+      script:
+        # Fail if Asciidoctor encounters errors. Or if release notes has links to internal bugs. Pass otherwise. Then, build updated distros
+        - chmod +x ./scripts/check-rn-link-perms.sh
+        - ./scripts/check-rn-link-perms.sh || travis_terminate 1
+        - chmod +x ./scripts/check-asciidoctor-build.sh
+        - chmod +x ./scripts/get-updated-distros.sh
+        - ./scripts/check-asciidoctor-build.sh || travis_terminate 1
+        - |
+          ./scripts/get-updated-distros.sh |
+            while read -r filename; do
+              if [ "$filename" == "_topic_maps/_topic_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.15 --no-upstream-fetch || travis_terminate 1
+
+              elif [ "$filename" == "_topic_maps/_topic_map_osd.yml" ]; then python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch || travis_terminate 1
+
+              elif [ "$filename" == "_topic_maps/_topic_map_ms.yml" ]; then python3 build.py --distro microshift --product "Microshift" --version 4 --no-upstream-fetch || travis_terminate 1
+
+              elif [ "$filename" == "_topic_maps/_topic_map_rosa.yml" ]; then python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch || travis_terminate 1
+
+              elif [ "$filename" == "_distro_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.15 --no-upstream-fetch || travis_terminate 1
+              fi
+            done
+        - if [ -d "drupal-build" ]; then python3 makeBuild.py || travis_terminate 1; fi
diff --git a/.vale.ini b/.vale.ini
@@ -2,7 +2,7 @@ StylesPath = .vale/styles
 
 MinAlertLevel = suggestion
 
-Packages = RedHat, https://github.com/redhat-documentation/vale-at-red-hat/releases/latest/download/AsciiDoc.zip, https://github.com/redhat-documentation/vale-at-red-hat/releases/latest/download/OpenShiftAsciiDoc.zip
+Packages = RedHat, AsciiDoc, OpenShiftAsciiDoc
 
 Vocab = OpenShiftDocs
 
@@ -25,3 +25,5 @@ Vale.Avoid = YES
 OpenShiftAsciiDoc.ModuleContainsParentAssemblyComment = NO
 OpenShiftAsciiDoc.NoNestingInModules = NO
 OpenShiftAsciiDoc.NoXrefInModules = NO
+OpenShiftAsciiDoc.IdHasContextVariable = NO
+OpenShiftAsciiDoc.NoTocInModules = NO
diff --git a/.vale/styles/Vocab/OpenShiftDocs/accept.txt b/.vale/styles/Vocab/OpenShiftDocs/accept.txt
diff --git a/.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt b/.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt
@@ -0,0 +1,32 @@
+# 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]idhaul
+[Pp]assthrough
+[Pp]ostinstall
+[Pp]recaching
+[Pp]reinstall
+[Rr]ealtime
+[Tt]elco
+Assisted Installer
+Control Plane Machine Set Operator
+custom resources?
+GHz
+gpsd
+gpspipe
+hyperthreads?
+KPIs?
+linuxptp
+Mbps
+MBps
+Mellanox
+MetalLB
+NICs?
+Operators?
+pmc
+ubxtool
+VFs?
+Westport
diff --git a/.vale/styles/Vocab/OpenShiftDocs/reject.txt → ...fig/vocabularies/OpenShiftDocs/reject.txt b/.vale/styles/Vocab/OpenShiftDocs/reject.txt → ...fig/vocabularies/OpenShiftDocs/reject.txt
@@ -1,6 +1,7 @@
 # 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
@@ -11,5 +12,4 @@ configuration maps?
 MachineSets
 machinesets?
 minions?
-operators?
-SNO
+SNO
diff --git a/.yamllint b/.yamllint
@@ -0,0 +1,11 @@
+---
+extends: relaxed
+rules:
+  indentation: { spaces: 2, indent-sequences: false }
+  line-length: disable
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: 1
+  empty-lines: disable
+  trailing-spaces: enable
+  new-line-at-end-of-file: enable
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
-# Dockerfile
-FROM centos:8
-RUN dnf install git python3 python3-devel ruby rubygems -y
-RUN gem install asciidoctor asciidoctor-diagram
-COPY . $HOME/src/
-RUN pip3 install pyyaml /src/aura.tar.gz
+FROM registry.access.redhat.com/ubi8-minimal:latest
+
+ENV LANG=en_US.UTF-8
+
+WORKDIR /go/src/github.com/openshift/openshift-docs
+
+CMD ["/bin/bash"]
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Red Hat, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/OWNERS b/OWNERS
@@ -0,0 +1,8 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+# This file just uses aliases defined in OWNERS_ALIASES.
+# Do not change indents. Incorrect indents break the Prow CI
+
+reviewers:
+- merge-rights
+approvers:
+- merge-rights
diff --git a/OWNERS-ALIASES b/OWNERS-ALIASES
@@ -0,0 +1,28 @@
+# 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
+  - 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
diff --git a/_attributes/attributes-microshift.adoc b/_attributes/attributes-microshift.adoc
@@ -4,16 +4,21 @@
 :experimental:
 :imagesdir: images
 :OCP: OpenShift Container Platform
-:ocp-version: 4.13
+:ocp-version: 4.15
 :oc-first: pass:quotes[OpenShift CLI (`oc`)]
+:product-title-first: Red Hat build of MicroShift (MicroShift)
+:microshift-short: MicroShift
 :product-registry: OpenShift image registry
+:product-version: 4.15
 :rhel-major: rhel-9
 :op-system-base-full: Red Hat Enterprise Linux (RHEL)
 :op-system: RHEL
-:op-system-ostree-first: Red Hat Enterprise Linux (RHEL) for Edge
+: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-version: 9.2
 :op-system-version-major: 9
 :op-system-bundle: Red Hat Device Edge
-:op-system-bundle-short: RHDE
+:rhde-version: 4
+:rpm-repo-version: rhocp-4.15
 :VirtProductName: OpenShift Virtualization
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		@kalexand-rh @JoeAldinger @bergerhoffer @adellape @sjhala-ccs @apinnick @ousleyp
		@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