Skip to content

Commit 028fed5

Browse files
aweitekakalexand-rh
authored andcommitted
remove atomic-registry docs
Signed-off-by: Aaron Weitekamp <[email protected]>
1 parent 1f8af69 commit 028fed5

31 files changed

+27
-1093
lines changed

Jenkinsfile

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def setPreviewStatus = { String url, String message, String state, String host,
4747
setBuildStatus(url, "ci/app-preview/enterprise", message, state, includeLink ? "http://${host}/openshift-enterprise/master/welcome/index.html" : "")
4848
setBuildStatus(url, "ci/app-preview/online", message, state, includeLink ? "http://${host}/openshift-online/master/welcome/index.html" : "")
4949
setBuildStatus(url, "ci/app-preview/dedicated", message, state, includeLink ? "http://${host}/openshift-dedicated/master/welcome/index.html" : "")
50-
setBuildStatus(url, "ci/app-preview/registry", message, state, includeLink ? "http://${host}/atomic-registry/latest/registry_quickstart/index.html" : "")
5150
}
5251

5352
try { // Use a try block to perform cleanup in a finally block when the build fails

README.adoc

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Welcome to the OpenShift documentation GitHub repository that contains the sourc
55
* http://openshift.com/[OpenShift Online]
66
* http://www.redhat.com/products/cloud-computing/openshift-enterprise/[OpenShift Enterprise]
77
* https://www.openshift.com/dedicated/index.html[OpenShift Dedicated]
8-
* http://docs.projectatomic.io/registry[Atomic Registry]
98
109
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].
1110

_distro_map.yml

-10
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,3 @@ openshift-dedicated:
9090
enterprise-3.7:
9191
name: 'Latest'
9292
dir: dedicated
93-
atomic-registry:
94-
name: Atomic Registry
95-
author: Project Atomic <[email protected]>
96-
site: atomic-registry
97-
site_name: Atomic Registry Documentation
98-
site_url: https://projectatomic.io/registry
99-
branches:
100-
master:
101-
name: 'Latest'
102-
dir: latest

_templates/_page_atomic.html.erb

-63
This file was deleted.

_topic_map.yml

+1-19
Original file line numberDiff line numberDiff line change
@@ -118,24 +118,6 @@ Topics:
118118
File: revhistory_getting_started
119119
Distros: openshift-enterprise,openshift-dedicated
120120
---
121-
Name: Quickstart
122-
Dir: registry_quickstart
123-
Distros: atomic-registry
124-
Topics:
125-
- Name: Overview
126-
File: index
127-
- Name: Developers
128-
File: developers
129-
- Name: Administrators
130-
Dir: administrators
131-
Topics:
132-
- Name: Overview
133-
File: index
134-
- Name: System Configuration
135-
File: system_configuration
136-
- Name: Uninstall
137-
File: uninstall
138-
---
139121
Name: Architecture
140122
Dir: architecture
141123
Topics:
@@ -359,7 +341,7 @@ Topics:
359341
File: syncing_groups_with_ldap
360342
- Name: Advanced LDAP Configuration
361343
Dir: advanced_ldap_configuration
362-
Distros: openshift-origin,openshift-enterprise,atomic-registry
344+
Distros: openshift-origin,openshift-enterprise
363345
Topics:
364346
- Name: Overview
365347
File: index

admin_guide/manage_rbac.adoc

+5-8
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ resources] and the administrator CLI to manage the
1919
xref:../architecture/additional_concepts/authorization.adoc#architecture-additional-concepts-authorization[roles
2020
and bindings].
2121

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

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

6562
[[viewing-cluster-roles]]
6663
=== Viewing Cluster Roles
67-
ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
64+
ifdef::openshift-enterprise,openshift-origin[]
6865
To view the cluster roles and their associated rule sets:
6966

7067
----
@@ -288,7 +285,7 @@ groups that are bound to various roles:
288285
$ oc describe clusterrolebinding.rbac
289286
----
290287

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

620617
|===
621618

622-
ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
619+
ifdef::openshift-enterprise,openshift-origin[]
623620

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

713710

714-
ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
711+
ifdef::openshift-enterprise,openshift-origin[]
715712
[[creating-local-role]]
716713
== Creating a Local Role
717714

admin_guide/service_accounts.adoc

-8
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@ serviceaccount "robot" created
137137
----
138138
endif::[]
139139

140-
ifdef::atomic-registry[]
141-
[[managing-service-account-credentials]]
142-
== Managing Service Account Credentials
143-
endif::[]
144-
145140
As soon as a service account is created, two secrets are automatically added to
146141
it:
147142

@@ -150,9 +145,6 @@ it:
150145
ifdef::openshift-enterprise,openshift-origin,openshift-online,openshift-dedicated[]
151146
OpenShift Container Registry
152147
endif::[]
153-
ifdef::atomic-registry[]
154-
internal registry
155-
endif::[]
156148

157149
These can be seen by describing the service account:
158150

architecture/additional_concepts/authorization.adoc

-32
Original file line numberDiff line numberDiff line change
@@ -389,38 +389,6 @@ project. They cannot view or modify roles or bindings.
389389
|===
390390
endif::openshift-origin,openshift-enterprise,openshift-dedicated[]
391391

