Skip to content

Commit

Permalink
remove atomic-registry docs
Browse files Browse the repository at this point in the history
Signed-off-by: Aaron Weitekamp <aweiteka@redhat.com>
  • Loading branch information
aweiteka authored and kalexand-rh committed May 14, 2018
1 parent 1f8af69 commit 028fed5
Show file tree
Hide file tree
Showing 31 changed files with 27 additions and 1,093 deletions.
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def setPreviewStatus = { String url, String message, String state, String host,
setBuildStatus(url, "ci/app-preview/enterprise", message, state, includeLink ? "http://${host}/openshift-enterprise/master/welcome/index.html" : "")
setBuildStatus(url, "ci/app-preview/online", message, state, includeLink ? "http://${host}/openshift-online/master/welcome/index.html" : "")
setBuildStatus(url, "ci/app-preview/dedicated", message, state, includeLink ? "http://${host}/openshift-dedicated/master/welcome/index.html" : "")
setBuildStatus(url, "ci/app-preview/registry", message, state, includeLink ? "http://${host}/atomic-registry/latest/registry_quickstart/index.html" : "")
}

try { // Use a try block to perform cleanup in a finally block when the build fails
Expand Down
1 change: 0 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Welcome to the OpenShift documentation GitHub repository that contains the sourc
* 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]
* http://docs.projectatomic.io/registry[Atomic Registry]
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
10 changes: 0 additions & 10 deletions _distro_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,3 @@ openshift-dedicated:
enterprise-3.7:
name: 'Latest'
dir: dedicated
atomic-registry:
name: Atomic Registry
author: Project Atomic <atomic@projectatomic.io>
site: atomic-registry
site_name: Atomic Registry Documentation
site_url: https://projectatomic.io/registry
branches:
master:
name: 'Latest'
dir: latest
63 changes: 0 additions & 63 deletions _templates/_page_atomic.html.erb

This file was deleted.

20 changes: 1 addition & 19 deletions _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,6 @@ Topics:
File: revhistory_getting_started
Distros: openshift-enterprise,openshift-dedicated
---
Name: Quickstart
Dir: registry_quickstart
Distros: atomic-registry
Topics:
- Name: Overview
File: index
- Name: Developers
File: developers
- Name: Administrators
Dir: administrators
Topics:
- Name: Overview
File: index
- Name: System Configuration
File: system_configuration
- Name: Uninstall
File: uninstall
---
Name: Architecture
Dir: architecture
Topics:
Expand Down Expand Up @@ -359,7 +341,7 @@ Topics:
File: syncing_groups_with_ldap
- Name: Advanced LDAP Configuration
Dir: advanced_ldap_configuration
Distros: openshift-origin,openshift-enterprise,atomic-registry
Distros: openshift-origin,openshift-enterprise
Topics:
- Name: Overview
File: index
Expand Down
13 changes: 5 additions & 8 deletions admin_guide/manage_rbac.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ resources] and the administrator CLI to manage the
xref:../architecture/additional_concepts/authorization.adoc#architecture-additional-concepts-authorization[roles
and bindings].

ifdef::atomic-registry[]
The web console also provides management of RBAC resources.
endif::[]
ifdef::openshift-dedicated[]
Dedicated administrators can view but not manage cluster roles. They can manage cluster role bindings
and manage local roles and bindings.
Expand All @@ -47,7 +44,7 @@ xref:../architecture/additional_concepts/authorization.adoc#roles[default cluste
bound locally can manage roles and bindings in that project.
endif::[]

ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]
Users with the *cluster-admin*
xref:../architecture/additional_concepts/authorization.adoc#roles[default cluster role]
bound cluster-wide can perform any action on any resource. Users with the
Expand All @@ -64,7 +61,7 @@ Authorization] section.

[[viewing-cluster-roles]]
=== Viewing Cluster Roles
ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]
To view the cluster roles and their associated rule sets:

----
Expand Down Expand Up @@ -288,7 +285,7 @@ groups that are bound to various roles:
$ oc describe clusterrolebinding.rbac
----

ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]
[[viewing-cluster-bindings]]
.Viewing Cluster Role Bindings
[options="nowrap"]
Expand Down Expand Up @@ -619,7 +616,7 @@ not specified, then the current project is used.

|===

ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]

You can also manage cluster role bindings using the following
operations. The `-n` flag is not used for these operations because
Expand Down Expand Up @@ -711,7 +708,7 @@ Subjects:
<1> The *alice* user has been added to the *admins* `*RoleBinding*`.


ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]
[[creating-local-role]]
== Creating a Local Role

Expand Down
8 changes: 0 additions & 8 deletions admin_guide/service_accounts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,6 @@ serviceaccount "robot" created
----
endif::[]

ifdef::atomic-registry[]
[[managing-service-account-credentials]]
== Managing Service Account Credentials
endif::[]

As soon as a service account is created, two secrets are automatically added to
it:

Expand All @@ -150,9 +145,6 @@ it:
ifdef::openshift-enterprise,openshift-origin,openshift-online,openshift-dedicated[]
OpenShift Container Registry
endif::[]
ifdef::atomic-registry[]
internal registry
endif::[]

These can be seen by describing the service account:

Expand Down
32 changes: 0 additions & 32 deletions architecture/additional_concepts/authorization.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -389,38 +389,6 @@ project. They cannot view or modify roles or bindings.
|===
endif::openshift-origin,openshift-enterprise,openshift-dedicated[]

ifdef::atomic-registry[]
[cols="1,4",options="header"]
|===

