From 01bcadc49fc90e48445317eaf31e29f39e57c570 Mon Sep 17 00:00:00 2001
From: Olaf Bohlen <olbohlen@eenfach.de>
Date: Mon, 27 Feb 2023 09:28:10 +0100
Subject: [PATCH] updated pdf also

---
 openshift-diagrams.org |   72 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/openshift-diagrams.org b/openshift-diagrams.org
index 0feda9d..6b1e2d8 100644
--- a/openshift-diagrams.org
+++ b/openshift-diagrams.org
@@ -9,9 +9,34 @@
 #+LaTeX_HEADER: \subsectionfont{\normalfont\itshape}
 #+LATEX_HEADER: \renewcommand\maketitle{}
 
-* Deployment on OpenShift with images
+* Deployment on OpenShift with images using Kubernetes Deployments
 
 #+BEGIN_SRC ditaa :file ocp-dep-image1.png :cmdline -r
+oc new-app sample.registry.org/user/image:tag
+   |
+   |                             
+   | (1)  +-------------+   points to    +------------------------------------+
+   +--->  | ImageStream |  ----------->  | external Registry cRED {s}         |
+   |      | (IS)        |                | sample.registry.org/user/image:tag |
+   |      +-------------+                +------------------------------------+
+   |             ^
+   |             | points to
+   | (2)  +------------------+  (5) creates                       +-----------------------+
+   +--->  | Deployment       | -------------------------------->  | ReplicaSet            |                
+   |      |                  |  (4)                               |                       |
+   |      |                  | -------------------+               +-----------------------+
+   |      +------------------+  creates           |                       |
+   |                                              |                       |scales &
+   |                                              v                       |monitors
+   | (3)  +---------+   load balances   +----------------+                |
+   +--->  | Service |  -------------->  | ApplicationPod |  <-------------+
+          | (SVC)   |                   |                |
+          +---------+                   +----------------+
+#+END_SRC
+
+* Deployment on OpenShift with images using OpenShift DeploymentConfigs (dc)
+
+#+BEGIN_SRC ditaa :file ocp-dep-image2.png :cmdline -r
 oc new-app sample.registry.org/user/image:tag
    |
    |                             
@@ -37,7 +62,7 @@
 #+results:
 [[file:ocp-dep-image1.png]]
 
-* Deployment on OpenShift with Source-to-Image (S2I)
+* Deployment on OpenShift with Source-to-Image (S2I) using Kubernetes Deployments
 
 #+BEGIN_SRC ditaa :file ocp-dep-s2i1.png :cmdline -rE
 oc new-app http://git.repo-server.org/sampleapp
@@ -67,6 +92,49 @@
 step   |                      |Trigger
        |                      |watches IS 
        | (3)  +------------------+  (11) creates                      +-----------------------+
+       +--->  | Deployment       | -------------------------------->  | ReplicaSet            |                
+       |      |                  |  (10)                              |                       |
+       |      |                  | -------------------+               +-----------------------+
+       |      +------------------+  creates           |                       |
+       |                                              |                       |scales &
+       |                                              v                       |monitors
+       | (4)  +---------+   load balances   +----------------+                |
+       +--->  | Service |  -------------->  | ApplicationPod |  <-------------+
+              | (SVC)   |                   |                |
+              +---------+                   +----------------+
+#+END_SRC
+
+
+* Deployment on OpenShift with Source-to-Image (S2I) using DeploymentConfigs (dc)
+
+#+BEGIN_SRC ditaa :file ocp-dep-s2i2.png :cmdline -rE
+oc new-app http://git.repo-server.org/sampleapp
+       |
+       |                             
+       | (1)  +-------------+   points to    +----------------------------+    +------------------------------------+
+       +--->  | ImageStream |  ----------->  | internal Registry cBLU {s} |    | external Registry cRED {s}         |
+       |      | (IS)        |<+              | sampleapp:latest           |    | sample.registry.org/ose/s2ibuilder |
+       |      +-------------+ |              +----------------------------+    +------------------------------------+
+       |                      |                  ^                                      ^
+       |                      |                  | (9) docker commits                   | points to
+       |                      |                  |                                      |
+       | (2)  +-------------+ |(5) creates   +--------------+  (6) docker run      +-----------------+
+       +--->  | BuildConfig | |----------->  | BuilderPod   | ------------------>  | S2I ImageStream |
+       |      | (BC)        | |              | (8) assemble |                      | (IS)            |
+       |      +-------------+ |              +--------------+                      +-----------------+
+       |             |        |                  | (7) git clone                        ^
+       |             +--=-----|----=-------------|---=----------------------------------+
+       |       ImageChange    |                  |                                                                   
+       |       Trigger watches|                  v                                                                    
+       |       S2I IS         |              +--------------------------------------+                                
+       |                      |              | git Repository {s}                   |                                
+build  |                      |              | http://git.repo-server.org/sampleapp |                                
+step   |                      :              +--------------------------------------+                                
+-=-----|-=--------------------|--=-------------------------------------------------------------------------------------
+deploy |                      |ImageChange
+step   |                      |Trigger
+       |                      |watches IS 
+       | (3)  +------------------+  (11) creates                      +-----------------------+
        +--->  | DeploymentConfig | -------------------------------->  | ReplicationController |                
        |      | (DC)             |  (10)        +-----------+         | (RC)                  |
        |      |                  | --------->   | DeployPod |         +-----------------------+

--
Gitblit v1.9.3