Skip to content

Commit 98e1271

Browse files
authored
Ocp101 lab fix (#98)
* update istag content * fix indentation issu * added command * fix account * fix mongodb type
1 parent 569dbdc commit 98e1271

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

101-lab/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ This directory contains all the contents and infrastrcture to run an instance of
88
1. Locally:
99
You can build and deploy the docker image with `docker build -t 101-lab:1.0.0 .` and `docker run -p 2015:2015 101-lab:1.0.0`
1010

11-
2. Openshift:
12-
You can deploy this to openshift by processing and applying the `app.yaml` openshift template.
11+
2. OpenShift:
12+
You can deploy this to openshift by processing and applying the `app.yaml` openshift template:
13+
```shell
14+
oc -n [-tools] process -f app.yaml -p APP=[ocp101-march] | oc -n [-tools] create -f -
15+
```

101-lab/content/03_deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ oc -n openshift get template/mongodb-ephemeral -o json | oc process -f - --param
201201
# using oc rollout latest; or
202202
oc -n [-dev] rollout latest mongodb-[username]
203203
204-
# using watch
205-
oc -n [-dev] get pods --field-selector=status.phase=Running -l deployment=mongodb-[username] -o 'jsonpath={range .items[*].status.containerStatuses[*]}{.name}{"\t"}{.ready}{"\n"}{end}'
204+
# using watch (please note that MongoDB is deployed as a deployment type object)
205+
oc -n [-dev] get pods --field-selector=status.phase=Running -l deploymentconfig=mongodb-[username] -o 'jsonpath={range .items[*].status.containerStatuses[*]}{.name}{"\t"}{.ready}{"\n"}{end}'
206206
```
207207
You can safely ignore repeated messages as such:
208208
```

provisioning_tools/101-labs/templates/quotas.yaml.j2

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,21 @@ items:
5353
pods: "10"
5454
scopes:
5555
- BestEffort
56-
57-
- apiVersion: v1
58-
kind: LimitRange
59-
metadata:
60-
name: default-limits
61-
namespace: "{{ NAMESPACE }}"
62-
labels:
63-
environment: "{{ ENVIRONMENT }}"
64-
name: "{{ LICENCE_PLATE }}"
65-
provisioned-by: 101-provisioner-playbook
66-
spec:
67-
limits:
68-
- default:
69-
cpu: 250m
70-
memory: 1Gi
71-
defaultRequest:
72-
cpu: 50m
73-
memory: 256Mi
74-
type: Container
56+
- apiVersion: v1
57+
kind: LimitRange
58+
metadata:
59+
name: default-limits
60+
namespace: "{{ NAMESPACE }}"
61+
labels:
62+
environment: "{{ ENVIRONMENT }}"
63+
name: "{{ LICENCE_PLATE }}"
64+
provisioned-by: 101-provisioner-playbook
65+
spec:
66+
limits:
67+
- default:
68+
cpu: 250m
69+
memory: 1Gi
70+
defaultRequest:
71+
cpu: 50m
72+
memory: 256Mi
73+
type: Container

provisioning_tools/101-labs/vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
action: null
22
instructor_list:
33
- patricksimonian@github
4-
- shellyhan@github
4+
- shellyxuehan@github
55
environments:
66
- tools
77
- dev

0 commit comments

Comments
 (0)