Merge pull request #65125 from mburke5678/applications-fix-errors-2

Applications fix errors 2

Author: mburke5678

applications/application-health.adoc

@@ -21,7 +21,10 @@ include::modules/application-health-configuring.adoc[leveloffset=+1]
 
 include::modules/odc-monitoring-application-health-using-developer-perspective.adoc[leveloffset=+1]
 
+// cannot add health checks in web console
+ifdef::openshift-rosa,openshift-dedicated[]
 include::modules/odc-adding-health-checks.adoc[leveloffset=+1]
+endif::openshift-rosa,openshift-dedicated[]
 
 include::modules/odc-editing-health-checks.adoc[leveloffset=+1]
 

applications/connecting_applications_to_services/binding-workloads-using-sbo.adoc

@@ -45,7 +45,6 @@ include::modules/sbo-unbinding-workloads-from-a-backing-service.adoc[leveloffset
 [id="additional-resources_binding-workloads-sbo"]
 == Additional resources
 * xref:../../applications/connecting_applications_to_services/understanding-service-binding-operator.adoc#binding-a-workload-together-with-a-backing-service_understanding-service-binding-operator[Binding a workload together with a backing service].
-* xref:../../applications/connecting_applications_to_services/getting-started-with-service-binding.adoc#connecting-the-spring-petclinic-sample-application-to-the-postgresql-database-service[Connecting the Spring PetClinic sample application to the PostgreSQL database service].
+* xref:../../applications/connecting_applications_to_services/getting-started-with-service-binding.adoc#sbo-connecting-spring-petclinic-sample-app-to-postgresql-database-service_getting-started-with-service-binding[Connecting the Spring PetClinic sample application to the PostgreSQL database service].
 * xref:../../operators/understanding/crds/crd-managing-resources-from-crds.adoc#crd-creating-custom-resources-from-file_crd-managing-resources-from-crds[Creating custom resources from a file]
 * link:https://redhat-developer.github.io/service-binding-operator/userguide/binding-workloads-using-sbo/custom-path-injection.html#_workload_resource_mapping[Example schema of the ClusterWorkloadResourceMapping resource].
-

modules/application-health-about.adoc

@@ -75,7 +75,7 @@ metadata:
   labels:
     test: health-check
   name: my-application
-...
+# ...
 spec:
   containers:
   - name: goproxy-app <1>
@@ -86,7 +86,7 @@ spec:
         command: <5>
         - cat
         - /tmp/healthy
-...
+# ...
 ----
 
 <1> The container name.
@@ -104,7 +104,7 @@ metadata:
   labels:
     test: health-check
   name: my-application
-...
+# ...
 spec:
   containers:
   - name: goproxy-app <1>
@@ -124,7 +124,7 @@ spec:
         port: 8080 <9>
       failureThreshold: 30 <10>
       periodSeconds: 10 <11>
-...
+# ...
 ----
 
 <1> The container name.
@@ -148,7 +148,7 @@ metadata:
   labels:
     test: health-check
   name: my-application
-...
+# ...
 spec:
   containers:
   - name: goproxy-app <1>
@@ -163,7 +163,7 @@ spec:
       periodSeconds: 10 <6>
       successThreshold: 1 <7>
       failureThreshold: 3 <8>
-...
+# ...
 ----
 
 <1> The container name.
@@ -180,9 +180,12 @@ spec:
 ----
 kind: Deployment
 apiVersion: apps/v1
-...
+metadata:
+  labels:
+    test: health-check
+  name: my-application
 spec:
-...
+# ...
   template:
     spec:
       containers:
@@ -204,7 +207,7 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             failureThreshold: 3
-...
+# ...
 ----
 <1> The readiness probe.
 <2> The liveness probe.

modules/application-health-configuring.adoc

@@ -91,7 +91,7 @@ $ oc create -f <file-name>.yaml
 +
 [source,terminal]
 ----
-$ oc describe pod health-check
+$ oc describe pod my-application
 ----
 +
 .Example output

modules/deployments-ab-testing-lb.adoc

@@ -76,11 +76,14 @@ $ oc edit route <route_name>
 .Example output
 [source,terminal]
 ----
-...
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
 metadata:
   name: route-alternate-service
   annotations:
     haproxy.router.openshift.io/balance: roundrobin
+# ...
 spec:
   host: ab-example.my-project.my-domain
   to:
@@ -91,7 +94,7 @@ spec:
   - kind: Service
     name: ab-example-b
     weight: 15
-...
+# ...
 ----
 
 [id="deployments-ab-testing-lb-web_{context}"]
@@ -212,6 +215,10 @@ Not all routers may support multiple or weighted backends.
 [source,terminal]
 ----
 $ oc new-app openshift/deployment-example --name=ab-example-a --as-deployment-config=true --labels=ab-example=true --env=SUBTITLE\=shardA
+----
++
+[source,terminal]
+----
 $ oc delete svc/ab-example-a
 ----
 +
@@ -222,6 +229,10 @@ The application is deployed and a service is created. This is the first shard.
 [source,terminal]
 ----
 $ oc expose deployment ab-example-a --name=ab-example --selector=ab-example\=true
+----
++
+[source,terminal]
+----
 $ oc expose service ab-example
 ----
 
@@ -234,6 +245,10 @@ $ oc expose service ab-example
 $ oc new-app openshift/deployment-example:v2 \
     --name=ab-example-b --labels=ab-example=true \
     SUBTITLE="shard B" COLOR="red" --as-deployment-config=true
+----
++
+[source,terminal]
+----
 $ oc delete svc/ab-example-b
 ----
 

modules/deployments-accessing-private-repos.adoc

@@ -12,7 +12,11 @@ You can add a secret to your `DeploymentConfig` object so that it can access ima
 
 . Create a new project.
 
-. From the *Workloads* page, create a secret that contains credentials for accessing a private image repository.
+. Navigate to *Workloads* -> *Secrets*. 
+
+. Create a secret that contains credentials for accessing a private image repository.
+
+. Navigate to *Workloads* -> *DeploymentConfigs*. 
 
 . Create a `DeploymentConfig` object.
 

modules/deployments-assigning-pods-to-nodes.adoc

@@ -23,10 +23,13 @@ a `Pod` template:
 ----
 apiVersion: v1
 kind: Pod
+metadata:
+  name: my-pod
+# ...
 spec:
   nodeSelector:
     disktype: ssd
-...
+# ...
 ----
 +
 Pods created when the node selector is in place are assigned to nodes with the

modules/deployments-custom-strategy.adoc

@@ -10,14 +10,22 @@ The custom strategy allows you to provide your own deployment behavior.
 .Example custom strategy definition
 [source,yaml]
 ----
-strategy:
-  type: Custom
-  customParams:
-    image: organization/strategy
-    command: [ "command", "arg1" ]
-    environment:
-      - name: ENV_1
-        value: VALUE_1
+kind: DeploymentConfig
+apiVersion: apps.openshift.io/v1
+metadata:
+  name: example-dc
+# ...
+spec:
+# ...
+  strategy:
+    type: Custom
+    customParams:
+      image: organization/strategy
+      command: [ "command", "arg1" ]
+      environment:
+        - name: ENV_1
+          value: VALUE_1
+
 ----
 
 In the above example, the `organization/strategy` container image provides the deployment behavior. The optional `command` array overrides any `CMD` directive specified in the image's `Dockerfile`. The optional environment variables provided are added to the execution environment of the strategy process.
@@ -42,18 +50,25 @@ Alternatively, use the `customParams` object to inject the custom deployment log
 
 [source,yaml]
 ----
-strategy:
-  type: Rolling
-  customParams:
-    command:
-    - /bin/sh
-    - -c
-    - |
-      set -e
-      openshift-deploy --until=50%
-      echo Halfway there
-      openshift-deploy
-      echo Complete
+kind: DeploymentConfig
+apiVersion: apps.openshift.io/v1
+metadata:
+  name: example-dc
+# ...
+spec:
+# ...
+  strategy:
+    type: Rolling
+    customParams:
+      command:
+      - /bin/sh
+      - -c
+      - |
+        set -e
+        openshift-deploy --until=50%
+        echo Halfway there
+        openshift-deploy
+        echo Complete
 ----
 
 This results in following deployment:

modules/deployments-exec-cmd-in-container.adoc

@@ -14,29 +14,46 @@ You can add a command to a container, which modifies the container's startup beh
 +
 [source,yaml]
 ----
+kind: DeploymentConfig
+apiVersion: apps.openshift.io/v1
+metadata:
+  name: example-dc
+# ...
 spec:
-  containers:
-  - name: <container_name>
-    image: 'image'
-    command:
-      - '<command>'
-    args:
-      - '<argument_1>'
-      - '<argument_2>'
-      - '<argument_3>'
+  template:
+# ...
+    spec:
+     containers:
+     - name: <container_name>
+       image: 'image'
+       command:
+         - '<command>'
+       args:
+         - '<argument_1>'
+         - '<argument_2>'
+         - '<argument_3>'
 ----
 +
 For example, to execute the `java` command with the `-jar` and `/opt/app-root/springboots2idemo.jar` arguments:
 +
 [source,yaml]
 ----
+kind: DeploymentConfig
+apiVersion: apps.openshift.io/v1
+metadata:
+  name: example-dc
+# ...
 spec:
-  containers:
-  - name: example-spring-boot
-    image: 'image'
-    command:
-      - java
-    args:
-      - '-jar'
-      - /opt/app-root/springboots2idemo.jar
+  template:
+# ...
+    spec:
+      containers:
+        - name: example-spring-boot
+          image: 'image'
+          command:
+            - java
+          args:
+            - '-jar'
+            - /opt/app-root/springboots2idemo.jar
+# ...
 ----

modules/deployments-recreate-strategy.adoc

@@ -10,12 +10,19 @@ The recreate strategy has basic rollout behavior and supports lifecycle hooks fo
 .Example recreate strategy definition
 [source,yaml]
 ----
-strategy:
-  type: Recreate
-  recreateParams: <1>
-    pre: {} <2>
-    mid: {}
-    post: {}
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: hello-openshift
+# ...
+spec:
+# ...
+  strategy:
+    type: Recreate
+    recreateParams: <1>
+      pre: {} <2>
+      mid: {}
+      post: {}
 ----
 
 <1> `recreateParams` are optional.