openshift/openshift-docs
1
0
Fork 0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 12:46:18 +01:00
Code Issues Releases Activity

included webscale distro

Browse Source
This commit is contained in:
Vikram Goyal
2020-03-01 07:27:57 +10:00
parent eeffc90be6
commit 01fdefe239
90 changed files with 284 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_snippets/glusterfs.adoc
View File

@@ -17,7 +17,7 @@ How to use this file:
:gluster-install-link: https://docs.gluster.org/en/latest/Install-Guide/Overview/
:gluster-admin-link: https://docs.gluster.org/en/latest/Administrator%20Guide/overview/
:gluster-role-link: https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_storage_glusterfs
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
:gluster: Red Hat Gluster Storage
:gluster-native: Container-Native Storage
:gluster-external: Container-Ready Storage

274
_topic_map.yml
View File

@@ -24,13 +24,13 @@
---
Name: Welcome
Dir: welcome
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Welcome
File: index
- Name: About OpenShift Container Engine
File: oce_about
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
- Name: Legal notice
File: legal-notice
---
@@ -49,7 +49,7 @@ Topics:
---
Name: Release notes
Dir: release_notes
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: OpenShift Container Platform 4.4 release notes
File: ocp-4-4-release-notes
@@ -58,21 +58,21 @@ Topics:
---
Name: Architecture
Dir: architecture
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Product architecture
File: architecture
- Name: Installation and update
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
File: architecture-installation
- Name: The control plane
File: control-plane
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
- Name: Understanding OpenShift development
File: understanding-development
- Name: Red Hat Enterprise Linux CoreOS
File: architecture-rhcos
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Administering a cluster
Dir: administering_a_cluster
@@ -83,7 +83,7 @@ Topics:
---
Name: Installing
Dir: installing
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Installing on AWS
Dir: installing_aws
@@ -195,16 +195,16 @@ Topics:
File: installing-restricted-networks-preparations
- Name: Available cluster customizations
File: customizations
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring your firewall
File: configuring-firewall
- Name: Configuring a private cluster
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
File: configuring-private-cluster
---
Name: Updating clusters
Dir: updating
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Updating a cluster between minor versions
File: updating-cluster-between-minor
@@ -221,16 +221,16 @@ Topics:
---
Name: Support
Dir: support
Distros: openshift-enterprise,openshift-online,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-online,openshift-dedicated
Topics:
- Name: Getting support
File: getting-support
- Name: Gathering data about your cluster
File: gathering-cluster-data
Distros: openshift-enterprise,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-dedicated
- Name: Remote health monitoring with connected clusters
Dir: remote_health_monitoring
Distros: openshift-enterprise,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-dedicated
Topics:
- Name: About remote health monitoring
File: about-remote-health-monitoring
@@ -241,71 +241,71 @@ Topics:
---
Name: Web console
Dir: web_console
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Accessing the web console
File: web-console
- Name: Viewing cluster information
File: using-dashboard-to-get-cluster-information
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring the web console
File: configuring-web-console
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Customizing the web console
File: customizing-the-web-console
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Developer perspective
File: odc-about-developer-perspective
- Name: Disabling the web console
File: disabling-web-console
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Authentication
Dir: authentication
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
Topics:
- Name: Understanding authentication
File: understanding-authentication
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
- Name: Understanding identity provider configuration
File: dedicated-understanding-authentication
Distros: openshift-dedicated
- Name: Configuring the internal OAuth server
File: configuring-internal-oauth
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Understanding identity provider configuration
File: understanding-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring identity providers
Dir: identity_providers
Topics:
- Name: Configuring an HTPasswd identity provider
File: configuring-htpasswd-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring a Keystone identity provider
File: configuring-keystone-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring an LDAP identity provider
File: configuring-ldap-identity-provider
- Name: Configuring a basic authentication identity provider
File: configuring-basic-authentication-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring a request header identity provider
File: configuring-request-header-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring a GitHub or GitHub Enterprise identity provider
File: configuring-github-identity-provider
- Name: Configuring a GitLab identity provider
File: configuring-gitlab-identity-provider
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring a Google identity provider
File: configuring-google-identity-provider
- Name: Configuring an OpenID Connect identity provider
File: configuring-oidc-identity-provider
- Name: Configuring certificates
Dir: certificates
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Replacing the default ingress certificate
File: replacing-default-ingress-certificate
@@ -317,12 +317,12 @@ Topics:
File: using-rbac
- Name: Removing the kubeadmin user
File: remove-kubeadmin
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
#- Name: Configuring LDAP failover
# File: configuring-ldap-failover
- Name: Configuring the user agent
File: configuring-user-agent
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Understanding and creating service accounts
File: understanding-and-creating-service-accounts
- Name: Using service accounts in applications
@@ -333,23 +333,23 @@ Topics:
File: tokens-scoping
- Name: Managing Security Context Constraints
File: managing-security-context-constraints
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Impersonating the system:admin user
File: impersonating-system-admin
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Syncing LDAP groups
File: ldap-syncing
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Allowing JavaScript-based access to the API server from additional hosts
File: allowing-javascript-access-api-server
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Encrypting etcd data
File: encrypting-etcd
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Networking
Dir: networking
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
Topics:
- Name: Understanding networking
File: understanding-networking
@@ -357,18 +357,18 @@ Topics:
File: accessing-hosts
- Name: Understanding the Cluster Network Operator
File: cluster-network-operator
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Understanding the DNS Operator
File: dns-operator
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Understanding the Ingress Operator
File: ingress-operator
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring network policy
File: configuring-networkpolicy
- Name: Multiple networks
Dir: multiple_networks
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Understanding multiple networks
File: understanding-multiple-networks
@@ -399,7 +399,7 @@ Topics:
File: about-openshift-sdn
- Name: Enabling egress IPs for a project
File: assigning-egress-ips
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Configuring an egress firewall for a project
File: configuring-egress-firewall
- Name: Editing an egress firewall for a project
@@ -411,13 +411,13 @@ Topics:
Distros: openshift-origin,openshift-enterprise
- Name: Disabling multicast for a project
File: disabling-multicast
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Configuring multitenant isolation
File: multitenant-isolation
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Configuring kube-proxy
File: configuring-kube-proxy
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: OVN-Kubernetes network provider
Dir: ovn_kubernetes_network_provider
Topics:
@@ -425,10 +425,10 @@ Topics:
File: about-ovn-kubernetes
- Name: Enabling multicast for a project
File: enabling-multicast
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Disabling multicast for a project
File: disabling-multicast
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Configuring Routes
Dir: routes
Topics:
@@ -441,35 +441,35 @@ Topics:
Topics:
- Name: Overview
File: overview-traffic
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring ingress cluster traffic using an Ingress Controller
File: configuring-ingress-cluster-traffic-ingress-controller
- Name: Configuring ingress cluster traffic using a load balancer
File: configuring-ingress-cluster-traffic-load-balancer
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring ingress cluster traffic using a service external IP
File: configuring-ingress-cluster-traffic-service-external-ip
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring ingress cluster traffic using a NodePort
File: configuring-ingress-cluster-traffic-nodeport
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring the cluster-wide proxy
File: enable-cluster-wide-proxy
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring a custom PKI
File: configuring-a-custom-pki
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Storage
Dir: storage
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Understanding persistent storage
File: understanding-persistent-storage
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
- Name: Configuring persistent storage
Dir: persistent_storage
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Persistent storage using Amazon EFS
File: persistent-storage-efs
@@ -505,23 +505,23 @@ Topics:
File: persistent-storage-vsphere
- Name: Expanding persistent volumes
File: expanding-persistent-volumes
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Dynamic provisioning
File: dynamic-provisioning
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Registry
Dir: registry
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
Topics:
- Name: Overview
File: architecture-component-imageregistry
- Name: Image Registry Operator in Openshift Container Platform
File: configuring-registry-operator
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Setting up and configuring the registry
Dir: configuring_registry_storage
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Configuring the registry for AWS user-provisioned infrastructure
File: configuring-registry-storage-aws-user-infrastructure
@@ -537,12 +537,12 @@ Topics:
File: configuring-registry-storage-vsphere
- Name: Registry options
File: registry-options
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Accessing the registry
File: accessing-the-registry
- Name: Exposing the registry
File: securing-exposing-registry
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Operators
Dir: operators
@@ -551,7 +551,7 @@ Topics:
File: olm-what-operators-are
- Name: Understanding the Operator Lifecycle Manager (OLM)
Dir: understanding_olm
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Workflow and architecture
File: olm-understanding-olm
@@ -560,38 +560,38 @@ Topics:
- Name: OperatorGroups
File: olm-understanding-operatorgroups
- Name: Understanding the OperatorHub
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
File: olm-understanding-operatorhub
- Name: Adding Operators to a cluster
File: olm-adding-operators-to-cluster
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
- Name: Deleting Operators from a cluster
File: olm-deleting-operators-from-cluster
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
- Name: Creating applications from installed Operators
File: olm-creating-apps-from-installed-operators
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
- Name: Viewing Operator status
File: olm-status
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
- Name: Creating policy for Operator installations and upgrades
File: olm-creating-policy
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Using OLM on restricted networks
File: olm-restricted-networks
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: CRDs
Dir: crds
Topics:
- Name: Extending the Kubernetes API with CRDs
File: crd-extending-api-with-crds
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Managing resources from CRDs
File: crd-managing-resources-from-crds
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Operator SDK
Dir: operator_sdk
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Getting started with the Operator SDK
File: osdk-getting-started
@@ -617,7 +617,7 @@ Topics:
---
Name: Builds
Dir: builds
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Understanding image builds
File: understanding-image-builds
@@ -631,45 +631,45 @@ Topics:
File: build-strategies
#- Name: OpenShift Pipelines
# Dir: openshift_piplines
# Distros: openshift-enterprise,openshift-origin
# Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Custom image builds with Buildah
File: custom-builds-buildah
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Performing basic builds
File: basic-build-operations
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
- Name: Triggering and modifying builds
File: triggering-builds-build-hooks
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
- Name: Performing advanced builds
File: advanced-build-operations
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Using Red Hat subscriptions in builds
File: running-entitled-builds
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Securing builds by strategy
File: securing-builds-by-strategy
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Build configuration resources
File: build-configuration
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Troubleshooting builds
File: troubleshooting-builds
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Setting up additional trusted certificate authorities for builds
File: setting-up-trusted-ca
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Images
Dir: openshift_images
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: Configuring the Samples Operator
File: configuring-samples-operator
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Using the Samples Operator with an alternate registry
File: samples-operator-alt-registry
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Understanding containers, images, and imagestreams
File: images-understand
- Name: Creating images
@@ -687,17 +687,17 @@ Topics:
File: using-image-pull-secrets
- Name: Managing imagestreams
File: image-streams-manage
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Image configuration resources
File: image-configuration
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Using templates
File: using-templates
- Name: Using Ruby on Rails
File: templates-using-ruby-on-rails
- Name: Using images
Dir: using_images
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Using images overview
File: using-images-overview
@@ -717,10 +717,10 @@ Topics:
File: working-with-projects
- Name: Creating a project as another user
File: creating-project-other-user
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring project creation
File: configuring-project-creation
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Application life cycle management
Dir: application_life_cycle_management
Topics:
@@ -736,7 +736,7 @@ Topics:
File: odc-deleting-applications
- Name: Service brokers
Dir: service_brokers
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Installing the service catalog
File: installing-service-catalog
@@ -767,13 +767,13 @@ Topics:
File: route-based-deployment-strategies
- Name: Quotas
Dir: quotas
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Resource quotas per project
File: quotas-setting-per-project
- Name: Resource quotas across multiple projects
File: quotas-setting-across-multiple-projects
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Monitoring application health
File: application-health
- Name: Working with quotas
@@ -781,18 +781,18 @@ Topics:
Distros: openshift-online,openshift-dedicated
- Name: Idling applications
File: idling-applications
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
- Name: Pruning objects to reclaim resources
File: pruning-objects
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
---
Name: Machine management
Dir: machine_management
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Creating MachineSets
Dir: creating_machinesets
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Creating a MachineSet on AWS
File: creating-machineset-aws
@@ -830,23 +830,23 @@ Topics:
File: nodes-pods-viewing
- Name: Configuring a cluster for Pods
File: nodes-pods-configuring
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Automatically scaling pods
File: nodes-pods-autoscaling
- Name: Providing sensitive data to Pods
File: nodes-pods-secrets
- Name: Using Device Manager to make devices available to nodes
File: nodes-pods-plugins
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Including pod priority in Pod scheduling decisions
File: nodes-pods-priority
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Placing pods on specific nodes using node selectors
File: nodes-pods-node-selectors
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Controlling pod placement onto nodes (scheduling)
Dir: scheduling
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: About pod placement using the scheduler
File: nodes-scheduler-about
@@ -873,12 +873,12 @@ Topics:
Topics:
- Name: Running background tasks on nodes automatically with daemonsets
File: nodes-pods-daemonsets
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Running tasks in pods using jobs
File: nodes-nodes-jobs
- Name: Working with nodes
Dir: nodes
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Viewing and listing the nodes in your cluster
File: nodes-nodes-viewing
@@ -911,7 +911,7 @@ Topics:
File: nodes-containers-using
- Name: Using Init Containers to perform tasks before a pod is deployed
File: nodes-containers-init
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Using volumes to persist container data
File: nodes-containers-volumes
- Name: Mapping volumes using projected volumes
@@ -933,29 +933,29 @@ Topics:
File: nodes-containers-events
- Name: Analyzing cluster resource levels
File: nodes-cluster-resource-levels
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring cluster memory to meet container memory and risk requirements
File: nodes-cluster-resource-configure
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Configuring your cluster to place pods on overcommited nodes
File: nodes-cluster-overcommit
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Enabling features using FeatureGates
File: nodes-cluster-enabling-features
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
---
Name: Logging
Dir: logging
Distros: openshift-enterprise,openshift-origin,openshift-dedicated
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated
Topics:
- Name: About cluster logging
File: cluster-logging
- Name: About deploying cluster logging
File: cluster-logging-deploying-about
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Deploying cluster logging
File: cluster-logging-deploying
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Deploying cluster logging
File: dedicated-cluster-deploying
Distros: openshift-dedicated
@@ -963,15 +963,15 @@ Topics:
File: cluster-logging-upgrading
- Name: Deploying and Configuring the Event Router
File: cluster-logging-eventrouter
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Viewing cluster logs
File: cluster-logging-viewing
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Viewing the Kibana interface
File: cluster-logging-kibana-interface
- Name: Configuring your cluster logging deployment
Dir: config
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: About configuring cluster logging
File: cluster-logging-configuring-about
@@ -995,28 +995,28 @@ Topics:
File: cluster-logging-external
- Name: Viewing Elasticsearch status
File: cluster-logging-elasticsearch-status
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Viewing cluster logging status
File: cluster-logging-cluster-status
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Moving the cluster logging resources with node selectors
File: cluster-logging-moving-nodes
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Manually rolling out Elasticsearch
File: cluster-logging-manual-rollout
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Troubleshooting Kibana
File: cluster-logging-troubleshooting
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Exported fields
File: cluster-logging-exported-fields
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Uninstalling cluster logging
File: cluster-logging-uninstall
---
Name: Monitoring
Dir: monitoring
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: Cluster monitoring
Dir: cluster_monitoring
@@ -1038,7 +1038,7 @@ Topics:
---
Name: Metering
Dir: metering
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
Topics:
- Name: About metering
File: metering-about-metering
@@ -1077,7 +1077,7 @@ Topics:
---
Name: Scalability and performance
Dir: scalability_and_performance
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Recommended installation practices
File: recommended-install-practices
@@ -1106,7 +1106,7 @@ Topics:
---
Name: Backup and restore
Dir: backup_and_restore
Distros: openshift-origin,openshift-enterprise
Distros: openshift-origin,openshift-enterprise,openshift-webscale
Topics:
- Name: Backing up etcd data
File: backing-up-etcd
@@ -1126,7 +1126,7 @@ Topics:
---
Name: Migration
Dir: migration
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: Migrating OpenShift Container Platform 3 to 4
Dir: migrating_3_4
@@ -1176,7 +1176,7 @@ Topics:
---
Name: CLI tools
Dir: cli_reference
Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-online
Topics:
- Name: OpenShift CLI (oc)
Dir: openshift_cli
@@ -1187,17 +1187,17 @@ Topics:
File: configuring-cli
- Name: Extending the CLI with plug-ins
File: extending-cli-plugins
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Developer CLI commands
File: developer-cli-commands
- Name: Administrator CLI commands
File: administrator-cli-commands
Distros: openshift-enterprise,openshift-origin
Distros: openshift-enterprise,openshift-webscale,openshift-origin
- Name: Usage of oc and kubectl commands
File: usage-oc-kubectl
- Name: OpenShift Do developer CLI (odo)
Dir: openshift_developer_cli
Distros: openshift-enterprise,openshift-online,openshift-dedicated,openshift-online
Distros: openshift-enterprise,openshift-webscale,openshift-online,openshift-dedicated,openshift-online
Topics:
- Name: Understanding odo
File: understanding-odo
@@ -1225,7 +1225,7 @@ Topics:
File: odo-release-notes
- Name: Helm CLI
Dir: helm_cli
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: Getting started with Helm on OpenShift Container Platform
File: getting-started-with-helm-on-openshift-container-platform
@@ -1238,7 +1238,7 @@ Topics:
---
Name: Service Mesh
Dir: service_mesh
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: Service Mesh Release Notes
File: servicemesh-release-notes
@@ -1291,7 +1291,7 @@ Topics:
---
Name: Container-native virtualization
Dir: cnv
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: About container-native virtualization
File: cnv-about-cnv
@@ -1452,7 +1452,7 @@ Topics:
---
Name: Serverless applications
Dir: serverless
Distros: openshift-enterprise
Distros: openshift-enterprise,openshift-webscale
Topics:
- Name: Release Notes
File: serverless-release-notes

