Merge branch 'enterprise-4.13' into sd-port-security-tlove

Author: tmalove

.travis.yml

@@ -1,5 +1,8 @@
 language: python
-cache: pip
+cache:
+  pip: true
+  directories:
+    - /home/travis/.rvm/gems
 # env:
 #   - PR_AUTHOR=${TRAVIS_PULL_REQUEST_SLUG::-15}
 git:
@@ -8,90 +11,72 @@ jobs:
   allow_failures:
     env:
       - CAN_FAIL=true
+
   include:
-    # fail if asciidoctor encounters errors
-    - stage: validate
-      name: "Validate updated assemblies with Asciidoctor"
+    - stage: cache-and-validate
+      name: "Create install cache and validate updated assemblies"
       install:
-        - gem install asciidoctor
-        - gem install asciidoctor-diagram
-        - gem install rouge
+        - gem install asciidoctor asciidoctor-diagram rouge
+        - pip3 install pyyaml aura.tar.gz
       script:
-        - chmod +x ./scripts/check-asciidoctor-build.sh
-        - ./scripts/check-asciidoctor-build.sh
+        # Fail if Asciidoctor encounters errors. Pass otherwise. Run only if there are modified AsciiDoc files
+        - if ! [[ -z $(git diff --name-only HEAD~1 HEAD --diff-filter=d '*.adoc' ':(exclude)_unused_topics/*') ]]; then chmod +x ./scripts/check-asciidoctor-build.sh && ./scripts/check-asciidoctor-build.sh; fi
+
     - stage: build
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build openshift-enterprise distro"
-      before_install:
-        - gem install asciidoctor
-        - gem install asciidoctor-diagram
-      install:
-        - pip3 install pyyaml
-        - pip3 install aura.tar.gz
       script:
-        - python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.11 --no-upstream-fetch && python3 makeBuild.py
+        - python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.13 --no-upstream-fetch && python3 makeBuild.py
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.11, enterprise-4.12)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build openshift-dedicated distro"
-      before_install:
-        - gem install asciidoctor
-        - gem install asciidoctor-diagram
-      install:
-        - pip3 install pyyaml
-        - pip3 install aura.tar.gz
       script:
         - python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch && python3 makeBuild.py
+
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.11, enterprise-4.12)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build openshift-rosa distro"
-      before_install:
-        - gem install asciidoctor
-        - gem install asciidoctor-diagram
-      install:
-        - pip3 install pyyaml
-        - pip3 install aura.tar.gz
       script:
         - python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch && python3 makeBuild.py
+
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.12, enterprise-4.13)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build microshift distro"
-      before_install:
-        - gem install asciidoctor
-        - gem install asciidoctor-diagram
-      install:
-        - pip3 install pyyaml
-        - pip3 install aura.tar.gz
       script:
-        - python3 build.py --distro microshift --product "MicroShift" --version 4 --no-upstream-fetch && python3 makeBuild.py
+        - python3 build.py --distro microshift --product "Microshift" --version 4 --no-upstream-fetch && python3 makeBuild.py
+
     # Remove Vale stage until PR commenting feature is ready
     # - stage: check-with-vale
     #   env:
     #     - CAN_FAIL=true
     #   if: type IN (pull_request) AND sender != "openshift-cherrypick-robot"
     #   name: "Run Vale against PR asciidoc files"
     #   language: minimal
-    #   before_script:
-    #     - gem install asciidoctor
     #   script:
     #     - travis_retry wget https://github.com/errata-ai/vale/releases/download/v2.15.4/vale_2.15.4_Linux_64-bit.tar.gz --retry-connrefused
     #     - mkdir bin && tar -xvzf vale_2.15.4_Linux_64-bit.tar.gz -C bin
     #     - export PATH=./bin:"$PATH"
     #     - travis_retry vale sync # pull down VRH rules package
     #     - chmod +x ./scripts/check-with-vale.sh
-    #     - ./scripts/check-with-vale.sh
+    #     - ./scripts/check-with-vale.sh; fi
+
     # Commenting out to disable auto-merging of PRs
     # - stage: automerge
     #   if: env(PR_AUTHOR)=openshift-cherrypick-robot
     #   script: bash ./automerge.sh
+
     - stage: netlify
+      name: "Build and deploy with Netlify"
       env:
         - CAN_FAIL=true
       language: minimal
-      if: type IN (pull_request) AND branch IN (main, enterprise-4.12, enterprise-4.13) AND sender != "openshift-cherrypick-robot"
+      if: type IN (pull_request) AND branch IN (main, enterprise-4.13, enterprise-4.14) AND sender != "openshift-cherrypick-robot"
       script:
-        - chmod +x autopreview.sh && ./autopreview.sh
+        - chmod +x autopreview.sh
+        - ./autopreview.sh
 
 stages:
-  - validate
+  - cache-and-validate
   - build
   - netlify
   #- check-with-vale

