Skip to content

Commit a907ac6

Browse files
mburke5678mburke5678
authored
Merge pull request #14048 from mburke5678/node-edits
Node edits
2 parents 63c468d + 1d3619e commit a907ac6

11 files changed

+49
-88
lines changed

‎logging/efk-logging-manual-rollout.adoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ toc::[]
77

88

99

10-
<<<<<<< HEAD
11-
=======
12-
{product-title} is configured so that the Elasticsearch
13-
Deployment Config object does not have a Config Change Trigger, meaning
14-
any changes to the DeploymentConfig does not result in an automatic rollout. This prevents
15-
unintended restarts happening in the Elasticsearch cluster, which could create excessive shard
16-
rebalancing as cluster members restart.
17-
>>>>>>> edit
1810

1911
{product-title} supports two Elasticsearch restart procedures:
2012

‎modules/efk-logging-external-syslog.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: fluentd
2626
image: 'quay.io/openshift/origin-logging-fluentd:latest'
2727
env:
28-
- name: REMOTE_SYSLOG_HOST
28+
- name: REMOTE_SYSLOG_HOST <1>
2929
value: host1
3030
- name: REMOTE_SYSLOG_HOST_BACKUP
3131
value: host2

‎modules/efk-logging-uninstall-efk.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ $ oc delete clusterlogging <clusterlogging-name> -n openshift-logging <1>
3232
+
3333
For example:
3434
+
35+
----
3536
$ oc delete clusterlogging instance -n openshift-logging
3637
----

‎modules/nodes-containers-health-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
----
5858
<1> Specifies the image to use for the liveness probe.
5959
<2> Specifies the type of heath check.
60-
<2> Specifies the type of Liveness check:
60+
<3> Specifies the type of Liveness check:
6161
* HTTP Checks. Specify `httpGet`.
6262
* Container Execution Checks. Specify `exec`.
6363
* TCP Socket Check. Specify `tcpSocket`.

