Skip to content

Commit

Permalink
Rebrand openshift.org and OpenShift Origin as okd.io and OKD
Browse files Browse the repository at this point in the history
  • Loading branch information
wgordon17 committed Aug 3, 2018
1 parent f081a0b commit 70c9f6a
Show file tree
Hide file tree
Showing 27 changed files with 115 additions and 94 deletions.
2 changes: 1 addition & 1 deletion 404-commercial.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</a>
<ul class="dropdown-menu">
<li><a target="_blank" href="https://commons.openshift.org">OpenShift Commons</a></li>
<li><a target="_blank" href="https://www.openshift.org">Open Source (Origin)</a></li>
<li><a target="_blank" href="https://www.okd.io">Open Source (OKD)</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/startups/">Startups</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/grants/">Grants</a></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion 404-community.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta charset="utf-8">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<title>404 | OpenShift Origin Documentation</title>
<title>404 | OKD Documentation</title>
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css">
<link href="latest/_stylesheets/docs.css" rel="stylesheet" />
<link href="latest/_stylesheets/search.css" rel="stylesheet" />
Expand Down
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
= OpenShift Documentation
Welcome to the OpenShift documentation GitHub repository that contains the source files for the technical documentation for the following products:

* http://origin.openshift.com/[OpenShift Origin]
* http://openshift.com/[OpenShift Online]
* http://www.redhat.com/products/cloud-computing/openshift-enterprise/[OpenShift Enterprise]
* https://www.openshift.com/dedicated/index.html[OpenShift Dedicated]
* https://www.okd.io/[OKD]
* https://www.openshift.com/products/online/[OpenShift Online]
* https://www.openshift.com/products/container-platform/[OpenShift Container Platform]
* https://www.openshift.com/products/dedicated/[OpenShift Dedicated]
All OpenShift documentation is sourced in http://www.methods.co.nz/asciidoc/[AsciiDoc] and transformed into HTML/CSS and other formats through automation that is based on http://asciidoctor.org/[AsciiDoctor].

Expand Down
6 changes: 3 additions & 3 deletions _distro_map.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
openshift-origin:
name: OpenShift Origin
author: OpenShift Documentation Project <dev@lists.openshift.redhat.com>
name: OKD
author: OKD Documentation Project <dev@lists.openshift.redhat.com>
site: community
site_name: Documentation
site_url: https://docs.openshift.org/
site_url: https://docs.okd.io/
branches:
master:
name: Latest
Expand Down
24 changes: 24 additions & 0 deletions _images/okd_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion _stylesheets/docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nav#main {
}

.navbar.navbar-default.navbar-openshift .navbar-brand.origin {
background: url("../_images/origin_logo.png") no-repeat scroll 0% 95%;
background: url("../_images/okd_logo.svg") no-repeat scroll 0% 95%;
background-size: 140px;
margin-left: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion _stylesheets/foundation.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);

/* Adapted for OpenShift Origin from the 'foundation' style sheet at */
/* Adapted for OKD from the 'foundation' style sheet at */
/* https://github.com/asciidoctor/asciidoctor-stylesheet-factory/blob/master/sass/foundation.scss */

/* normalize.css v2.1.1 | MIT License | git.io/normalize */
Expand Down
2 changes: 1 addition & 1 deletion _templates/_topnav_other.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</a>
<ul class="dropdown-menu">
<li><a target="_blank" href="https://commons.openshift.org">OpenShift Commons</a></li>
<li><a target="_blank" href="https://www.openshift.org">Open Source (Origin)</a></li>
<li><a target="_blank" href="https://www.okd.io">Open Source (OKD)</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/startups/">Startups</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/grants/">Grants</a></li>
</ul>
Expand Down
24 changes: 12 additions & 12 deletions architecture/networking/routes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -748,12 +748,12 @@ checks the list of allowed domains. However, the list of allowed domains is more
restrictive, and ensures that the router only admits routes with hosts that
belong to that list.

For example, to deny the `[{asterisk}.]open.header.test`, `[{asterisk}.]openshift.org` and
For example, to deny the `[{asterisk}.]open.header.test`, `[{asterisk}.]okd.io` and
`[{asterisk}.]block.it` routes for the `myrouter` route:

----
$ oc adm router myrouter ...
$ oc set env dc/myrouter ROUTER_DENIED_DOMAINS="open.header.test, openshift.org, block.it"
$ oc set env dc/myrouter ROUTER_DENIED_DOMAINS="open.header.test, okd.io, block.it"
----

