Skip to content

Commit 872e6e7

Browse files
bkribbs15bkribbs15
authored
Merge pull request #3 from ibm-cloud-architecture/bck-updates
formatting updates
2 parents 33cf24a + 942daef commit 872e6e7

File tree

9 files changed

+175
-120
lines changed

9 files changed

+175
-120
lines changed

‎docs/openshift/configuration/secrets/index.md‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,31 +96,48 @@ spec:
9696
```
9797
9898
=== "OpenShift"
99-
**Create files needed for rest of example.**
100-
` echo -n 'admin' > ./username.txt
99+
100+
**Create files needed for rest of example**
101+
102+
```
103+
echo -n 'admin' > ./username.txt
101104
echo -n '1f2d1e2e67df' > ./password.txt
102-
`
103-
**Creating Secret from files.**
104-
` oc create secret generic db-user-pass --from-file=./username.txt --from-file=./password.txt
105-
`
106-
**Getting Secret**
107-
` oc get secrets
108-
`
109-
**Gets the Secret's Description.**
110-
` oc describe secrets/db-user-pass
111-
`
105+
```
106+
107+
**Creating Secret from files**
108+
109+
```
110+
oc create secret generic db-user-pass --from-file=./username.txt --from-file=./password.txt
111+
```
112+
113+
**Getting Secret**
114+
115+
```
116+
oc get secrets
117+
```
118+
119+
**Gets the Secret's Description**
120+
121+
```
122+
oc describe secrets/db-user-pass
123+
```
112124

113125
=== "Kubernetes"
114-
**Create files needed for rest of example**
115-
` echo -n 'admin' > ./username.txt
126+
127+
**Create files needed for rest of example**
128+
```
129+
echo -n 'admin' > ./username.txt
116130
echo -n '1f2d1e2e67df' > ./password.txt
117-
`
118-
**Creates the Secret from the files**
119-
` kubectl create secret generic db-user-pass --from-file=./username.txt --from-file=./password.txt
120-
`
121-
**Gets the Secret**
122-
` kubectl get secrets
123-
`
124-
**Gets the Secret's Description**
125-
` kubectl describe secrets/db-user-pass
126-
`
131+
```
132+
**Creates the Secret from the files**
133+
```
134+
kubectl create secret generic db-user-pass --from-file=./username.txt --from-file=./password.txt
135+
```
136+
**Gets the Secret**
137+
```
138+
kubectl get secrets
139+
```
140+
**Gets the Secret's Description**
141+
```
142+
kubectl describe secrets/db-user-pass
143+
```

‎docs/openshift/configuration/security-contexts/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ spec:
8989
path: /etc/message
9090
```
9191

92-
**Run to see the errors**
92+
**_Run to see the errors_**
9393

9494
=== "OpenShift"
9595

‎docs/openshift/pods/health-checks/index.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ Prometheus, a CNCF project, can natively monitor Kubernetes, nodes, and Promethe
141141

142142
=== "OpenShift"
143143

