Skip to content

Commit 1b5fecf

Browse files
authored
Merge pull request #85401 from mramendi/cicd-observability-overviews-4.16
OSDOCS 12388 ci/cd and observability overview books
2 parents fbb8601 + 46eed0a commit 1b5fecf

File tree

14 files changed

+56
-22
lines changed

14 files changed

+56
-22
lines changed

_topic_maps/_topic_map.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,11 @@ Dir: cicd
20412041
Distros: openshift-enterprise,openshift-origin,openshift-online
20422042
Topics:
20432043
- Name: CI/CD overview
2044-
File: index
2044+
Dir: overview
2045+
Distros: openshift-enterprise,openshift-origin,openshift-online
2046+
Topics:
2047+
- Name: About CI/CD
2048+
File: index
20452049
- Name: Builds using Shipwright
20462050
Dir: builds_using_shipwright
20472051
Distros: openshift-enterprise
@@ -2737,7 +2741,11 @@ Dir: observability
27372741
Distros: openshift-enterprise,openshift-origin
27382742
Topics:
27392743
- Name: Observability overview
2740-
File: index
2744+
Dir: overview
2745+
Distros: openshift-enterprise,openshift-origin
2746+
Topics:
2747+
- Name: About Observability
2748+
File: index
27412749
- Name: Monitoring
27422750
Dir: monitoring
27432751
Distros: openshift-enterprise,openshift-origin

_topic_maps/_topic_map_osd.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,10 @@ Dir: cicd
463463
Distros: openshift-dedicated
464464
Topics:
465465
- Name: CI/CD overview
466-
File: index
466+
Dir: overview
467+
Topics:
468+
- Name: About CI/CD
469+
File: index
467470
# This can be included when Shipwright is ported.
468471
# - Name: Builds using Shipwright
469472
# Dir: builds_using_shipwright
@@ -1196,7 +1199,10 @@ Dir: observability
11961199
Distros: openshift-dedicated
11971200
Topics:
11981201
- Name: Observability overview
1199-
File: index
1202+
Dir: overview
1203+
Topics:
1204+
- Name: About Observability
1205+
File: index
12001206
- Name: Monitoring
12011207
Dir: monitoring
12021208
Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,10 @@ Dir: cicd
732732
Distros: openshift-rosa
733733
Topics:
734734
- Name: CI/CD overview
735-
File: index
735+
Dir: overview
736+
Topics:
737+
- Name: About CI/CD
738+
File: index
736739
# This can be included when Shipwright is ported.
737740
# - Name: Builds using Shipwright
738741
# Dir: builds_using_shipwright
@@ -1491,7 +1494,10 @@ Dir: observability
14911494
Distros: openshift-rosa
14921495
Topics:
14931496
- Name: Observability overview
1494-
File: index
1497+
Dir: overview
1498+
Topics:
1499+
- Name: About Observability
1500+
File: index
14951501
- Name: Monitoring
14961502
Dir: monitoring
14971503
Distros: openshift-rosa

cicd/overview/_attributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_attributes

cicd/overview/images

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../images

cicd/index.adoc renamed to cicd/overview/index.adoc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="ci-cd-overview"]
3-
= {product-title} CI/CD overview
3+
= About CI/CD
44
include::_attributes/common-attributes.adoc[]
55
:context: ci-cd-overview
66

77
toc::[]
88

99
// The Shipwright, Pipelines, and GitOps content is not currently included
10-
// in the OSD and ROSA docs. As these layered products are added to the
11-
// OSD and ROSA docs, the applicable content and xrefs below should be
10+
// in the OSD and ROSA docs. As these layered products are added to the
11+
// OSD and ROSA docs, the applicable content and xrefs below should be
1212
// included.
1313

1414
{product-title} is an enterprise-ready Kubernetes platform for developers, which enables organizations to automate the application delivery process through DevOps practices, such as continuous integration (CI) and continuous delivery (CD). To meet your organizational needs, the {product-title} provides the following CI/CD solutions:
@@ -28,18 +28,18 @@ OpenShift Builds provides you the following options to configure and run a build
2828

