cnf 4.6 references

.gitignore

@@ -9,6 +9,7 @@ architecture/core_concepts/images/docker-diagram.png.cache
 dev_guide/builds/images/chained-build.png
 dev_guide/builds/images/chained-build.png.cache
 .DS_Store
+.idea
 .venv
 .gem
 bin

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

@@ -127,14 +127,82 @@ AddType text/vtt                            vtt
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
-    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/3.9/$2 [NE,R=301]
-    RewriteRule ^(dedicated|online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|latest)/?(.*)$ /$1/$3 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.3/$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]
 
-    # Welcome page redirects
-    RewriteRule ^(online|dedicated)/?$ /$1/welcome/index.html [L,R=301]
+    # Service Mesh redirect from 3 to 4
+    RewriteRule ^container-platform/3\.11/servicemesh-install/servicemesh-install.html$ /container-platform/4.3/service_mesh/service_mesh_install/preparing-ossm-installation.html [NE,R=301]
+
+    # redirects for paths using dashes
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/web-console/?(.*)$ /container-platform/$1/web_console/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/multiple-networks/?(.*)$ /container-platform/$1/networking/multiple_networks/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/openshift-sdn/?(.*)$ /container-platform/$1/networking/openshift_sdn/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/configuring-ingress-cluster-traffic/?(.*)$ /container-platform/$1/networking/configuring_ingress_cluster_traffic/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/storage/persistent-storage/?(.*)$ /container-platform/$1/storage/persistent_storage/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/registry/configuring-registry-storage/?(.*)$ /container-platform/$1/registry/configuring_registry_storage/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/operators/understanding-olm/?(.*)$ /container-platform/$1/operators/understanding_olm/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/openshift_images/managing-images/?(.*)$ /container-platform/$1/openshift_images/managing_images/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/applications/application-life-cycle-management/?(.*)$ /container-platform/$1/applications/application_life_cycle_management/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/monitoring/cluster-monitoring/?(.*)$ /container-platform/$1/monitoring/cluster_monitoring/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/metering/configuring-metering/?(.*)$ /container-platform/$1/metering/configuring_metering/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-3-4/?(.*)$ /container-platform/$1/migration/migrating_3_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-4_1-4/?(.*)$ /container-platform/$1/migration/migrating_4_1_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-4_2-4/?(.*)$ /container-platform/$1/migration/migrating_4_2_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/cli_reference/helm-cli/?(.*)$ /container-platform/$1/cli_reference/helm_cli/$2 [NE,R=301]
+
+    # CNV redirects for paths using dashes
+    RewriteRule ^container-platform/4\.3/cnv/(cnv_install|cnv-install)/cnv-about-cnv.html/?(.*)$ /container-platform/4.3/cnv/cnv-about-cnv.html [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-install/?(.*)$ /container-platform/4.3/cnv/cnv_install/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-release-notes/?(.*)$ /container-platform/4.3/cnv/cnv_release_notes/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-virtual-machines/?(.*)$ /container-platform/4.3/cnv/cnv_virtual_machines/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-vm-templates/?(.*)$ /container-platform/4.3/cnv/cnv_vm_templates/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-live-migration/?(.*)$ /container-platform/4.3/cnv/cnv_live_migration/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-node-maintenance/?(.*)$ /container-platform/4.3/cnv/cnv_node_maintenance/$1 [NE,R=301]
+
+    RewriteRule ^container-platform/4\.3/cnv/cnv-logging-events-monitoring/?(.*)$ /container-platform/4.3/cnv/cnv_logging_events_monitoring/$1 [NE,R=301]
+
+    # Redirect for OSD 4.1 to OSD 4
+    RewriteRule ^dedicated/4\.1/(.*)$ /dedicated/4/$1 [NE,R=301]
+
+    # Redirect for OSD latest and version less to OSD 3 - this will change when there is no OSD 3 and go to OSD 4
+    # Use "/latest" in it's own rule to prevent any ambiguity
+    RewriteRule ^dedicated/latest/?(.*)$ /dedicated/3/$1 [NE,R=301]
+    # Use a negative lookahead to prevent matching a dedicated URL that already contains "3/" or "4/"
+    # Lookaheads are non-capturing, so they don't affect the $N numbering
+    RewriteRule ^dedicated/(?!3/|4/)(.*)$ /dedicated/3/$1 [NE,R=301]
+
+    # Welcome page redirects - could probably be reg exed better by a regex guru
+    RewriteRule ^online/?$ /online/welcome/index.html [L,R=301]
+    RewriteRule ^dedicated/(3|4)/?$ /dedicated/$1/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)/?$ /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)/?$ /container-platform/$1/welcome/index.html [L,R=301]
+
+    # Redirects for 4.1
+    RewriteRule ^container-platform/4\.1/disaster_recovery/backing-up-etcd\.html(.*)$ container-platform/4.1/backup_and_restore/backing-up-etcd.html [L,R=301]
+    RewriteRule ^container-platform/4\.1/disaster_recovery/scenario-1-infra-recovery\.html(.*)$ container-platform/4.1/backup_and_restore/disaster_recovery/scenario-1-infra-recovery.html [L,R=301]
+    RewriteRule ^container-platform/4\.1/disaster_recovery/scenario-2-restoring-cluster-state\.html(.*)$ container-platform/4.1/backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.html [L,R=301]
+    RewriteRule ^container-platform/4\.1/disaster_recovery/scenario-3-expired-certs\.html(.*)$ container-platform/4.1/backup_and_restore/disaster_recovery/scenario-3-expired-certs.html [L,R=301]
 
     # Overview page has moved to Index page
     RewriteRule ^(.*)/overview\.html(.*)$ /$1/index.html$2 [NE,L,R=301]