4
applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc
View File

@@ -16,7 +16,7 @@ image::odc_add_view.png[Add View]
* *YAML*: Use the editor to add YAML or JSON definitions to create and modify resources.
* *Database*: See the *Developer Catalog* to select the required database service and add it to your application.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[NOTE]
====
The serverless sections in the above options are displayed only if the xref:../../serverless/installing-openshift-serverless.adoc#installing-openshift-serverless[*Serverless Operator*] is installed in your cluster. OpenShift Serverless is a Technology Preview feature.
@@ -30,7 +30,7 @@ To create applications using the *Developer* perspective ensure that:
* You are in the xref:../../web_console/odc-about-developer-perspective.adoc#odc-about-developer-perspective[*Developer* perspective].
* You have the appropriate xref:../../authentication/using-rbac.adoc#default-roles_using-rbac[roles and permissions] in a project to create applications and other workloads in {product-title}.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
To create serverless applications, in addition to the above, ensure that:

2
applications/deployments/managing-deployment-processes.adoc
View File

@@ -24,7 +24,7 @@ include::modules/deployments-setting-resources.adoc[leveloffset=+2]
include::modules/deployments-scaling-manually.adoc[leveloffset=+2]
include::modules/deployments-accessing-private-repos.adoc[leveloffset=+2]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/deployments-assigning-pods-to-nodes.adoc[leveloffset=+2]
endif::[]

