Merge pull request #37293 from vikram-redhat/main

Fixes some OKD issues

Author: vikram-redhat

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

@@ -129,7 +129,7 @@ AddType text/vtt                            vtt
     RewriteRule ^latest/minishift/?(.*)$ /3.11/minishift/$1 [NE,R=301]
 
     # Redirects for "latest" version
-    RewriteRule ^(origin-m4|4)/?(.*)$ /latest/$2 [R=301]
+    RewriteRule ^(origin-m4)/?(.*)$ /latest/$2 [R=301]
 
     # Welcome page redirects
     RewriteRule ^(latest|[0-9.]+)/?$ /$1/welcome/index.html [L,R=301]

_templates/_page_openshift.html.erb

@@ -141,7 +141,7 @@
           </div>
         <% end %>
         <%
-           if (unsupported_versions.include? version)
+           if ((unsupported_versions.include? version) && (distro_key == "openshift-enterprise"))
         %>
           <font size="+1" color="red">You are viewing documentation for a release that is no longer supported. The latest supported version of version 3 is <a href="https://docs.openshift.com/container-platform/3.11/welcome/index.html">[3.11]</a>. For the most recent version 4, see <a href="https://docs.openshift.com/container-platform/latest/welcome/index.html">[4]</a></font>
           <div id="annoying-box"