Merge pull request #39038 from pneedle-rh/osdocs-2869-removing-residual-osd-ifdefs-main

OSDOCS-2869 - Removing some of the residual OSD conditionals

Author: pneedle-rh

_unused_topics/builds-output-image-digest.adoc

@@ -8,7 +8,7 @@
 Built images can be uniquely identified by their digest, which can
 later be used to pull the image by digest regardless of its current tag.
 
-ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
+ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
 `Docker` and
 endif::[]
 `Source-to-Image (S2I)` builds store the digest in

_unused_topics/security-overview.adoc

@@ -41,7 +41,7 @@ All communication channels with the REST API, as well as between master
 components such as etcd and the API server, are secured with TLS. TLS provides
 strong encryption, data integrity, and authentication of servers with X.509
 server certificates and public key infrastructure.
-ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
+ifdef::openshift-origin,openshift-enterprise[]
 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::[]

applications/projects/configuring-project-creation.adoc

@@ -14,13 +14,6 @@ As
 a cluster administrator, you can allow and configure how developers and service
 accounts can create, or _self-provision_, their own projects.
 
-////
-ifdef::openshift-dedicated[]
-A dedicated administrator is by default an administrator for all projects on the
-cluster that are not managed by Red Hat Operations.
-endif::[]
-////
-
 include::modules/about-project-creation.adoc[leveloffset=+1]
 include::modules/modifying-template-for-new-projects.adoc[leveloffset=+1]
 include::modules/disabling-project-self-provisioning.adoc[leveloffset=+1]

authentication/bound-service-account-tokens.adoc

@@ -13,4 +13,4 @@ include::modules/bound-sa-tokens-about.adoc[leveloffset=+1]
 // Configuring bound service account tokens using volume projection
 include::modules/bound-sa-tokens-configuring.adoc[leveloffset=+1]
 
-// TODO: Verify distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
+// TODO: Verify distros: openshift-enterprise,openshift-webscale,openshift-origin

authentication/ldap-syncing.adoc

@@ -8,9 +8,6 @@ toc::[]
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
 As an administrator,
 endif::[]
-ifdef::openshift-dedicated[]
-As a xref:../authentication/understanding-and-creating-service-accounts.html#dedicated-admin-role-overview_{context}[dedicated administrator],
-endif::[]
 you can use groups to manage users, change
 their permissions, and enhance collaboration. Your organization may have already
 created user groups and stored them in an LDAP server. {product-title} can sync
@@ -29,13 +26,6 @@ You must have `cluster-admin` privileges to sync groups.
 ====
 endif::[]
 
-ifdef::openshift-dedicated[]
-[NOTE]
-====
-You must have `dedicated-admins` privileges to sync groups.
-====
-endif::[]
-
 include::modules/ldap-syncing-about.adoc[leveloffset=+1]
 include::modules/ldap-syncing-config-rfc2307.adoc[leveloffset=+2]
 include::modules/ldap-syncing-config-activedir.adoc[leveloffset=+2]

authentication/understanding-and-creating-service-accounts.adoc

@@ -7,10 +7,6 @@ toc::[]
 
 include::modules/service-accounts-overview.adoc[leveloffset=+1]
 
-include::modules/service-accounts-dedicated-admin-role.adoc[leveloffset=+1]
-
-include::modules/dedicated-admin-role-overview.adoc[leveloffset=+1]
-
 // include::modules/service-accounts-enabling-authentication.adoc[leveloffset=+1]
 
 include::modules/service-accounts-creating.adoc[leveloffset=+1]

logging/cluster-logging.adoc

@@ -24,21 +24,6 @@ Because the internal {product-title} Elasticsearch log store does not provide se
 ====
 endif::[]
 
-ifdef::openshift-dedicated[]
-As an administrator, you can deploy OpenShift Logging to
-aggregate logs for a range of {product-title} services.
-
-OpenShift Logging runs on worker nodes. As an
- administrator, you can monitor resource consumption in the
-console and via Prometheus and Grafana. Due to the high work load required for
-logging, more worker nodes may be required for your environment.
-
-Logs in {product-title} are retained for seven days before rotation. Logging
-storage is capped at 600GiB. This is independent of a cluster's allocated base
-storage.
-endif::[]
-
-
 // The following include statements pull in the module files that comprise
 // the assembly. Include any combination of concept, procedure, or reference
 // modules required to cover the user story. You can also include other