|Default Cluster Role |Description

|*registry-admin* |A registry project manager. If used in a
xref:cluster-and-local-rbac[local binding], a *registry-admin* user will have
rights to view any resource in the project and modify any resource in the
project except for role creation and quota.

|*registry-editor* |A user that can modify most objects in a project, but does not have the
power to view or modify roles or bindings.

|*registry-viewer* |A user who cannot make any modifications, but can see most objects in a
project, including basic information about projects and users. They
cannot view or modify roles or bindings.

|*basic-user* |A user that can get basic information about projects and users.

|*self-provisioner* |A user that can create their own projects.

|*cluster-admin* |A super-user that can perform any action in any project. When
bound to a user with a xref:cluster-and-local-rbac[local binding], they have
xref:../../admin_guide/manage_rbac.adoc#cluster-and-local-role-bindings[full control]
over quota and every action on every resource in the project.

|*cluster-status* |A user that can get basic cluster status information.

|===
endif::[]

ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
TIP: Remember that xref:authentication.adoc#users-and-groups[users
and groups] can be associated with, or _bound_ to, multiple roles at the same
Expand Down
19 changes: 1 addition & 18 deletions architecture/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,6 @@ in all aspects of the model. The concept of an application as a separate object
is removed in favor of more flexible composition of "services", allowing two web
containers to reuse a database or expose a database directly to the edge of the
network.
endif::[]
ifdef::atomic-registry[]
{product-title} is based on OpenShift technology which features an
embedded registry based on the upstream
link:https://github.com/docker/distribution[Docker Distribution,
role="external", window="_blank"] library. {product-title} provides the
following capabilities:

* A user-focused xref:infrastructure_components/web_console.adoc#architecture-infrastructure-components-web-console[web console].
* Global xref:additional_concepts/authentication.adoc#architecture-additional-concepts-authentication[identity provider authentication].
* A xref:core_concepts/projects_and_users.adoc#architecture-core-concepts-projects-and-users[project namespace] model to
enable teams to collaborate through xref:additional_concepts/authorization.adoc#architecture-additional-concepts-authorization[role-based access control (RBAC)]
authorization.
* A xref:infrastructure_components/kubernetes_infrastructure.adoc#architecture-infrastructure-components-kubernetes-infrastructure[Kubernetes-based cluster]
to manage services.
* An image abstraction called xref:core_concepts/builds_and_image_streams.adoc#architecture-core-concepts-builds-and-image-streams[image streams] to enhance image management.

endif::[]
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]

Expand Down Expand Up @@ -163,7 +146,7 @@ By default, a new internal PKI is created for each deployment of
{product-title}. The internal PKI uses 2048 bit RSA keys and SHA-256 signatures.
endif::[]
ifdef::openshift-origin,openshift-enterprise[]
xref:../install_config/certificate_customization.adoc#install-config-certificate-customization[Custom certificates] for public hosts are supported as well.
xref:../install_config/certificate_customization.adoc#install-config-certificate-customization[Custom certificates] for public hosts are supported as well.
endif::[]

{product-title} uses Golang’s standard library implementation of
Expand Down
17 changes: 0 additions & 17 deletions architecture/infrastructure_components/image_registry.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
:toc-title:
:linkattrs:

ifndef::atomic-registry[]
toc::[]

== Overview
Expand Down Expand Up @@ -55,19 +54,3 @@ repositories using credentials supplied by the user. This allows {product-title}
to push and pull images to and from private repositories. The
xref:../additional_concepts/authentication.adoc#architecture-additional-concepts-authentication[Authentication] topic has more
information.

endif::[]

ifdef::atomic-registry[]

{product-title} embeds the upstream link:https://github.com/docker/distribution[Docker Distribution, role="external", window="_blank"]
library to maintain image format compatibility with the Docker service. New image
repositories may be created on the fly. Whenever a new image is pushed to the
integrated registry, the registry notifies {product-title} API about the new
image, passing along all the information about it, such as the namespace, name,
and image metadata.

{product-title} can reference images from external, third-party registries. During
import {product-title} will fetch tags from the remote registry and watch the
remote image tag for changes.
endif::[]
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@ ifdef::openshift-origin,openshift-online,openshift-dedicated,openshift-enterpris
toc::[]
endif::[]

ifdef::atomic-registry[]
[NOTE]
====
{product-title} is based on OpenShift and Kubernetes. The typical {product-title}
deployment is much simpler than a deployment of OpenShift. The following
is provided as a reference, particularly for understanding requirements for a
highly available deployment.
====
endif::[]

ifdef::openshift-origin,openshift-online,openshift-dedicated,openshift-enterprise[]
== Overview
Within {product-title}, Kubernetes manages containerized applications across a
Expand Down
6 changes: 0 additions & 6 deletions architecture/infrastructure_components/web_console.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,3 @@ image::3.9-statefulset.png[StatefulSets view in OpenShift]
endif::openshift-enterprise,openshift-online[]

endif::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]

ifdef::atomic-registry[]
The web console is based on the link:http://cockpit-project.org/[Cockpit
Project]. It is deployed as a service using an {product-title} template. The web
console is an optional component.
endif::atomic-registry[]
2 changes: 1 addition & 1 deletion cli_reference/admin_cli_operations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ $ oc adm prune
----
endif::[]

ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
ifdef::openshift-enterprise,openshift-origin[]
[[settings-cli-operations]]

== Settings CLI Operations
Expand Down
Loading

0 comments on commit 028fed5

Please sign in to comment.