2
applications/quotas/quotas-setting-per-project.adoc
View File

@@ -25,7 +25,7 @@ include::modules/setting-resource-quota-for-extended-resources.adoc[leveloffset=
include::modules/quotas-viewing-quotas.adoc[leveloffset=+1]
include::modules/quotas-requiring-explicit-quota.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/quotas-configuring-quota-sync-period.adoc[leveloffset=+1]
endif::[]
// This is not configurable in 4.1 right now - removing

4
architecture/understanding-development.adoc
View File

@@ -100,11 +100,11 @@ command. Here `<image_name>` is the name of your new container image, which
resembles `quay.io/myrepo/myapp:latest`. The registry might require credentials
to push and pull images.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
For more details on the process of building container images, pushing them to
registries, and running them, see
xref:../builds/custom-builds-buildah.adoc#custom-builds-buildah[Custom image builds with Buildah].
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
[id="container-build-tool-options"]
=== Container build tool options

6
authentication/identity_providers/configuring-github-identity-provider.adoc
View File

@@ -24,13 +24,13 @@ their GitHub credentials. To prevent anyone with any GitHub user ID from logging
in to your {product-title} cluster, you can restrict access to only those in
specific GitHub organizations.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-overview.adoc[leveloffset=+1]
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-registering-github.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/identity-provider-secret.adoc[leveloffset=+1]
include::modules/identity-provider-config-map.adoc[leveloffset=+1]

4
authentication/identity_providers/configuring-gitlab-identity-provider.adoc
View File

@@ -13,9 +13,9 @@ link:https://docs.gitlab.com/ce/integration/openid_connect_provider.html[OpenID
to connect instead of OAuth.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-overview.adoc[leveloffset=+1]
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-secret.adoc[leveloffset=+1]

6
authentication/identity_providers/configuring-google-identity-provider.adoc
View File

@@ -20,11 +20,11 @@ You can limit authentication to members of a specific hosted domain with the
`hostedDomain` configuration attribute.
====
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-overview.adoc[leveloffset=+1]
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/identity-provider-secret.adoc[leveloffset=+1]
include::modules/identity-provider-google-CR.adoc[leveloffset=+1]

6
authentication/identity_providers/configuring-ldap-identity-provider.adoc
View File

@@ -7,13 +7,13 @@ toc::[]
Configure the `ldap` identity provider to validate user names and passwords
against an LDAPv3 server, using simple bind authentication.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-overview.adoc[leveloffset=+1]
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-about-ldap.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/identity-provider-ldap-secret.adoc[leveloffset=+1]
include::modules/identity-provider-config-map.adoc[leveloffset=+1]

8
authentication/identity_providers/configuring-oidc-identity-provider.adoc
View File

@@ -13,7 +13,7 @@ You can link:https://www.keycloak.org/docs/latest/server_admin/index.html#opensh
Connect identity provider for {product-title}.
endif::[]
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
You can
link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_single_sign-on_for_openshift/tutorials[configure Red Hat Single Sign-On]
as an OpenID Connect identity provider for {product-title}.
@@ -65,11 +65,11 @@ Using an OpenID Connect identity provider requires users to get a token using
`<master>/oauth/token/request` to use with command-line tools.
====
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
include::modules/identity-provider-overview.adoc[leveloffset=+1]
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/identity-provider-secret.adoc[leveloffset=+1]
include::modules/identity-provider-config-map.adoc[leveloffset=+1]

4
authentication/understanding-authentication.adoc
View File

@@ -9,7 +9,7 @@ to the cluster. The authentication layer identifies the user associated with req
{product-title} API. The authorization layer then uses information about the
requesting user to determine if the request is allowed.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
As an administrator, you can configure authentication for {product-title}.
endif::[]
@@ -23,7 +23,7 @@ include::modules/oauth-server-overview.adoc[leveloffset=+2]
include::modules/oauth-token-requests.adoc[leveloffset=+2]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/authentication-api-impersonation.adoc[leveloffset=+3]
include::modules/authentication-prometheus-system-metrics.adoc[leveloffset=+3]

4
authentication/using-rbac.adoc
View File

@@ -19,13 +19,13 @@ include::modules/rbac-adding-roles.adoc[leveloffset=+1]
include::modules/rbac-creating-local-role.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/rbac-creating-cluster-role.adoc[leveloffset=+1]
endif::[]
include::modules/rbac-local-role-binding-commands.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/rbac-cluster-role-binding-commands.adoc[leveloffset=+1]
include::modules/rbac-creating-cluster-admin.adoc[leveloffset=+1]

4
contributing_to_docs/contributing.adoc
View File

@@ -101,11 +101,11 @@ This first line is unconditionalized, and will appear for all versions.
This line will only appear for OpenShift Online.
endif::[]
\ifdef::openshift-enterprise[]
\ifdef::openshift-enterprise,openshift-webscale[]
This line will only appear for OpenShift Container Platform.
endif::[]
\ifdef::openshift-origin,openshift-enterprise[]
\ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
This line will appear for OKD and OpenShift Container Platform, but not for OpenShift Online or OpenShift Dedicated.
endif::[]
----

3
logging/cluster-logging.adoc
View File

@@ -7,7 +7,7 @@ toc::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
As an {product-title} cluster administrator, you can deploy cluster logging to
aggregate logs for a range of {product-title} services.
endif::[]
@@ -46,4 +46,3 @@ include::modules/cluster-logging-about-curator.adoc[leveloffset=+2]
include::modules/cluster-logging-about-eventrouter.adoc[leveloffset=+2]
include::modules/cluster-logging-about-crd.adoc[leveloffset=+2]

2
modules/applications-create-using-cli-source-code.adoc
View File

@@ -101,7 +101,7 @@ specified context directory of the repository:
|===
|Language |Files
ifdef::openshift-enterprise,openshift-dedicated,openshift-aro,openshift-online[]
ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated,openshift-aro,openshift-online[]
|`dotnet`
|`project.json`, `pass:[*.csproj]`
endif::[]

2
modules/architecture-platform-benefits.adoc
View File

@@ -14,7 +14,7 @@ of technology areas.
{product-title} provides enterprise-ready enhancements to Kubernetes, including the following enhancements:
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
* Hybrid cloud deployments. You can deploy {product-title} clusters to variety of public cloud platforms or in your data center.
endif::[]
ifdef::openshift-dedicated[]

2
modules/builds-build-pruning.adoc
View File

@@ -35,7 +35,7 @@ spec:
Builds are sorted by their creation timestamp with the oldest builds being
pruned first.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[NOTE]
====
Administrators can manually prune builds using the 'oc adm' object pruning command.

2
modules/builds-chaining-builds.adoc
View File

@@ -13,7 +13,7 @@ To avoid these problems, two builds can be chained together: one that produces
the compiled artifact, and a second build that places that artifact in a
separate image that runs the artifact.
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
In the following example, a Source-to-Image build is combined with a Docker
build to compile an artifact that is then placed in a separate runtime image.

2
modules/builds-docker-source-build-output.adoc
View File

@@ -6,7 +6,7 @@
= Build output
Builds that use the
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
`Docker` or
endif::[]
`Source-to-Image (S2I)` strategy result in the creation of a

2
modules/builds-output-image-digest.adoc
View File

@@ -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-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
`Docker` and
endif::[]
`Source-to-Image (S2I)` builds store the digest in

4
modules/builds-output-image-environment-variables.adoc
View File

@@ -5,7 +5,7 @@
[id="builds-output-image-environment-variables_{context}"]
= Output image environment variables
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
`Docker` and
endif::[]
`Source-to-Image (S2I)` strategy builds set the following environment variables
@@ -35,7 +35,7 @@ on output images:
Additionally, any user-defined environment variable, for example those
configured with
`S2I`]
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
or `Docker`
endif::[]
strategy options, will also be part of the output image environment variable