‎modules/nodes-nodes-problem-detector-customizing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace: openshift-node-problem-detector
5555
[source,yaml]
5656
----
5757
spec:
58-
kernel-monitor.json: | <8>
58+
kernel-monitor.json: | <1>
5959
{
6060
"plugin": "journald", <2>
6161
"pluginConfig": {
@@ -72,7 +72,7 @@ spec:
7272
"message": "kernel has no deadlock" <7>
7373
}
7474
],
75-
"rules": [
75+
"rules": [ <8>
7676
{
7777
"type": "temporary",
7878
"reason": "OOMKilling",

‎modules/nodes-nodes-problem-detector-installing.adoc

Lines changed: 15 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ You can use the {product-title} console to install the Node Problem Detector Ope
1212
. Create a Project for the NPD:
1313
+
1414
----
15-
$ oc create ns openshift-node-problem-detector --node-selector: ""
15+
$ oc adm new-project openshift-node-problem-detector --node-selector ""
1616
----
1717

18-
. Create an Operator Group
18+
. Create an Operator Group:
19+
20+
.. Add the followng code to a YAML file:
1921
+
2022
----
21-
$ oc create -f - <<EOF
2223
apiVersion: operators.coreos.com/v1alpha2
2324
kind: OperatorGroup
2425
metadata:
@@ -27,7 +28,12 @@ metadata:
2728
spec:
2829
targetNamespaces:
2930
- openshift-node-problem-detector
30-
EOF
31+
----
32+
33+
.. Create the Operator Group:
34+
+
35+
----
36+
$ oc create -f -<file-name>.yaml
3137
----
3238

3339
.Procedure
@@ -61,57 +67,15 @@ If it does not, switch to the *Catalog* → *Operator Management* page and inspe
6167
apiVersion: node-problem-detector.operator.k8s.io/v1alpha1
6268
kind: NodeProblemDetector
6369
metadata:
64-
name: example
65-
namespace: default
70+
name: nodeproblemdetectors.node-problem-detector.operator.k8s.io <1>
71+
namespace: openshift-node-problem-detector <2>
6672
spec: {}
6773
----
6874
<1> Specify a name for the Node Problem Detector.
69-
<2> Specify `openshift-operators` as the namespace.
70-
+
71-
For example:
72-
+
73-
[source,yaml]
74-
----
75-
apiVersion: node-problem-detector.operator.k8s.io/v1alpha1
76-
kind: NodeProblemDetector
77-
metadata:
78-
name: node-problem-detector
79-
namespace: openshift-node-problem-detector
80-
spec: {}
81-
----
75+
<2> Specify `openshift-node-problem-detector` as the namespace.
8276

8377
//Beta steps https://bugzilla.redhat.com/show_bug.cgi?id=1679467
8478

85-
. Create a Node Problem Detector Custom Resource Definition (CRD):
86-
+
87-
[source,yaml]
88-
----
89-
apiVersion: apiextensions.k8s.io/v1beta1
90-
kind: CustomResourceDefinition
91-
metadata:
92-
name: nodeproblemdetectors.node-problem-detector.operator.k8s.io
93-
spec:
94-
group: node-problem-detector.operator.k8s.io
95-
names:
96-
kind: NodeProblemDetector
97-
listKind: NodeProblemDetectorList
98-
plural: nodeproblemdetectors
99-
singular: nodeproblemdetector
100-
scope: Namespaced
101-
version: v1alpha1
102-
----
103-
104-
. Create a Node Problem Detector Service Account (SA):
105-
+
106-
[source,yaml]
107-
----
108-
apiVersion: v1
109-
kind: ServiceAccount
110-
metadata:
111-
name: node-problem-detector-operator
112-
namespace: openshift-node-problem-detector
113-
----
114-
11579
. Create a Node Problem Detector RBAC (RBAC):
11680
+
11781
[source,yaml]
@@ -147,7 +111,7 @@ rules:
147111
verbs:
148112
- "*"
149113
150-
---
114+
--
151115
152116
kind: RoleBinding
153117
apiVersion: rbac.authorization.k8s.io/v1
@@ -201,7 +165,7 @@ roleRef:
201165
name: openshift-node-problem-detector-operator
202166
apiGroup: rbac.authorization.k8s.io
203167
204-
---
168+
----
205169

206170
oc create -f deploy/rbac.yaml
207171
oc create -f deploy/operator.yaml

‎modules/nodes-pods-secrets-certificates-creating.adoc

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,23 @@ $ oc get secrets
5151
NAME TYPE DATA AGE
5252
my-cert kubernetes.io/tls 2 9m
5353
54-
$ oc describe secret my-cert
55-
Name: my-cert
56-
Namespace: openshift-web-console
54+
$ oc describe secret my-service-pod
55+
Name: my-service-pod
56+
Namespace: openshift-console
5757
Labels: <none>
58-
Annotations: service.alpha.openshift.io/expiry=2020-11-19T00:18:54Z
59-
service.alpha.openshift.io/originating-service-name=my-service
60-
service.alpha.openshift.io/originating-service-uid=dce998da-ec59-11e8-bc03-fa163e71c6be
58+
Annotations: kubernetes.io/service-account.name: builder
59+
kubernetes.io/service-account.uid: ab-11e9-988a-0eb4e1b4a396
6160
62-
Type: kubernetes.io/tls
61+
Type: kubernetes.io/service-account-token
6362
6463
Data
65-
====
66-
tls.crt: 2469 bytes
67-
tls.key: 1675 bytes
64+
65+
ca.crt: 5802 bytes
66+
namespace: 17 bytes
67+
token: eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Ii
68+
wia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJvcGVuc2hpZnQtY29uc29sZSIsImt1YmVyb
69+
cnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJhYmE4Y2UyZC00MzVlLTExZTktOTg4YS0wZWI0ZTFiNGEz
70+
OTYiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6b3BlbnNoaWZ
6871
----
6972

7073
. Edit your pod specification with that secret.

‎modules/nodes-pods-secrets-troubleshooting.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ secret, and clearing the following annotations on the service
2121

2222
----
2323
$ oc delete secret <secret_name>
24-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-
25-
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-num-
24+
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-1
25+
$ oc annotate service <service_name> service.alpha.openshift.io/serving-cert-generation-error-num-1
2626
----
2727

2828
[NOTE]

‎modules/nodes-pods-viewing-project.adoc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,20 @@ $ oc get pods
2626
For example:
2727
+
2828
----
29-
$ oc project openshift-web-console
30-
Now using project "openshift-web-console" on server "https://openshift.internal.mburkeaws2.lab.rdu2.cee.redhat.com:443".
31-
[quicklab@master-0 ~]$ oc get pods
32-
NAME READY STATUS RESTARTS AGE
33-
webconsole-7f944b7c85-cbpxb 1/1 Running 44 38d
29+
$ oc get pods
30+
oc get pods -n openshift-console
31+
NAME READY STATUS RESTARTS AGE
32+
console-698d866b78-bnshf 1/1 Running 2 165m
33+
console-698d866b78-m87pm 1/1 Running 2 165m
3434
----
3535
+
3636
Add the `-o wide` flags to view the pod IP address and the node where the pod is located.
3737
+
3838
----
3939
$ oc get pods -o wide
40-
NAME READY STATUS RESTARTS AGE IP NODE
41-
webconsole-7f944b7c85-cbpxb 1/1 Running 44 38d 10.128.0.20 master-0.mburkeaws2.lab.rdu2.cee.redhat.com
40+
41+
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE
42+
console-698d866b78-bnshf 1/1 Running 2 166m 10.128.0.24 ip-10-0-152-71.ec2.internal <none>
43+
console-698d866b78-m87pm 1/1 Running 2 166m 10.129.0.23 ip-10-0-173-237.ec2.internal <none>
44+
4245
----

‎modules/nodes-scheduler-descheduler-installing.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ To install the descheduler:
1515

1616
. In the {product-title} console, click *Catalog* -> *Operator Hub*.
1717

18-
. On the *Operator Hub* page, click *Show Community Operators*.
19-
20-
. Choose *Descheduler* from the list of available Operators, and click *Install*.
18+
. Choose *Elasticsearch Operator* from the list of available Operators, and click *Install*.
2119

2220
. On the *Create Operator Subscription* page, select *All namespaces on the cluster* under *Installation Mode*.
2321
Then, click *Subscribe*.

0 commit comments

Comments
 (0)