This means that `myrouter` will admit the following based on the route's name:
Expand All @@ -771,8 +771,8 @@ $ oc expose service/<name> --hostname="open.header.test"
$ oc expose service/<name> --hostname="www.open.header.test"
$ oc expose service/<name> --hostname="block.it"
$ oc expose service/<name> --hostname="franco.baresi.block.it"
$ oc expose service/<name> --hostname="openshift.org"
$ oc expose service/<name> --hostname="api.openshift.org"
$ oc expose service/<name> --hostname="okd.io"
$ oc expose service/<name> --hostname="api.okd.io"
----

Alternatively, to block any routes where the host name is _not_ set to `[{asterisk}.]stickshift.org` or `[{asterisk}.]kates.net`:
Expand Down Expand Up @@ -805,20 +805,20 @@ To implement both scenarios, run:

----
$ oc adm router adrouter ...
$ oc env dc/adrouter ROUTER_ALLOWED_DOMAINS="openshift.org, kates.net" \
$ oc env dc/adrouter ROUTER_ALLOWED_DOMAINS="okd.io, kates.net" \
ROUTER_DENIED_DOMAINS="ops.openshift.org, metrics.kates.net"
----

This will allow any routes where the host name is set to `[{asterisk}.]openshift.org` or
This will allow any routes where the host name is set to `[{asterisk}.]okd.io` or
`[{asterisk}.]kates.net`, and not allow any routes where the host name is set to
`[{asterisk}.]ops.openshift.org` or `[{asterisk}.]metrics.kates.net`.
`[{asterisk}.]ops.okd.io` or `[{asterisk}.]metrics.kates.net`.

Therefore, the following will be denied:

----
$ oc expose service/<name> --hostname="www.open.header.test"
$ oc expose service/<name> --hostname="ops.openshift.org"
$ oc expose service/<name> --hostname="log.ops.openshift.org"
$ oc expose service/<name> --hostname="ops.okd.io"
$ oc expose service/<name> --hostname="log.ops.okd.io"
$ oc expose service/<name> --hostname="www.block.it"
$ oc expose service/<name> --hostname="metrics.kates.net"
$ oc expose service/<name> --hostname="int.metrics.kates.net"
Expand All @@ -827,9 +827,9 @@ $ oc expose service/<name> --hostname="int.metrics.kates.net"
However, the following will be allowed:

----
$ oc expose service/<name> --hostname="openshift.org"
$ oc expose service/<name> --hostname="api.openshift.org"
$ oc expose service/<name> --hostname="m.api.openshift.org"
$ oc expose service/<name> --hostname="okd.io"
$ oc expose service/<name> --hostname="api.okd.io"
$ oc expose service/<name> --hostname="m.api.okd.io"
$ oc expose service/<name> --hostname="kates.net"
$ oc expose service/<name> --hostname="api.kates.net"
----
Expand Down
6 changes: 3 additions & 3 deletions contributing_to_docs/contributing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ topic are stored.
----

== Version management
Most of the content applies to all four OpenShift products: Origin, Online, Dedicated and
Most of the content applies to all four OpenShift products: OKD, Online, Dedicated and
Enterprise (some versions of Enterprise), so approximately 80% of the content is reused. In many cases, this
means that individual topics may need to include or exclude individual
paragraphs with respect to a specific OpenShift product. While it is _possible_
Expand Down Expand Up @@ -101,7 +101,7 @@ This line will only appear for OpenShift Enterprise.
endif::[]
\ifdef::openshift-origin,openshift-enterprise[]
This line will appear for OpenShift Origin and Enterprise, but not for OpenShift Online or OpenShift Dedicated.
This line will appear for OKD and Enterprise, but not for OpenShift Online or OpenShift Dedicated.
endif::[]
----

Expand All @@ -124,7 +124,7 @@ OpenShift products. However, when and as new versions of an OpenShift product
are released, the `master` branch is merged down to new or existing release
branches. Here is the general naming scheme used in the branches:

* `master` - OpenShift Origin latest code; essentially, this is our *working*
* `master` - OKD latest code; essentially, this is our *working*
branch
* `enterprise-N.N` - OpenShift Enterprise support releases
* The `dedicated` and `online` branches are built using the enterprise version that they correspond to.
Expand Down
6 changes: 3 additions & 3 deletions contributing_to_docs/doc_guidelines.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ instead.
=== Unique IDs