2
modules/builds-output-image-labels.adoc
View File

@@ -5,7 +5,7 @@
[id="builds-output-image-labels_{context}"]
= Output image labels
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
`Docker` and
endif::[]
`Source-to-Image (S2I)` builds set the following labels on output images:

2
modules/builds-strategy-custom-environment-variables.adoc
View File

@@ -26,7 +26,7 @@ customStrategy:
----
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Cluster administrators can also configure global build settings using Ansible.
endif::[]

2
modules/builds-strategy-docker-environment-variables.adoc
View File

@@ -28,7 +28,7 @@ dockerStrategy:
value: "http://myproxy.net:5187/"
----
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Cluster administrators can also configure global build settings using Ansible.
endif::[]

2
modules/builds-using-image-change-triggers.adoc
View File

@@ -113,7 +113,7 @@ imageChange:
paused: true
----
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
In addition to setting the image field for all `Strategy` types, for custom
builds, the `OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE` environment variable is checked.
If it does not exist, then it is created with the immutable image reference. If

4
modules/cli-developer-other.adoc
View File

@@ -37,8 +37,8 @@ Display the `oc` client and server versions.
$ oc version
----
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
For cluster administrators, the {product-title} server version is also displayed.
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]

2
modules/cli-extending-plugins-installing.adoc
View File

@@ -11,7 +11,7 @@ it to use the functionality that it provides.
[IMPORTANT]
====
OpenShift CLI plug-ins are currently a Technology Preview feature.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
Technology Preview features are not supported with Red Hat production service
level agreements (SLAs), might not be functionally complete, and Red Hat does
not recommend to use them for production. These features provide early access to

2
modules/cli-extending-plugins-writing.adoc
View File

@@ -12,7 +12,7 @@ use a plug-in to overwrite an existing `oc` command.
[IMPORTANT]
====
OpenShift CLI plug-ins are currently a Technology Preview feature.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
Technology Preview features are not supported with Red Hat production service
level agreements (SLAs), might not be functionally complete, and Red Hat does
not recommend to use them for production. These features provide early access to

4
modules/cluster-entitlements.adoc
View File

@@ -35,11 +35,11 @@ You must have internet access to:
* Access the link:https://cloud.redhat.com/openshift[{cloud-redhat-com}] page to download the installation program and perform subscription management and entitlement. If the cluster has internet access and you do not disable Telemetry, that service automatically entitles your cluster. If the Telemetry service cannot entitle your cluster, you must manually entitle it on the link:https://cloud.redhat.com/openshift/register[Cluster registration] page.
* Access link:http://quay.io[Quay.io] to obtain the packages that are required to install your cluster.
* Obtain the packages that are required to perform cluster updates.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
[IMPORTANT]
====
If your cluster cannot have direct internet access, you can perform a restricted network installation on some types of infrastructure that you provision. During that process, you download the content that is required and use it to populate a mirror registry with the packages that you need to install a cluster and generate the installation program. With some installation types, the environment that you install your cluster in will not require internet access. Before you update the cluster, you update the content of the mirror registry.
====
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]

2
modules/cluster-logging-about-crd.adoc
View File

