Skip to content

Commit 56ed861

Browse files
authored
Merge pull request #72755 from mburke5678/revert-72193-winc-415-redirect
Revert 'WINC add redirect for 4.15 -- WMCO 10.15.0'
2 parents 09f32ea + db852f7 commit 56ed861

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ AddType text/vtt vtt
448448
# 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.
449449
# When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page.
450450
# To activate the redirects, uncomment the next line and update the version number to the pending release.
451-
RewriteRule container-platform/4\.15/windows_containers/(?!index\.html)(.+)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
452-
RewriteRule ^container-platform/4\.15/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
451+
# RewriteRule container-platform/4\.15/windows_containers/(?!index\.html)(.+)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
452+
# RewriteRule ^container-platform/4\.15/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /container-platform/4.15/windows_containers/index.html [NE,R=302]
453453

454454
# Serverless Redirects
455455
RewriteRule container-platform/(4\.5|4\.6)/serverless/knative_eventing/(serverless-subscriptions\.html|serverless-channels\.html|serverless-subscriptions\.html) /container-platform/$1/serverless/event_workflows/serverless-channels.html [NE,R=301]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ AddType text/vtt vtt
171171
# 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.
172172
# When uncommented, this redirects all `windows_containers` directory traffic to the /windows_containers/index.html page.
173173
# To activate the redirects, uncomment the next line and update the version number to the pending release.
174-
RewriteRule ^(latest|4\.15)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
175-
RewriteRule ^(latest|4\.15)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
174+
# RewriteRule ^(latest|4\.15)/windows_containers/(?!index\.html)(.+)$ /$1/windows_containers/index.html [NE,R=302]
175+
# RewriteRule ^(latest|4\.15)/support/troubleshooting/troubleshooting-windows-container-workload-issues\.html(.*)$ /$1/windows_containers/index.html [NE,R=302]
176176

177177
</Directory>
178178
</IfModule>

windows_containers/index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Documentation for {productwinc} will be available for {product-title} {product-version} in the near future.
10-
11-
////
129
{productwinc} is a feature providing the ability to run Windows compute nodes in an {product-title} cluster. This is possible by using the Red Hat Windows Machine Config Operator (WMCO) to install and manage Windows nodes. With a Red Hat subscription, you can get support for running Windows workloads in {product-title}. Windows instances deployed by the WMCO are configured with the containerd container runtime. For more information, see the xref:../windows_containers/windows-containers-release-notes-6-x.adoc#windows-containers-release-notes-6-x[release notes].
1310

1411
You can add Windows nodes either by creating a xref:../windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.adoc#creating-windows-machineset-aws[compute machine set] or by specifying existing Bring-Your-Own-Host (BYOH) Window instances through a xref:../windows_containers/byoh-windows-instance.adoc#byoh-windows-instance[configuration map].
@@ -36,4 +33,7 @@ You can xref:../windows_containers/disabling-windows-container-workloads.adoc#di
3633

3734
* Uninstalling the Windows Machine Config Operator
3835
* Deleting the Windows Machine Config Operator namespace
36+
37+
////
38+
Documentation for {productwinc} will be available for {product-title} {product-version} in the near future.
3939
////

0 commit comments

Comments
 (0)