392-
ifdef::atomic-registry[]
393-
[cols="1,4",options="header"]
394-
|===
395-
396-
|Default Cluster Role |Description
397-
398-
|*registry-admin* |A registry project manager. If used in a
399-
xref:cluster-and-local-rbac[local binding], a *registry-admin* user will have
400-
rights to view any resource in the project and modify any resource in the
401-
project except for role creation and quota.
402-
403-
|*registry-editor* |A user that can modify most objects in a project, but does not have the
404-
power to view or modify roles or bindings.
405-
406-
|*registry-viewer* |A user who cannot make any modifications, but can see most objects in a
407-
project, including basic information about projects and users. They
408-
cannot view or modify roles or bindings.
409-
410-
|*basic-user* |A user that can get basic information about projects and users.
411-
412-
|*self-provisioner* |A user that can create their own projects.
413-
414-
|*cluster-admin* |A super-user that can perform any action in any project. When
415-
bound to a user with a xref:cluster-and-local-rbac[local binding], they have
416-
xref:../../admin_guide/manage_rbac.adoc#cluster-and-local-role-bindings[full control]
417-
over quota and every action on every resource in the project.
418-
419-
|*cluster-status* |A user that can get basic cluster status information.
420-
421-
|===
422-
endif::[]
423-
424392
ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
425393
TIP: Remember that xref:authentication.adoc#users-and-groups[users
426394
and groups] can be associated with, or _bound_ to, multiple roles at the same

architecture/index.adoc

+1-18
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,6 @@ in all aspects of the model. The concept of an application as a separate object
1818
is removed in favor of more flexible composition of "services", allowing two web
1919
containers to reuse a database or expose a database directly to the edge of the
2020
network.
21-
endif::[]
22-
ifdef::atomic-registry[]
23-
{product-title} is based on OpenShift technology which features an
24-
embedded registry based on the upstream
25-
link:https://github.com/docker/distribution[Docker Distribution,
26-
role="external", window="_blank"] library. {product-title} provides the
27-
following capabilities:
28-
29-
* A user-focused xref:infrastructure_components/web_console.adoc#architecture-infrastructure-components-web-console[web console].
30-
* Global xref:additional_concepts/authentication.adoc#architecture-additional-concepts-authentication[identity provider authentication].
31-
* A xref:core_concepts/projects_and_users.adoc#architecture-core-concepts-projects-and-users[project namespace] model to
32-
enable teams to collaborate through xref:additional_concepts/authorization.adoc#architecture-additional-concepts-authorization[role-based access control (RBAC)]
33-
authorization.
34-
* A xref:infrastructure_components/kubernetes_infrastructure.adoc#architecture-infrastructure-components-kubernetes-infrastructure[Kubernetes-based cluster]
35-
to manage services.
36-
* 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.
37-
3821
endif::[]
3922
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
4023

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

169152
{product-title} uses Golang’s standard library implementation of

architecture/infrastructure_components/image_registry.adoc

-17
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
:toc-title:
1010
:linkattrs:
1111

12-
ifndef::atomic-registry[]
1312
toc::[]
1413

1514
== Overview
@@ -55,19 +54,3 @@ repositories using credentials supplied by the user. This allows {product-title}
5554
to push and pull images to and from private repositories. The
5655
xref:../additional_concepts/authentication.adoc#architecture-additional-concepts-authentication[Authentication] topic has more
5756
information.
58-
59-
endif::[]
60-
61-
ifdef::atomic-registry[]
62-
63-
{product-title} embeds the upstream link:https://github.com/docker/distribution[Docker Distribution, role="external", window="_blank"]
64-
library to maintain image format compatibility with the Docker service. New image
65-
repositories may be created on the fly. Whenever a new image is pushed to the
66-
integrated registry, the registry notifies {product-title} API about the new
67-
image, passing along all the information about it, such as the namespace, name,
68-
and image metadata.
69-
70-
{product-title} can reference images from external, third-party registries. During
71-
import {product-title} will fetch tags from the remote registry and watch the
72-
remote image tag for changes.
73-
endif::[]

architecture/infrastructure_components/kubernetes_infrastructure.adoc

-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ ifdef::openshift-origin,openshift-online,openshift-dedicated,openshift-enterpris
1212
toc::[]
1313
endif::[]
1414

15-
ifdef::atomic-registry[]
16-
[NOTE]
17-
====
18-
{product-title} is based on OpenShift and Kubernetes. The typical {product-title}
19-
deployment is much simpler than a deployment of OpenShift. The following
20-
is provided as a reference, particularly for understanding requirements for a
21-
highly available deployment.
22-
====
23-
endif::[]
24-
2515
ifdef::openshift-origin,openshift-online,openshift-dedicated,openshift-enterprise[]
2616
== Overview
2717
Within {product-title}, Kubernetes manages containerized applications across a

architecture/infrastructure_components/web_console.adoc

-6
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,3 @@ image::3.9-statefulset.png[StatefulSets view in OpenShift]
193193
endif::openshift-enterprise,openshift-online[]
194194

195195
endif::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
196-
197-
ifdef::atomic-registry[]
198-
The web console is based on the link:http://cockpit-project.org/[Cockpit
199-
Project]. It is deployed as a service using an {product-title} template. The web
200-
console is an optional component.
201-
endif::atomic-registry[]

cli_reference/admin_cli_operations.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ $ oc adm prune
134134
----
135135
endif::[]
136136

137-
ifdef::openshift-enterprise,openshift-origin,atomic-registry[]
137+
ifdef::openshift-enterprise,openshift-origin[]
138138
[[settings-cli-operations]]
139139

140140
== Settings CLI Operations

0 commit comments

Comments
 (0)