@@ -56,7 +56,7 @@ spec:
----
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[source,yaml]
----
apiVersion: "logging.openshift.io/v1"

4
modules/cluster-logging-about.adoc
View File

@@ -14,7 +14,7 @@ endif::[]
[id="cluster-logging-about_{context}"]
= About cluster logging
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
ifndef::cnv-logging[]
As an {product-title} cluster administrator, you can deploy cluster logging to
aggregate logs for a range of {product-title} services.
@@ -39,7 +39,7 @@ a Cluster Logging Custom Resource (CR) to schedule cluster logging pods and
other resources necessary to support cluster logging. The operators are
responsible for deploying, upgrading, and maintaining cluster logging.
endif::cnv-logging[]
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
ifndef::cnv-logging[]
ifdef::openshift-dedicated[]

4
modules/cluster-logging-collector-external.adoc
View File

@@ -22,10 +22,10 @@ The *forward* plug-ins are provided with the Fluentd image as of v1.4.0.
The *in_forward* plug-in implements the server side (receiver), and *out_forward* implements the client side (sender).
endif::openshift-origin[]
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
The *forward* plug-ins are supported by Fluentd only.
The *in_forward* plug-in implements the server side (receiver), and *out_forward* implements the client side (sender).
endif::openshift-enterprise[]
endif::openshift-enterprise,openshift-webscale[]
To configure the *out_forward* plug-in, create a ConfigMap called `secure-forward` in the `openshift-logging` namespace. On the receiver, configure the Fluentd `secure-forward.conf` file. For more information on using the *in_forward* plug-in, see the link:https://docs.fluentd.org/input/forward[Fluentd documentation].

2
modules/cluster-logging-deploy-clo-cli.adoc
View File

@@ -170,7 +170,7 @@ spec:
----
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[source,yaml]
----
apiVersion: "logging.openshift.io/v1"

2
modules/cluster-logging-deploy-clo.adoc
View File

@@ -134,7 +134,7 @@ spec:
----
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[source,yaml]
----
apiVersion: "logging.openshift.io/v1"

2
modules/crd-creating-aggregated-cluster-roles.adoc
View File

@@ -22,7 +22,7 @@ project template.
.Prerequisites
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- Create a CRD.
endif::[]
ifdef::openshift-dedicated[]

2
modules/crd-creating-custom-resources-from-file.adoc
View File

@@ -15,7 +15,7 @@ specification.
.Prerequisites
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- CRD added to the cluster by a cluster administrator.
endif::[]
ifdef::openshift-dedicated[]

2
modules/crd-custom-resource-definitions.adoc
View File

@@ -32,7 +32,7 @@ endif::[]
Operators in particular make use of CRDs by packaging them with any required
RBAC policy and other software-specific logic.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Cluster administrators can also add CRDs manually to the cluster outside of an
Operator's lifecycle, making them available to all users.

2
modules/creating-a-project-using-the-CLI.adoc
View File

@@ -27,7 +27,7 @@ $ oc new-project hello-openshift \
[NOTE]
====
The number of projects you are allowed to create
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
may be limited by the system administrator.
endif::[]
ifdef::openshift-online[]

2
modules/identity-provider-about-request-header.adoc
View File

@@ -53,7 +53,7 @@ As of {product-title} 4.1, your proxy must support mutual TLS.
[id="sspi-windows_{context}"]
== SSPI connection support on Microsoft Windows
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
[IMPORTANT]
====

2
modules/images-create-guide-openshift.adoc
View File

@@ -74,7 +74,7 @@ In addition, the processes running in the container must not listen on
privileged ports (ports below 1024), since they are not running as a
privileged user.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[IMPORTANT]
====
If your S2I image does not include a *USER* declaration with a numeric user,

2
modules/images-tagging-conventions.adoc
View File

@@ -11,7 +11,7 @@ If there is too much information embedded in a tag name, like
`v2.0.1-may-2019`, the tag points to just one revision of an image and is
never updated. Using default image pruning options, such an image is never
removed.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
In very large clusters, the schema of creating new tags for every revised image
could eventually fill up the etcd datastore with excess tag metadata for images
that are long outdated.

4
modules/nodes-pods-autoscaling-about.adoc
View File

@@ -31,10 +31,10 @@ Pods without known metrics have `0% CPU` usage when scaling up and `100% CPU` wh
This allows for more stability during the HPA decision. To use this feature, you must configure
readiness checks to determine if a new pod is ready for use.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
In order to use horizontal pod autoscalers, your cluster administrator must have
properly configured cluster metrics.
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
== Supported metrics

2
modules/nodes-pods-autoscaling-creating-memory.adoc
View File

@@ -11,7 +11,7 @@ You can create a horizontal pod autoscaler to automatically scale pods in a Depl
[IMPORTANT]
====
Autoscaling for memory utilization is a Technology Preview feature only.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
Technology Preview features are not supported with Red Hat production service
level agreements (SLAs), might not be functionally complete, and Red Hat does
not recommend to use them for production. These features provide early access to

2
modules/nodes-pods-using-about.adoc
View File

@@ -20,7 +20,7 @@ base image(s), or both. Pods are also treated as expendable, and do not
maintain state when recreated. Therefore pods should usually be managed by
higher-level controllers, rather than directly by users.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
[NOTE]
====
For the maximum number of pods per {product-title} node host, see the Cluster Limits.

4
modules/nodes-scheduler-node-selectors-about.adoc
View File

@@ -23,9 +23,9 @@ Each node in each geographical region is labeled accordingly. For example,
[NOTE]
====
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
See Updating Labels on Nodes for details on assigning labels.
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
ifdef::openshift-dedicated[]
(request changes by opening a support case on the
https://access.redhat.com/support/[Red Hat Customer Portal])

4
modules/nodes-scheduler-node-selectors-configuring.adoc
View File

@@ -10,9 +10,9 @@ You can configure the Pod Node Constraints admission controller to ensure that p
.Prerequisites
. Ensure you have the desired labels
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
labels on your nodes.
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
ifdef::openshift-dedicated[]
labels on your nodes (request changes by opening a support case on the
https://access.redhat.com/support/[Red Hat Customer Portal]).

4
modules/nw-throughput-troubleshoot.adoc
View File

@@ -43,6 +43,6 @@ $ tcpdump -s 0 -i any -w /tmp/dump.pcap port 4789
and UDP throughput. Run the tool from the Pods first, then from the nodes,
to locate any bottlenecks.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
** For information on installing and using iperf, see this link:https://access.redhat.com/solutions/33103[Red Hat Solution].
endif::openshift-enterprise[]
endif::openshift-enterprise,openshift-webscale[]

2
modules/olm-deleting-operators-from-a-cluster-using-cli.adoc
View File

@@ -11,7 +11,7 @@ by using the CLI.
.Prerequisites
- Access to an {product-title} cluster using an account with
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
`cluster-admin` permissions.
endif::[]
ifdef::openshift-dedicated[]

2
modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc
View File

@@ -11,7 +11,7 @@ by using the web console.
.Prerequisites
- Access to an {product-title} cluster web console using an account with
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
`cluster-admin` permissions.
endif::[]
ifdef::openshift-dedicated[]

2
modules/olm-installing-from-operatorhub-using-web-console.adoc
View File

@@ -11,7 +11,7 @@ an Operator from the OperatorHub using the {product-title} web console.
.Prerequisites
- Access to an {product-title} cluster using an account with
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
`cluster-admin` permissions.
endif::[]
ifdef::openshift-dedicated[]

4
modules/olm-installing-operators-from-operatorhub.adoc
View File

@@ -7,7 +7,7 @@
As a cluster administrator, you can install an Operator from the OperatorHub
using the {product-title}
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
web console or the CLI. You can then subscribe the Operator to one or more
namespaces to make it available for developers on your cluster.
endif::[]
@@ -30,7 +30,7 @@ endif::[]
During installation, you must determine the following initial settings for the
Operator:
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Installation Mode:: Choose *All namespaces on the cluster (default)* to have the
Operator installed on all namespaces or choose individual namespaces, if
available, to only install the Operator on selected namespaces. This example

2
modules/operators-overview.adoc
View File

@@ -25,7 +25,7 @@ the Cluster Version Operator.
{product-title} {product-version} uses different classes of Operators to perform
cluster operations and run services on the cluster for your applications to use.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="platform-operators_{context}"]
== Platform Operators in {product-title}

2
modules/prometheus-database-storage-requirements.adoc
View File

@@ -75,7 +75,7 @@ Currently, OpenStack environments are not supported for {product-title} {product
[IMPORTANT]
====
OpenShift Container Storage (OCS) is currently a Technology Preview feature.
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
Technology Preview features are not supported with Red Hat production service
level agreements (SLAs), might not be functionally complete, and Red Hat does
not recommend to use them for production. These features provide early access to

2
modules/rbac-cluster-role-binding-commands.adoc
View File

@@ -2,7 +2,7 @@
//
// * authentication/using-rbac.adoc
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="cluster-role-binding-commands_{context}"]
= Cluster role binding commands

2
modules/rbac-creating-cluster-role.adoc
View File

@@ -2,7 +2,7 @@
//
// * authentication/using-rbac.adoc
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="creating-cluster-role_{context}"]
= Creating a cluster role