modules/cluster-logging-about-crd.adoc

@@ -13,59 +13,6 @@ The following example shows a typical custom resource for OpenShift Logging.
 
 [id="efk-logging-configuring-about-sample_{context}"]
 .Sample `ClusterLogging` custom resource (CR)
-ifdef::openshift-dedicated[]
-[source,yaml]
-----
-apiVersion: "logging.openshift.io/v1"
-kind: "ClusterLogging"
-metadata:
-  name: "instance"
-  namespace: "openshift-logging"
-spec:
-  managementState: "Managed"
-  logStore:
-    type: "elasticsearch"
-    retentionPolicy:
-      application:
-        maxAge: 1d
-      infra:
-        maxAge: 7d
-      audit:
-        maxAge: 7d
-    elasticsearch:
-      nodeCount: 3
-      storage:
-        storageClassName: "gp2"
-        size: "200Gi"
-      redundancyPolicy: "SingleRedundancy"
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-      resources:
-        limits:
-          memory: "16Gi"
-        requests:
-          memory: "16Gi"
-      proxy:
-        resources:
-          limits:
-            memory: 256Mi
-          requests:
-            memory: 256Mi
-  visualization:
-    type: "kibana"
-    kibana:
-      replicas: 1
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-  collection:
-    logs:
-      type: "fluentd"
-      fluentd: {}
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-----
-endif::[]
-
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
 [source,yaml]
 ----

modules/cluster-logging-about.adoc

@@ -20,14 +20,6 @@ other resources necessary to support OpenShift Logging. The operators are
 responsible for deploying, upgrading, and maintaining OpenShift Logging.
 endif::openshift-enterprise,openshift-webscale,openshift-origin[]
 
-ifdef::openshift-dedicated[]
-{product-title} administrators can deploy the Red Hat OpenShift Logging Operator and the
-OpenShift Elasticsearch Operator by using the {product-title} web console and can configure logging in the
-`openshift-logging` namespace. Configuring logging will deploy Elasticsearch,
-Fluentd, and Kibana in the `openshift-logging` namespace. The operators are
-responsible for deploying, upgrading, and maintaining OpenShift Logging.
-endif::openshift-dedicated[]
-
 The `ClusterLogging` CR defines a complete OpenShift Logging environment that includes all the components
 of the logging stack to collect, store and visualize logs. The Red Hat OpenShift Logging Operator watches the OpenShift Logging
 CR and adjusts the logging deployment accordingly.

modules/cluster-logging-deploy-cli.adoc

@@ -284,52 +284,6 @@ This default OpenShift Logging configuration should support a wide array of envi
 configuring OpenShift Logging components for information on modifications you can make to your OpenShift Logging cluster.
 ====
 +
-ifdef::openshift-dedicated[]
-[source,yaml]
-----
-apiVersion: "logging.openshift.io/v1"
-kind: "ClusterLogging"
-metadata:
-  name: "instance"
-  namespace: "openshift-logging"
-spec:
-  managementState: "Managed"
-  logStore:
-    type: "elasticsearch"
-    retentionPolicy:
-      application:
-        maxAge: 1d
-      infra:
-        maxAge: 7d
-      audit:
-        maxAge: 7d
-    elasticsearch:
-      nodeCount: 3
-      storage:
-        storageClassName: gp2
-        size: "200Gi"
-      redundancyPolicy: "SingleRedundancy"
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-        limits:
-          memory: "16Gi"
-        requests:
-          memory: "16Gi"
-  visualization:
-    type: "kibana"
-    kibana:
-      replicas: 1
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-  collection:
-    logs:
-      type: "fluentd"
-      fluentd: {}
-      nodeSelector:
-        node-role.kubernetes.io/worker: ""
-----
-endif::[]
-
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
 [source,yaml]
 ----