144-
[Monitoring Application Health :fontawesome-brands-watchman-monitoring:](https://docs.openshift.com/container-platform/4.13/applications/application-health.html){ .md-button target="_blank"}
144+
[Monitoring Application Health :fontawesome-solid-binoculars:](https://docs.openshift.com/container-platform/4.13/applications/application-health.html){ .md-button target="_blank"}
145145

146146
=== "Kubernetes"
147147

148-
[Monitoring Resource Usage :fontawesome-brands-watchman-monitoring:](https://kubernetes.io/docs/tasks/debug-application-cluster/resource-usage-monitoring/){ .md-button target="_blank"}
148+
[Monitoring Resource Usage :fontawesome-solid-binoculars:](https://kubernetes.io/docs/tasks/debug-application-cluster/resource-usage-monitoring/){ .md-button target="_blank"}
149149

150-
[Resource Metrics :fontawesome-brands-watchman-monitoring:](https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/){ .md-button target="_blank"}
150+
[Resource Metrics :fontawesome-solid-binoculars:](https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/){ .md-button target="_blank"}
151151

152152
### References
153153

@@ -199,10 +199,10 @@ spec:
199199

200200
=== "OpenShift"
201201

202-
````
203-
oc get projects
204-
oc api-resources -o wide
205-
oc api-resources -o name
202+
```
203+
oc get projects
204+
oc api-resources -o wide
205+
oc api-resources -o name
206206

207207
oc get nodes,ns,po,deploy,svc
208208

@@ -237,4 +237,3 @@ oc api-resources -o name
237237
| --------------------- | -------------------------------------------------------------------- | :----------------------------------------------- |
238238
| **_Try It Yourself_** | | |
239239
| Probes | Create some Health & Startup Probes to find what's causing an issue. | [Probes](../../../labs/kubernetes/lab4/index.md) |
240-
````

‎docs/openshift/pods/index.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ A Pod encapsulates an application’s container (or, in some cases, multiple con
99
=== "OpenShift"
1010

1111
[About Pods :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.3/nodes/pods/nodes-pods-using.html){ .md-button target="_blank"}
12-
12+
1313
[Cluster Configuration for Pods :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.3/nodes/pods/nodes-pods-configuring.html){ .md-button target="_blank"}
14-
14+
1515
[Pod Autoscaling :fontawesome-solid-globe:](https://docs.openshift.com/container-platform/4.3/nodes/pods/nodes-pods-autoscaling.html){ .md-button target="_blank"}
1616

1717
=== "Kubernetes"
@@ -116,7 +116,7 @@ spec:
116116

117117
## Activities
118118

119-
| Task | Description | Link |
120-
| --------------------------------| ------------------ |:----------- |
121-
| *** Try It Yourself *** | | |
122-
| Creating Pods | Create a Pod YAML file to meet certain parameters | [Pod Creation](../../labs/kubernetes/lab1/index.md) |
119+
| Task | Description | Link |
120+
| --------------------- | ------------------------------------------------- | :-------------------------------------------------- |
121+
| **_Try It Yourself_** | | |
122+
| Creating Pods | Create a Pod YAML file to meet certain parameters | [Pod Creation](../../labs/kubernetes/lab1/index.md) |

‎docs/openshift/pods/jobs/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ All CronJob schedule: times are based on the timezone of the master where the jo
1515
=== "OpenShift"
1616

1717
[Jobs :fontawesome-solid-briefcase:](https://docs.openshift.com/container-platform/4.3/nodes/jobs/nodes-nodes-jobs.html){ .md-button target="_blank"}
18+
1819
[CronJobs :fontawesome-solid-briefcase:](https://docs.openshift.com/container-platform/4.3/nodes/jobs/nodes-nodes-jobs.html#nodes-nodes-jobs-creating-cron_nodes-nodes-jobs){ .md-button target="_blank"}
1920

2021
=== "Kubernetes"
2122

2223
[Jobs to Completion :fontawesome-solid-briefcase:](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/){ .md-button target="_blank"}
24+
2325
[Cron Jobs :fontawesome-solid-briefcase:](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/){ .md-button target="_blank"}
26+
2427
[Automated Tasks with Cron :fontawesome-solid-briefcase:](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/){ .md-button target="_blank"}
2528

2629
## References

‎docs/openshift/pods/multi-container/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Container images solve many real-world problems with existing packaging and depl
66

77
=== "Kubernetes"
88

9-
[Sidecar Logging :fontawesome-solid-bxoes-stacked:](https://kubernetes.io/docs/concepts/cluster-administration/logging/#using-a-sidecar-container-with-the-logging-agent){.md-button target="_blank"}
9+
[Sidecar Logging :fontawesome-solid-boxes-stacked:](https://kubernetes.io/docs/concepts/cluster-administration/logging/#using-a-sidecar-container-with-the-logging-agent){.md-button target="_blank"}
1010

1111
[Shared Volume Communication :fontawesome-solid-boxes-stacked:](https://kubernetes.io/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume/){.md-button target="_blank"}
1212

‎docs/openshift/pods/troubleshooting/index.md‎

Lines changed: 112 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -21,82 +21,120 @@ Usually is getting familiar with how primitives objects interact with each other
2121
## References
2222

2323
=== "OpenShift"
24-
**MacOS/Linux/Windows command:**
25-
`bash
26-
oc apply -f https://gist.githubusercontent.com/csantanapr/e823b1bfab24186a26ae4f9ec1ff6091/raw/1e2a0cca964c7b54ce3df2fc3fbf33a232511877/debugk8s-bad.yaml
27-
`
28-
**Expose the service using port-forward**
29-
` oc port-forward service/my-service 8080:80 -n debug
30-
`
31-
**Try to access the service**
32-
` curl http://localhost:8080
33-
`
34-
**Try Out these Commands to Debug**
35-
` oc get pods --all-namespaces
36-
`
37-
` oc project debug
38-
`
39-
` oc get deployments
40-
`
41-
` oc describe pod
42-
`
43-
` oc explain Pod.spec.containers.resources.requests
44-
`
45-
` oc explain Pod.spec.containers.livenessProbe
46-
`
47-
` oc edit deployment
48-
`
49-
` oc logs
50-
`
51-
` oc get service
52-
`
53-
` oc get ep
54-
`
55-
` oc describe service
56-
`
57-
` oc get pods --show-labels
58-
`
59-
` oc get deployment --show-labels
60-
`
24+
25+
**MacOS/Linux/Windows command:**
26+
```
27+
oc apply -f https://gist.githubusercontent.com/csantanapr/e823b1bfab24186a26ae4f9ec1ff6091/raw/1e2a0cca964c7b54ce3df2fc3fbf33a232511877/debugk8s-bad.yaml
28+
```
29+
30+
**Expose the service using port-forward**
31+
```
32+
oc port-forward service/my-service 8080:80 -n debug
33+
```
34+
35+
**Try to access the service**
36+
```
37+
curl http://localhost:8080
38+
```
39+
40+
**Try Out these Commands to Debug**
41+
```
42+
oc get pods --all-namespaces
43+
```
44+
```
45+
oc project debug
46+
```
47+
```
48+
oc get deployments
49+
```
50+
```
51+
oc describe pod
52+
```
53+
```
54+
oc explain Pod.spec.containers.resources.requests
55+
```
56+
```
57+
oc explain Pod.spec.containers.livenessProbe
58+
```
59+
```
60+
oc edit deployment
61+
```
62+
```
63+
oc logs
64+
```
65+
```
66+
oc get service
67+
```
68+
```
69+
oc get ep
70+
```
71+
```
72+
oc describe service
73+
```
74+
```
75+
oc get pods --show-labels
76+
```
77+
```
78+
oc get deployment --show-labels
79+
```
6180

6281
=== "Kubernetes"
63-
**MacOS/Linux/Windows command:**
64-
`bash
65-
kubectl apply -f https://gist.githubusercontent.com/csantanapr/e823b1bfab24186a26ae4f9ec1ff6091/raw/1e2a0cca964c7b54ce3df2fc3fbf33a232511877/debugk8s-bad.yaml
66-
`
67-
**Expose the service using port-forward**
68-
` kubectl port-forward service/my-service 8080:80 -n debug
69-
`
70-
**Try to access the service**
71-
` curl http://localhost:8080
72-
`
73-
**Try Out these Commands to Debug**
74-
` kubectl get pods --all-namespaces
75-
`
76-
` kubectl config set-context --current --namespace=debug
77-
`
78-
` kubectl get deployments
79-
`
80-
` kubectl describe pod
81-
`
82-
` kubectl explain Pod.spec.containers.resources.requests
83-
`
84-
` kubectl explain Pod.spec.containers.livenessProbe
85-
`
86-
` kubectl edit deployment
87-
`
88-
` kubectl logs
89-
`
90-
` kubectl get service
91-
`
92-
` kubectl get ep
93-
`
94-
` kubectl describe service
95-
`
96-
` kubectl get pods --show-labels
97-
`
98-
` kubectl get deployment --show-labels
99-
`
82+
83+
**MacOS/Linux/Windows command:**
84+
```
85+
kubectl apply -f https://gist.githubusercontent.com/csantanapr/e823b1bfab24186a26ae4f9ec1ff6091/raw/1e2a0cca964c7b54ce3df2fc3fbf33a232511877/debugk8s-bad.yaml
86+
```
87+
88+
**Expose the service using port-forward**
89+
```
90+
kubectl port-forward service/my-service 8080:80 -n debug
91+
```
92+
93+
**Try to access the service**
94+
```
95+
curl http://localhost:8080
96+
```
97+
98+
**Try Out these Commands to Debug**
99+
```
100+
kubectl get pods --all-namespaces
101+
```
102+
```
103+
kubectl config set-context --current --namespace=debug
104+
```
105+
```
106+
kubectl get deployments
107+
```
108+
```
109+
kubectl describe pod
110+
```
111+
```
112+
kubectl explain Pod.spec.containers.resources.requests
113+
```
114+
```
115+
kubectl explain Pod.spec.containers.livenessProbe
116+
```
117+
```
118+
kubectl edit deployment
119+
```
120+
```
121+
kubectl logs
122+
```
123+
```
124+
kubectl get service
125+
```
126+
```
127+
kubectl get ep
128+
```
129+
```
130+
kubectl describe service
131+
```
132+
```
133+
kubectl get pods --show-labels
134+
```
135+
```
136+
kubectl get deployment --show-labels
137+
```
100138

101139
## Activities
102140

‎docs/openshift/services-networking/index.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ spec:
8383
stern . -n default
8484
```
8585

86-
```
87-
88-
```
86+
<Tab>
87+
</Tab>
8988

9089
=== "OpenShift"
9190

‎docs/openshift/services-networking/services.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ spec:
8383
stern . -n default
8484
```
8585

86-
```
87-
88-
```
86+
<Tab>
87+
</Tab>
8988

9089
=== "OpenShift"
9190

0 commit comments

Comments
 (0)