2
modules/rbac-creating-local-role.adoc
View File

@@ -2,7 +2,7 @@
//
// * authentication/using-rbac.adoc
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="creating-local-role_{context}"]
= Creating a local role

8
modules/rbac-overview.adoc
View File

@@ -8,7 +8,7 @@
Role-based access control (RBAC) objects determine whether a user is allowed to
perform a given action within a project.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Cluster administrators can use the cluster roles and
bindings to control who has various access levels to the {product-title}
platform itself and all projects.
@@ -170,9 +170,9 @@ roles at the same time.
Project administrators can use the CLI to
endif::openshift-origin,openshift-enterprise,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
view local roles and bindings,
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
ifdef::openshift-dedicated[]
view local bindings,
endif::openshift-dedicated[]
@@ -191,7 +191,7 @@ the cluster level or at the project level.
====
endif::openshift-origin,openshift-enterprise,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="cluster-role-aggregations_{context}"]
=== Cluster Role Aggregation
The default admin, edit, view, and cluster-reader cluster roles support

2
modules/rbac-updating-policy-definitions.adoc
View File

@@ -2,7 +2,7 @@
//
// * orphaned
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="updating-policy-definitions_{context}"]
= Updating policy definitions

6
modules/rbac-viewing-cluster-roles.adoc
View File

@@ -16,7 +16,7 @@ ifdef::openshift-dedicated[]
Users with the `dedicated-admins-cluster` role can view cluster roles and bindings.
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Users with the *cluster-admin* default cluster role bound cluster-wide can
perform any action on any resource, including viewing cluster roles and bindings.
endif::[]
@@ -25,7 +25,7 @@ endif::[]
. To view the cluster roles and their associated rule sets:
+
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
----
$ oc describe clusterrole.rbac
Name: admin
@@ -225,7 +225,7 @@ endif::[]
. To view the current set of cluster role bindings, which shows the users and
groups that are bound to various roles:
+
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
----
$ oc describe clusterrolebinding.rbac
Name: alertmanager-main

2
modules/rbac-viewing-local-roles.adoc
View File

@@ -17,7 +17,7 @@ ifdef::openshift-dedicated[]
** Users with the `dedicated-admins-cluster` role can view and manage local roles and bindings.
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
** Users with the `cluster-admin` default cluster role bound cluster-wide can
perform any action on any resource, including viewing local roles and bindings.
endif::[]

2
modules/recommended-configurable-storage-technology.adoc
View File

@@ -7,7 +7,7 @@
:gluster-install-link: https://docs.gluster.org/en/latest/Install-Guide/Overview/
:gluster-admin-link: https://docs.gluster.org/en/latest/Administrator%20Guide/overview/
:gluster-role-link: https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_storage_glusterfs
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
:gluster: Red Hat Gluster Storage
:gluster-native: converged mode
:gluster-external: independent mode

10
modules/registry-accessing-directly.adoc
View File

@@ -11,7 +11,7 @@ You can access the registry from inside the cluster.
Access the registry from the cluster by using internal routes:
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
. Access the node by getting the node's address:
+
----
@@ -23,7 +23,7 @@ endif::[]
. Log in to the container image registry by using your access token:
+
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
----
$ oc login -u kubeadmin -p <password_from_install_log>
$ podman login -u kubeadmin -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000
@@ -64,7 +64,7 @@ In the following examples, use:
|====
|Component |Value
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
|*<registry_ip>*
|`172.30.124.220`
@@ -93,7 +93,7 @@ endif::[]
$ podman pull name.io/image
----
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
.. Tag the new image with the form `<registry_ip>:<port>/<project>/<image>`.
The project name must appear in this pull specification for {product-title} to
correctly place and later access the image in the registry:
@@ -122,7 +122,7 @@ to push the image.
.. Push the newly-tagged image to your registry:
+
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
----
$ podman push image-registry.openshift-image-registry.svc:5000/openshift/image
----

2
modules/registry-integrated-openshift-registry.adoc
View File

@@ -6,7 +6,7 @@
[id="registry-integrated-openshift-registry_{context}"]
= Integrated {product-title} registry
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
{product-title} provides a built in container image registry which runs as a
standard workload on the cluster. The registry is configured and managed by an
infrastructure operator. It provides an out of the box solution for users to

2
modules/rhel-compute-requirements.adoc
View File

@@ -25,7 +25,7 @@ ifdef::openshift-origin[]
link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/installation_guide/index[RHEL 7.6]
with "Minimal" installation option.
endif::[]
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
** Base OS:
link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html-single/installation_guide/index[RHEL 7.6]
with "Minimal" installation option.

2
modules/security-context-constraints-about.adoc
View File

@@ -64,7 +64,7 @@ effectively root on the cluster and must be trusted accordingly.
====
Do not modify the default SCCs. Customizing the default SCCs can lead to issues
when {product-title} is upgraded.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
Instead, create new SCCs.
endif::[]
====

8
modules/security-context-constraints-command-reference.adoc
View File

@@ -7,7 +7,7 @@
You can manage SCCs in your instance as normal API objects using the CLI.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[NOTE]
====
You must have `cluster-admin` privileges to manage SCCs.
@@ -18,7 +18,7 @@ You must have `cluster-admin` privileges to manage SCCs.
Do not modify the default SCCs. Customizing the default SCCs can lead to issues
when upgrading. Instead, create new SCCs.
====
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
ifdef::openshift-dedicated[]
As an {product-title} cluster administrator, you can list and view details for
@@ -88,7 +88,7 @@ Settings:
<1> Lists which users and service accounts the SCC is applied to.
<2> Lists which groups the SCC is applied to.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[NOTE]
====
To preserve customized SCCs during upgrades, do not edit settings on
@@ -126,4 +126,4 @@ To preserve customized SCCs during upgrades, do not edit settings on
the default SCCs.
//other than priority, users, groups, labels, and annotations.
====
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]

4
modules/security-overview.adoc
View File