_attributes/common-attributes.adoc

@@ -110,7 +110,7 @@ endif::[]
 :VirtProductName: OpenShift Virtualization
 :VirtVersion: 4.13
 :KubeVirtVersion: v0.59.0
-:HCOVersion: 4.13.2
+:HCOVersion: 4.13.3
 :CNVNamespace: openshift-cnv
 :CNVOperatorDisplayName: OpenShift Virtualization Operator
 :CNVSubscriptionSpecSource: redhat-operators
@@ -127,7 +127,7 @@ endif::[]
 :DTProductName: Red Hat OpenShift distributed tracing
 :DTShortName: distributed tracing
 :DTProductVersion: 2.8
-:JaegerName: Red Hat OpenShift distributed tracing platform 
+:JaegerName: Red Hat OpenShift distributed tracing platform
 :JaegerShortName: distributed tracing platform
 :JaegerVersion: 1.42.0
 :OTELName: Red Hat OpenShift distributed tracing data collection
@@ -148,9 +148,10 @@ endif::[]
 :FunctionsProductName: OpenShift Serverless Functions
 //service mesh v2
 :product-dedicated: Red Hat OpenShift Dedicated
+:product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.4.1
+:SMProductVersion: 2.4.2
 :MaistraVersion: 2.4
 //Service Mesh v1
 :SMProductVersion1x: 1.1.18.2

_topic_maps/_topic_map.yml

@@ -1566,6 +1566,8 @@ Topics:
       File: persistent-storage-hostpath
     - Name: Persistent storage using LVM Storage
       File: persistent-storage-using-lvms
+    - Name: Troubleshooting local persistent storage using LVMS
+      File: troubleshooting-local-persistent-storage-using-lvms
 - Name: Using Container Storage Interface (CSI)
   Dir: container_storage_interface
   Distros: openshift-enterprise,openshift-origin
@@ -1963,6 +1965,8 @@ Topics:
     File: uninstalling-openshift-gitops
   - Name: Setting up a new Argo CD instance
     File: setting-up-argocd-instance
+  - Name: Using Argo Rollouts for progressive deployment delivery
+    File: using-argo-rollouts-for-progressive-deployment-delivery
   - Name: Configuring an OpenShift cluster by deploying an application with cluster configurations
     File: configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations
   - Name: Deploying a Spring Boot application with Argo CD
@@ -1983,6 +1987,8 @@ Topics:
     File: configuring-resource-quota
   - Name: Monitoring Argo CD custom resource workloads
     File: monitoring-argo-cd-custom-resource-workloads
+  - Name: Viewing Argo CD logs
+    File: viewing-argo-cd-logs
   - Name: Running Control Plane Workloads on Infra nodes
     File: run-gitops-control-plane-workload-on-infra-nodes
   - Name: Sizing requirements for GitOps Operator
@@ -2447,6 +2453,9 @@ Topics:
   - Name: Analyzing cluster resource levels
     File: nodes-cluster-resource-levels
     Distros: openshift-enterprise,openshift-origin
+  - Name: Configuring a cluster for pods
+    File: nodes-cluster-pods-configuring
+    Distros: openshift-enterprise,openshift-origin
   - Name: Setting limit ranges
     File: nodes-cluster-limit-ranges
   - Name: Configuring cluster memory to meet container memory and risk requirements
@@ -3517,7 +3526,7 @@ Topics:
     File: installing-ossm
   - Name: Creating the ServiceMeshControlPlane
     File: ossm-create-smcp
-  - Name: Adding workloads to a service mesh
+  - Name: Adding services to a service mesh
     File: ossm-create-mesh
   - Name: Enabling sidecar injection
     File: prepare-to-deploy-applications-ossm

_topic_maps/_topic_map_osd.yml

@@ -202,14 +202,16 @@ Topics:
   Topics:
   - Name: Accessing the service logs
     File: osd-accessing-the-service-logs
+# - Name: Cluster autoscaling
+#   File: osd-cluster-autoscaling
+---
+ Name: Security and compliance
+ Dir: security
+ Distros: openshift-dedicated
+ Topics:
+ - Name: Audit logs
+   File: audit-log-view
 ---
-# Name: Security and compliance
-# Dir: security
-# Distros: openshift-dedicated
-# Topics:
-# - Name: Viewing audit logs
-#   File: audit-log-view
-# ---
 Name: Authentication and authorization
 Dir: authentication
 Distros: openshift-dedicated
@@ -435,7 +437,7 @@ Topics:
 - Name: Configuring the monitoring stack
   File: configuring-the-monitoring-stack
 - Name: Disabling monitoring for user-defined projects
-  File: sd-disabling-monitoring-for-user-defined-projects  
+  File: sd-disabling-monitoring-for-user-defined-projects
 - Name: Enabling alert routing for user-defined projects
   File: enabling-alert-routing-for-user-defined-projects
 - Name: Managing metrics