Merge branch 'main' into OSDOCS-14692

Author: snarayan-redhat

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

@@ -164,7 +164,7 @@ AddType text/vtt                            vtt
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
-    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.18/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.19/$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
@@ -791,7 +791,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|4\.16|4\.17|4\.18)/?$ /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|4\.17|4\.18|4\.19)/?$ /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]
 
 

_attributes/attributes-microshift.adoc

@@ -11,6 +11,8 @@
 :oke: OpenShift Kubernetes Engine
 :product-title-first: Red{nbsp}Hat build of MicroShift (MicroShift)
 :microshift-short: MicroShift
+//gitops version for 4.17-4.19
+:gitops-ver: 1.16
 :product-registry: OpenShift image registry
 :product-version: 4.19
 :rhel-major: rhel-9

_attributes/attributes-openshift-dedicated.adoc

@@ -56,3 +56,5 @@
 :rosa-classic-first: {product-title} (ROSA) (classic architecture)
 :egress-lockdown: {hcp-title} clusters with zero egress
 //ROSA CLI variables
+:zero-egress: zero egress
+//unclear whether this is going to be zero egress or egress lockdown

_attributes/common-attributes.adoc

@@ -45,9 +45,10 @@ endif::[]
 :oadp-first: OpenShift API for Data Protection (OADP)
 :oadp-full: OpenShift API for Data Protection
 :oadp-short: OADP
-:oadp-version: 1.4.4
+:oadp-version: 1.5.0
 :oadp-version-1-3: 1.3.6
 :oadp-version-1-4: 1.4.4
+:oadp-version-1-5: 1.5.0
 :oadp-bsl-api: backupstoragelocations.velero.io
 :oc-first: pass:quotes[OpenShift CLI (`oc`)]
 :product-registry: OpenShift image registry
@@ -224,10 +225,6 @@ endif::[]
 // logical volume manager storage
 :lvms-first: Logical Volume Manager (LVM) Storage
 :lvms: LVM Storage
-//Operator SDK version
-:osdk_ver: 1.38.0
-//Operator SDK version that shipped with the previous OCP 4.x release
-:osdk_ver_n1: 1.36.1
 //Version-agnostic OLM
 :olm-first: Operator Lifecycle Manager (OLM)
 :olm: OLM
@@ -371,6 +368,9 @@ endif::openshift-origin[]
 // Cluster API Provider VMware vSphere
 :cap-vsphere-first: Cluster API Provider VMware vSphere
 :cap-vsphere-short: Cluster API Provider vSphere
+// Cluster API Provider Metal3
+:cap-bare-metal-first: Cluster API Provider Metal3
+:cap-bare-metal-short: Cluster API Provider Metal3
 // Hosted control planes related attributes
 :hcp-capital: Hosted control planes
 :hcp: hosted control planes
@@ -388,3 +388,12 @@ endif::openshift-origin[]
 :spiffe-full: Secure Production Identity Framework for Everyone (SPIFFE)
 :svid-full: SPIFFE Verifiable Identity Document (SVID)
 :spire-full: SPIFFE Runtime Environment
+// Formerly on-cluster image layering
+:image-mode-os-caps: Image mode for OpenShift
+:image-mode-os-lower: image mode for OpenShift
+// Formerly on-cluster layering 
+:image-mode-os-on-caps: On-cluster image mode
+:image-mode-os-on-lower: on-cluster image mode
+// Formerly out-of-cluster layering 
+:image-mode-os-out-caps: Out-of-cluster image mode
+:image-mode-os-out-lower: out-of-cluster image mode

_distro_map.yml

@@ -48,6 +48,9 @@ openshift-origin:
     enterprise-4.18:
       name: '4.18'
       dir: '4.18'
+    enterprise-4.19:
+      name: '4.19'
+      dir: '4.19'
     enterprise-3.6:
       name: '3.6'
       dir: '3.6'
@@ -163,6 +166,9 @@ openshift-enterprise:
     enterprise-4.18:
       name: '4.18'
       dir: container-platform/4.18
+    enterprise-4.19:
+      name: '4.19'
+      dir: container-platform/4.19
 openshift-dedicated:
   name: OpenShift Dedicated
   author: OpenShift Documentation Project <openshift-docs@redhat.com>
@@ -173,7 +179,7 @@ openshift-dedicated:
     enterprise-3.11:
       name: '3'
       dir: dedicated/3
-    enterprise-4.18:
+    enterprise-4.19:
       name: ''
       dir: dedicated/
 openshift-aro:
@@ -196,7 +202,7 @@ openshift-rosa:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.18:
+    enterprise-4.19:
       name: ''
       dir: rosa/
     rosa-preview:
@@ -209,7 +215,7 @@ openshift-rosa-hcp:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.18:
+    enterprise-4.19:
       name: ''
       dir: rosa-hcp/
     rosa-preview:
@@ -222,7 +228,7 @@ openshift-rosa-portal:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.18:
+    enterprise-4.19:
       name: ''
       dir: rosa-portal/
 openshift-webscale:
@@ -472,6 +478,9 @@ openshift-lightspeed:
     lightspeed-docs-1.0tp1:
       name: '1.0tp1'
       dir: lightspeed/1.0tp1
+    lightspeed-docs-1.0:
+      name: '1.0'
+      dir: lightspeed/1.0     
 
 openshift-service-mesh:
   name: Red Hat OpenShift Service Mesh