@@ -26,7 +26,7 @@ checks for one or more of the roles assigned to the user, such as a cluster
administrator or administrator of the current project, before allowing it to
continue.
ifdef::openshift-origin,openshift-online,openshift-enterprise[]
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-webscale[]
Since every container that runs on the cluster is associated with a service
account, it is also possible to associate secrets to those service accounts and have them
automatically delivered into the container. This secret delivery enables the infrastructure to
@@ -45,7 +45,7 @@ ifdef::openshift-origin,openshift-enterprise,openshift-dedicated[]
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[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
Custom certificates for public hosts are supported as well.
endif::[]

2
modules/service-accounts-overview.adoc
View File

@@ -13,7 +13,7 @@ access without sharing a regular user's credentials.
When you use the {product-title} CLI or web console, your API token
authenticates you to the API. You can associate a component with a service account
so that they can access the API without using a regular user's credentials.
ifdef::openshift-online,openshift-origin,openshift-dedicated,openshift-enterprise[]
ifdef::openshift-online,openshift-origin,openshift-dedicated,openshift-enterprise,openshift-webscale[]
For example, service accounts can allow:
* Replication controllers to make API calls to create or delete pods.

6
modules/storage-persistent-storage-lifecycle.adoc
View File

@@ -16,7 +16,7 @@ In response to requests from a developer defined in a PVC, a cluster
administrator configures one or more dynamic provisioners that provision
storage and a matching PV.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Alternatively, a cluster administrator can create a number of PVs in advance
that carry the details of the real storage that is available for use. PVs
exist in the API and are available for use.
@@ -54,7 +54,7 @@ Once you have a claim and that claim is bound, the bound PV belongs to you
for as long as you need it. You can schedule Pods and access claimed
PVs by including `persistentVolumeClaim` in the Pod's volumes block.
ifdef::openshift-origin,openshift-enterprise[]
ifdef::openshift-origin,openshift-enterprise,openshift-webscale[]
[id="pvcprotection_{context}"]
== Storage Object in Use Protection
@@ -70,7 +70,7 @@ A PVC is in active use by a Pod when a Pod object exists that uses the PVC.
If a user deletes a PVC that is in active use by a Pod, the PVC is not removed immediately. PVC removal is postponed until the PVC is no longer actively used by any Pods. Also, if a cluster admin deletes a PV that is bound to a PVC, the PV is not removed immediately. PV removal is postponed until the PV is no longer bound to a PVC.
endif::openshift-origin,openshift-enterprise[]
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
[id="releasing_{context}"]
== Release volumes

8
modules/storage-persistent-storage-pv.adoc
View File

@@ -43,11 +43,11 @@ once it is released.
- Azure Disk
- Azure File
- Cinder
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- Fibre Channel
endif::[]
- GCE Persistent Disk
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- HostPath
- iSCSI
- Local volume
@@ -224,7 +224,7 @@ You can view the name of the PVC bound to the PV by running:
$ oc get pv <pv-claim>
----
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="pv-mount-options_{context}"]
=== Mount options
@@ -276,4 +276,4 @@ The following PV types support mount options:
====
Fibre Channel and HostPath PVs do not support mount options.
====
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]

2
modules/support-get-cluster-id.adoc
View File

@@ -13,7 +13,7 @@ When providing information to Red Hat Support, it is helpful to provide the uniq
* Access to the web console or the OpenShift CLI (`oc`) installed.
.Procedure
ifdef::openshift-enterprise,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated[]
* To open a support case and have your cluster ID autofilled using the web console:
.. From the toolbar, navigate to *(?) Help* -> *Open Support Case*.
.. The 'Cluster ID' value is autofilled.

2
modules/support.adoc
View File

@@ -13,7 +13,7 @@ Customer Portal, you can:
articles about Red Hat products.
* Submit a support case to Red Hat Support.
+
ifdef::openshift-enterprise,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated[]
[NOTE]
====

2
modules/templates-rails-creating-route-for-application.adoc
View File

@@ -6,7 +6,7 @@
You can expose a service to create a route for your application.
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
.Procedure
* To expose a service by giving it an externally-reachable hostname like

2
modules/templates-rails-deploying-application.adoc
View File

@@ -18,7 +18,7 @@ your Ruby on Rails source code, which are wired with the database service.
.Procedure
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated[]
* To deploy your Ruby on Rails application, create a new Project for the
application:
+

4
modules/templates-writing-description.adoc
View File

@@ -55,12 +55,12 @@ catalog, for example.
that will include it into one of the provided catalog categories. Refer to the
`id` and `categoryAliases` in `CATALOG_CATEGORIES` in the console's
constants file.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
The categories can also be customized for the whole cluster.
endif::[]
<6> An icon to be displayed with your template in the web console. Choose from
our existing logo icons when possible. You can also use icons from FontAwesome.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Alternatively, provide icons through CSS customizations that can be added to an
{product-title} cluster that uses your template. You must specify an icon class
that exists, or it will prevent falling back to the generic icon.

2
networking/configuring-networkpolicy.adoc
View File

@@ -17,7 +17,7 @@ include::modules/nw-networkpolicy-view.adoc[leveloffset=+1]
include::modules/nw-networkpolicy-multitenant-isolation.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="nw-networkpolicy-creating-default-networkpolicy-objects-for-a-new-project"]
== Creating default network policies for a new project

4
networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc
View File

@@ -9,7 +9,7 @@ toc::[]
{product-title} provides methods for communicating from outside the cluster with
services running in the cluster. This method uses an Ingress Controller.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/nw-using-ingress-and-routes.adoc[leveloffset=+1]
[NOTE]
@@ -43,7 +43,7 @@ include::modules/nw-creating-project-and-service.adoc[leveloffset=+1]
include::modules/nw-exposing-service.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/nw-ingress-sharding-route-labels.adoc[leveloffset=+1]
include::modules/nw-ingress-sharding-namespace-labels.adoc[leveloffset=+1]

2
networking/openshift_sdn/about-openshift-sdn.adoc
View File

@@ -10,7 +10,7 @@ unified cluster network that enables communication between Pods across the
{product-title} cluster. This Pod network is established and maintained by the
OpenShift SDN, which configures an overlay network using Open vSwitch (OVS).
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
OpenShift SDN provides three SDN modes for configuring the Pod network:
* The _network policy_ mode allows project administrators to configure their own

4
nodes/scheduling/nodes-scheduler-about.adoc
View File

@@ -38,7 +38,7 @@ In situations where you might want more control over where new pods are placed,
One of the important use cases for scheduling within {product-title} is to
support flexible affinity and anti-affinity policies.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="infrastructure-topological-levels_{context}"]
=== Infrastructure Topological Levels
@@ -52,7 +52,7 @@ city/building/room. Also, administrators can define any number of levels
for their infrastructure topology, with three levels usually being adequate
(such as: `regions` -> `zones` -> `racks`). Administrators can specify affinity
and anti-affinity rules at each of these levels in any combination.
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]
[id="affinity_{context}"]
=== Affinity

2
openshift_images/create-images.adoc
View File

@@ -13,7 +13,7 @@ The process includes learning best practices for writing images,
defining metadata for images, testing images and using a custom builder workflow to create images
that can be used on
{product-title}.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Once you have created an image, you can push it to
the internal registry.
endif::[]

2
openshift_images/images-understand.adoc
View File

@@ -30,7 +30,7 @@ include::modules/images-imagestream-trigger.adoc[leveloffset=+1]
== Additional resources
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
* For more information on using imagestreams, see
xref:../openshift_images/image-streams-manage.adoc#managing-image-streams[Managing image
streams].

2
operators/olm-adding-operators-to-cluster.adoc
View File

@@ -10,6 +10,6 @@ This guide walks cluster administrators through installing Operators to an
include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1]
include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+2]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+2]
endif::[]