The content in this repo is used to build docs that publish to multiple
locations (e.g., docs.openshift.com, docs.openshift.org, and the Red Hat
locations (e.g., docs.openshift.com, docs.okd.io, and the Red Hat
Customer Portal). While heading IDs will be created automatically from any
section titles (e.g., "Managing Authorization Policies" would generate an ID of
`managing-authorization-policies`, which would act as an anchor reference), we
Expand Down Expand Up @@ -130,7 +130,7 @@ possible values for `{product-title}` and `{product-version}`.
|Distro |`{product-title}` |`{product-version}`

|`openshift-origin`
|OpenShift Origin
|OKD
|Latest

|`openshift-enterprise`
Expand Down Expand Up @@ -162,7 +162,7 @@ would render as:

And for the `openshift-origin` distro:

"You can deploy applications on OpenShift Origin."
"You can deploy applications on OKD."

Considering that we use distinct branches to keep content for product versions
separated, global use of `{product-version}` across all branches is probably
Expand Down
2 changes: 1 addition & 1 deletion contributing_to_docs/term_glossary.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Usage: Deprecated. Use link:#node[node] instead.
Usage: node(s) as appropriate

A
http://docs.openshift.org/latest/architecture/infrastructure_components/kubernetes_infrastructure.html#node[node]
http://docs.okd.io/latest/architecture/infrastructure_components/kubernetes_infrastructure.html#node[node]
provides the runtime environments for containers.

''''
Expand Down
2 changes: 1 addition & 1 deletion contributing_to_docs/tools_and_setup.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ $ oc process -f asciibinder-template.yml -p NAME=docs \
If the build fails with "Fetch source failed" status, you can
delete all the created objects and re-run above with an HTTP uri
as the `SOURCE_REPOSITORY_URL`, or you can
link:https://docs.openshift.org/latest/dev_guide/builds/build_inputs.html#source-secrets-combinations[create a source secret]
link:https://docs.okd.io/latest/dev_guide/builds/build_inputs.html#source-secrets-combinations[create a source secret]
and add it to the stg1 build, `oc set build-secret --source bc/stg1-docs <secret name>`.
====

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ link:https://github.com/openshift/jenkins/blob/master/2/contrib/openshift/config
Docker Image] for {product-title} is an example of image promotion within
{product-title} within the constructs of Jenkins. Setup for this sample is
located in the
link:https://github.com/openshift/origin/blob/master/examples/jenkins/README.md[OpenShift Origin source repository].
link:https://github.com/openshift/origin/blob/master/examples/jenkins/README.md[OKD source repository].


This sample includes:
Expand Down
2 changes: 1 addition & 1 deletion dev_guide/dev_tutorials/openshift_pipeline.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ link:http://www.yaml.org/spec/1.2/spec.html#id2795688[YAML Literal Style],
though including a `jenkinsfile` in your source repository is the preferred
method.

The completed BuildConfig can be viewed in the OpenShift Origin repository in
The completed BuildConfig can be viewed in the OKD repository in
the examples directory,
link:https://github.com/openshift/origin/tree/master/examples/jenkins/pipeline/nodejs-sample-pipeline.yaml[`nodejs-sample-pipeline.yaml`].

Expand Down
6 changes: 3 additions & 3 deletions index-commercial.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</a>
<ul class="dropdown-menu">
<li><a target="_blank" href="https://commons.openshift.org">OpenShift Commons</a></li>
<li><a target="_blank" href="https://www.openshift.org">Open Source (Origin)</a></li>
<li><a target="_blank" href="https://www.okd.io">Open Source (OKD)</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/startups/">Startups</a></li>
<li><a target="_blank" href="https://www.openshift.com/community/programs/grants/">Grants</a></li>
</ul>
Expand Down Expand Up @@ -227,10 +227,10 @@ <h2>OpenShift Dedicated</h2>
</div>
</div>
<div class="col-sm-3 text-center">
<h2>OpenShift Origin</h2>
<h2>OKD</h2>
<div class="list-group">
<p class="list-group-item-text">OpenShift's open source, upstream project.</p>
<p><a role="button" class="btn btn-default" href="https://docs.openshift.org/" target="_blank"><i class="fa fa-external-link"></i> Origin Documentation</a></p>
<p><a role="button" class="btn btn-default" href="https://docs.okd.io/" target="_blank"><i class="fa fa-external-link"></i> OKD Documentation</a></p>
</div>
</div>
</div>
Expand Down
29 changes: 14 additions & 15 deletions index-community.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="google-site-verification" content="9jyGvNki3NSELTYJ7t_XbF-YQZ8jjfm7LqQQGNq4SSg">
<title>Home | OpenShift Origin Documentation</title>
<link href="https://docs.openshift.org/" rel="canonical">
<title>Home | OKD Documentation</title>
<link href="https://docs.okd.io/" rel="canonical">
<link href="https://assets.openshift.net/content/subdomain/touch-icon-precomposed.png" rel="apple-touch-icon-precomposed" type="image/png">
<link href="https://assets.openshift.net/content/subdomain/favicon32x32.png" rel="shortcut icon" type="image/png">
<!--[if IE]><link rel="shortcut icon" href="https://assets.openshift.net/content/subdomain/favicon.ico"><![endif]-->
Expand Down Expand Up @@ -41,31 +41,30 @@

<div class="masthead clearfix">
<div class="inner">
<a href="http://www.openshift.org"><img class="masthead-brand" src="_images/origin_logo.png" alt="OpenShift Logo" /></a>
<a href="http://www.okd.io"><img class="masthead-brand" src="_images/okd_logo.svg" alt="OpenShift Logo" style="width: 256px;" /></a>
<nav>
<ul class="nav masthead-nav">
<li><a href="https://www.openshift.org">Origin Home</a></li>
<li><a href="https://www.openshift.org/#contribute">Contribute</a></li>
<li><a href="https://www.okd.io">OKD Home</a></li>
<li><a href="https://www.okd.io/#contribute">Contribute</a></li>
</ul>
</nav>
</div>
</div>

<div class="inner cover">
<h1 class="cover-heading">Documentation</h1>
<p class="lead"><strong>OpenShift Origin</strong> is an application platform where developers and teams can build, test, deploy, and run their applications. OpenShift Origin also serves as the upstream code base upon which <a href="http://www.openshift.com">OpenShift Online</a> and <a href="https://www.openshift.com/container-platform/">OpenShift Container Platform</a> are built.</p>
<p class="lead"><strong>OKD</strong> is a distribution of Kubernetes optimized for continuous application development and multi-tenant deployment. OKD also serves as the upstream code base upon which <a href="http://www.openshift.com">Red Hat OpenShift Online</a> and <a href="https://www.openshift.com/container-platform/">Red Hat OpenShift Container Platform</a> are built.</p>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<li><a href="latest/"><i class="fa fa-arrow-circle-o-right"></i> Origin Latest</a></li>
<li><a href="3.10/"><i class="fa fa-arrow-circle-o-right"></i> Origin 3.10</a></li>
<li><a href="3.9/"><i class="fa fa-arrow-circle-o-right"></i> Origin 3.9</a></li>
<li><a href="3.7/"><i class="fa fa-arrow-circle-o-right"></i> Origin 3.7</a></li>
<li><a href="3.6/"><i class="fa fa-arrow-circle-o-right"></i> Origin 3.6</a></li>
<li><a href="1.5/"><i class="fa fa-arrow-circle-o-right"></i> Origin 1.5</a></li>
<li><a href="1.4/"><i class="fa fa-arrow-circle-o-right"></i> Origin 1.4</a></li>
<li><a href="1.3/"><i class="fa fa-arrow-circle-o-right"></i> Origin 1.3</a></li>
<li><a href="1.2/"><i class="fa fa-arrow-circle-o-right"></i> Origin 1.2</a></li>
<li><a href="latest/"><i class="fa fa-arrow-circle-o-right"></i> OKD Latest</a></li>
<li><a href="3.9/"><i class="fa fa-arrow-circle-o-right"></i> OKD 3.9</a></li>
<li><a href="3.7/"><i class="fa fa-arrow-circle-o-right"></i> OKD 3.7</a></li>
<li><a href="3.6/"><i class="fa fa-arrow-circle-o-right"></i> OKD 3.6</a></li>
<li><a href="1.5/"><i class="fa fa-arrow-circle-o-right"></i> OKD 1.5</a></li>
<li><a href="1.4/"><i class="fa fa-arrow-circle-o-right"></i> OKD 1.4</a></li>
<li><a href="1.3/"><i class="fa fa-arrow-circle-o-right"></i> OKD 1.3</a></li>
<li><a href="1.2/"><i class="fa fa-arrow-circle-o-right"></i> OKD 1.2</a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion install_config/cfme/container_provider.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ into your {mgmt-app} deployment, this role includes a script which allows you
to add multiple container platforms as container providers in any arbitrary
{mgmt-app} server. The container platforms can be {product-title} or
ifdef::openshift-enterprise[]
OpenShift Origin.
OKD.
endif::[]
ifdef::openshift-origin[]
OpenShift Container Platform.
Expand Down
Loading

0 comments on commit 70c9f6a

Please sign in to comment.