2929
* Builds using Shipwright is an extensible build framework based on the Shipwright project. You can use it to build container images on an {product-title} cluster. You can build container images from source code and Dockerfile by using image build tools, such as Source-to-Image (S2I) and Buildah.
3030
+
31-
For more information, see link:https://docs.openshift.com/builds/latest/about/overview-openshift-builds.html[Overview of Builds].
31+
For more information, see link:https://docs.redhat.com/en/documentation/builds_for_red_hat_openshift[builds for Red Hat OpenShift].
3232

3333
* Builds using `BuildConfig` objects is a declarative build process to create cloud-native apps. You can define the build process in a YAML file that you use to create a `BuildConfig` object. This definition includes attributes such as build triggers, input parameters, and source code. When deployed, the `BuildConfig` object builds a runnable image and pushes the image to a container image registry. With the `BuildConfig` object, you can create a Docker, Source-to-image (S2I), or custom build.
3434
+
35-
For more information, see xref:../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds].
35+
For more information, see xref:../../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds].
3636
endif::openshift-dedicated,openshift-rosa[]
3737

3838
// This is the same para as above, but without the unordered list.
3939
ifdef::openshift-dedicated,openshift-rosa[]
4040
Builds using `BuildConfig` objects is a declarative build process to create cloud-native apps. You can define the build process in a YAML file that you use to create a `BuildConfig` object. This definition includes attributes such as build triggers, input parameters, and source code. When deployed, the `BuildConfig` object builds a runnable image and pushes the image to a container image registry. With the `BuildConfig` object, you can create a Docker, Source-to-image (S2I), or custom build.
4141

42-
For more information, see xref:../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds].
42+
For more information, see xref:../../cicd/builds/understanding-image-builds.adoc#understanding-image-builds[Understanding image builds].
4343
endif::openshift-dedicated,openshift-rosa[]
4444

4545
// This can be included in OSD and ROSA when the Pipelines doc is ported.
@@ -48,7 +48,7 @@ ifndef::openshift-dedicated,openshift-rosa[]
4848
== {pipelines-shortname}
4949
{pipelines-shortname} provides a Kubernetes-native CI/CD framework to design and run each step of the CI/CD pipeline in its own container. It can scale independently to meet the on-demand pipelines with predictable outcomes.
5050

51-
For more information, see link:https://docs.openshift.com/pipelines/latest/about/understanding-openshift-pipelines.html[Understanding {pipelines-shortname}].
51+
For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_pipelines[Red Hat OpenShift Pipelines].
5252
endif::openshift-dedicated,openshift-rosa[]
5353

5454
// This can be included in OSD and ROSA when the GitOps doc is ported.
@@ -57,9 +57,11 @@ ifndef::openshift-dedicated,openshift-rosa[]
5757
== OpenShift GitOps
5858
OpenShift GitOps is an Operator that uses Argo CD as the declarative GitOps engine. It enables GitOps workflows across multicluster OpenShift and Kubernetes infrastructure. Using OpenShift GitOps, administrators can consistently configure and deploy Kubernetes-based infrastructure and applications across clusters and development lifecycles.
5959

60-
For more information, see xref:../cicd/gitops/about-redhat-openshift-gitops.adoc#about-redhat-openshift-gitops[About {gitops-title}].
60+
For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_gitops[Red Hat OpenShift GitOps].
6161
endif::openshift-dedicated,openshift-rosa[]
6262

6363
[id="jenkins-ci-cd"]
6464
== Jenkins
6565
Jenkins automates the process of building, testing, and deploying applications and projects. OpenShift Developer Tools provides a Jenkins image that integrates directly with the {product-title}. Jenkins can be deployed on OpenShift by using the Samples Operator templates or certified Helm chart.
66+
67+
For more information, see xref:../../cicd/jenkins/images-other-jenkins.adoc#images-other-jenkins[Configuring Jenkins images].

cicd/overview/modules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../modules

cicd/overview/snippets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../snippets/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// This module is included in the following assemblies:
2+
// * about/understanding-openshift-pipelines.adoc
3+
4+
[id="about-workspaces-optional_{context}"]
5+
= Workspaces

observability/overview/_attributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_attributes

0 commit comments

Comments
 (0)