6
registry/accessing-the-registry.adoc
View File

@@ -4,7 +4,7 @@
include::modules/common-attributes.adoc[]
toc::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
Use the following sections for instructions on accessing the registry, including
viewing logs and metrics, as well as securing and exposing the registry.
endif::[]
@@ -19,7 +19,7 @@ operations like `podman push` or `podman pull`. To do so, you must be logged in
to the registry using the `oc login` command. The operations you can perform
depend on your user permissions, as described in the following sections.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
.Prerequisites
* You must have configured an identity provider (IDP).
@@ -40,7 +40,7 @@ endif::[]
include::modules/registry-accessing-directly.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/registry-viewing-contents.adoc[leveloffset=+1]
include::modules/registry-viewing-logs.adoc[leveloffset=+1]

2
registry/architecture-component-imageregistry.adoc
View File

@@ -6,7 +6,7 @@ toc::[]
include::modules/registry-integrated-openshift-registry.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
.Additional resources
* xref:../registry/configuring-registry-operator.adoc#configuring-registry-operator[Image Registry Operator in {product-title}]

2
scalability_and_performance/optimizing-storage.adoc
View File

@@ -7,7 +7,7 @@ include::modules/common-attributes.adoc[]
:gluster-install-link: https://docs.gluster.org/en/latest/Install-Guide/Overview/
:gluster-admin-link: https://docs.gluster.org/en/latest/Administrator%20Guide/overview/
:gluster-role-link: https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_storage_glusterfs
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
:gluster: Red Hat Gluster Storage
:gluster-native: converged mode
:gluster-external: independent mode

4
storage/understanding-persistent-storage.adoc
View File

@@ -12,7 +12,7 @@ include::modules/storage-persistent-storage-pv.adoc[leveloffset=+1]
include::modules/storage-persistent-storage-pvc.adoc[leveloffset=+1]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
include::modules/storage-persistent-storage-block-volume.adoc[leveloffset=+1]
// As these volumes have transitioned to being tech preview per plug-in,
@@ -21,4 +21,4 @@ include::modules/storage-persistent-storage-block-volume.adoc[leveloffset=+1]
// include::modules/technology-preview.adoc[leveloffset=+1]
include::modules/storage-persistent-storage-block-volume-examples.adoc[leveloffset=+2]
endif::openshift-enterprise,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-origin[]

5
support/getting-support.adoc
View File

@@ -6,11 +6,11 @@ include::modules/common-attributes.adoc[]
toc::[]
// Getting support
ifdef::openshift-enterprise,openshift-dedicated,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated,openshift-origin[]
include::modules/support.adoc[leveloffset=+1]
endif::openshift-enterprise,openshift-dedicated,openshift-origin[]
endif::openshift-enterprise,openshift-webscale,openshift-dedicated,openshift-origin[]
// Getting Online Starter support
ifdef::openshift-online[]
@@ -18,4 +18,3 @@ ifdef::openshift-online[]
include::modules/starter-support.adoc[leveloffset=+1]
endif::openshift-online[]

4
support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
View File

@@ -5,7 +5,7 @@ include::modules/common-attributes.adoc[]
toc::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
You might need to opt out of reporting health and usage data for your cluster. For example, you might need to comply with privacy laws or standards governing how your organization reports monitoring data.
endif::[]
@@ -13,7 +13,7 @@ ifdef::openshift-dedicated[]
On {product-title}, remote health reporting is always enabled. You cannot opt out.
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
To opt out of remote health reporting, you must:

16
welcome/index.adoc
View File

@@ -13,9 +13,9 @@ To navigate the {product-title} {product-version} documentation, you can either
* Use the left navigation bar to browse the documentation or
* Select the activity that interests you from the contents of this Welcome page
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
You can start with an **xref:../architecture/architecture.adoc#architecture-overview-architecture[Introduction to {product-title}]**
ifdef::openshift-enterprise[]
ifdef::openshift-enterprise,openshift-webscale[]
and the xref:../release_notes/ocp-4-4-release-notes.adoc#ocp-4-4-release-notes[{product-title} {product-version} release notes].
endif::[]
endif::[]
@@ -24,7 +24,7 @@ ifdef::openshift-dedicated,openshift-online,openshift-aro[]
You can start with an **xref:../architecture/architecture.adoc#architecture-overview-architecture[Introduction to {product-title}]**.
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
== Cluster installer activities
As someone setting out to install an {product-title} {product-version} cluster, this documentation will help you:
@@ -103,7 +103,7 @@ The odo CLI tool lets developers create single or multi-component applications
easily and automates deployment, build, and service route configurations.
It abstracts complex Kubernetes and {product-title} concepts, allowing developers to focus on developing their applications.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- **Deploy Helm Charts**:
xref:../cli_reference/helm_cli/getting-started-with-helm-on-openshift-container-platform.adoc#getting-started-with-helm-on-openshift[Helm 3]
is a package manager that helps developers define, install, and update
@@ -122,7 +122,7 @@ Use the Workloads page or `oc` CLI to xref:../applications/deployments/managing-
- **xref:../openshift_images/using-templates.adoc#using-templates[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas, exposed ports and other content that defines how an application can be run or built.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- **xref:../operators/operator_sdk/osdk-getting-started.adoc#osdk-getting-started[Create Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn the workflow for building, testing, and deploying Operators. Then create your own Operators based on xref:../operators/operator_sdk/osdk-ansible.adoc#osdk-ansible[Ansible] or
xref:../operators/operator_sdk/osdk-helm.adoc#osdk-helm[Helm], or configure xref:../operators/operator_sdk/osdk-monitoring-prometheus.adoc#osdk-monitoring-prometheus[built-in Prometheus monitoring] using the Operator SDK.
@@ -131,7 +131,7 @@ xref:../operators/operator_sdk/osdk-helm.adoc#osdk-helm[Helm], or configure xref
- **Use xref:../applications/service_brokers/installing-template-service-broker.adoc#sb-about-template-service-broker-sb-installing-tsb[Template Service Broker] or xref:../applications/service_brokers/installing-ansible-service-broker.adoc#sb-about-ansible-service-broker-sb-installing-asb[OpenShift Ansible Broker] applications**: Service brokers are a mechanism for provisioning applications outside of an {product-title} environment.
endif::[]
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
== Cluster administrator activities
Ongoing tasks on your {product-title} {product-version} cluster
@@ -203,7 +203,7 @@ be reviewed by cluster administrators and xref:../operators/olm-adding-operators
- **xref:../operators/crds/crd-extending-api-with-crds.adoc#crd-extending-api-with-crds[Use Custom Resource Definition (CRDs) to modify the cluster]**: Cluster features that are implemented with Operators, can be modified with CRDs. Learn to xref:../operators/crds/crd-extending-api-with-crds.adoc#crd-creating-custom-resources-definition_crd-extending-api-with-crds[create a CRD] and xref:../operators/crds/crd-managing-resources-from-crds.adoc#crd-managing-resources-from-crds[manage resources from CRDs].
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- **xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Set resource quotas]**: Choose from CPU, memory and other system resources to xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[set quotas].
endif::[]
@@ -249,7 +249,7 @@ be reviewed by cluster administrators and xref:../operators/olm-adding-operators
- **xref:../administering_a_cluster/dedicated-admin-role.adoc#dedicated-managing-administrators_dedicated-administrator[Manage RBAC authorizations]**: Grant permissions to users or groups and manage service accounts.
ifdef::openshift-enterprise,openshift-origin[]
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
- **xref:../applications/quotas/quotas-setting-per-project.adoc#quotas-setting-per-project[Set resource quotas]**: Choose from CPU, memory and other system resources to set quotas.