@@ -217,6 +285,11 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(3\.7)/install_config/upgrades\.html(.*)$ /container-platform/$1/upgrading/index.html$2 [NE,R=301]
     RewriteRule ^container-platform/(3\.7)/install_config/upgrading/(.*)$ /container-platform/$1/upgrading/$2 [NE,R=301]
     RewriteRule ^container-platform/(3\.7)/install_config/downgrade\.html /container-platform/3\.7/upgrading/downgrade.html [NE,R=301]
+    RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9)/install_config/advanced_ldap_configuration/(.*)$ /container-platform/$1/install_config/sssd_for_ldap_failover.html [L,R=301]
+
+    # OCP 4.1 redirects
+    RewriteRule ^container-platform/4\.1/installing/installing_aws_upi/installing-aws-upi\.html /container-platform/4\.1/installing/installing_aws/installing-aws-user-infra.html [NE,R=301]
+
 
   </Directory>
 </IfModule>

.travis.yml

@@ -1,27 +1,19 @@
 language: python
-python: 
- - 2.7
 
 cache: pip
 
 sudo: required
 
 before_install:
- - sudo gem install asciidoctor -v 1.5.4
- - sudo gem install asciidoctor-diagram -v 1.5.4
+ - gem install asciidoctor
+ - gem install asciidoctor-diagram
 
 install:
- - pip install pyyaml
- - pip install aura.tar.gz
+ - pip3 install pyyaml
+ - pip3 install aura.tar.gz
 
 script:
- - python build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 3 --no-upstream-fetch
- - if [ "$TRAVIS_BRANCH" == "enterprise-3.9" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.10" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.11" ]; then python build.py --distro openshift-online --product "OpenShift Container Platform" --version 3 --no-upstream-fetch; fi
- - if [ "$TRAVIS_BRANCH" == "enterprise-3.9" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.10" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.11" ]; then python build.py --distro openshift-dedicated --product "OpenShift Container Platform" --version 3 --no-upstream-fetch; fi
- - python makeBuild.py
+ - python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.7 --no-upstream-fetch && python3 makeBuild.py
 
 after_success:
- - bash autopreview.sh
-
-after_failure:
- - bash autocomment.sh
+- bash ./automerge.sh

404-commercial.html

@@ -186,7 +186,7 @@ <h1>Not found</h1>
             </div>
 
             <div class="col-sm-3">
-                <p class="text-nowrap">Copyright © 2019 Red Hat, Inc.</span></p>
+                <p class="text-nowrap">Copyright © 2021 Red Hat, Inc.</span></p>
             </div>
 
             <div class="col">