Skip to content

Commit 2e6520a

Browse files
rosemarymaranomarkxnelson
authored andcommitted
incorporate edits from Bhavani (#685)
* incorporate edits from Bhavani * fix formating issues * fix file path
1 parent 1785b63 commit 2e6520a

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

kubernetes/samples/scripts/elasticsearch-and-kibana/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ to, therefore, the customer only needs to set elkIntegrationEnabled to true in t
1919

2020
To install ElasticSearch and Kibana, use:
2121
```
22-
kubectl apply -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
22+
kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
2323
```
2424

2525
To remove them, use:
2626
```
27-
kubectl delete -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
28-
```
27+
kubectl delete -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
28+
```

site/quickstart.md

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,25 @@ $ docker pull store/oracle/weblogic:12.2.1.3
3737
f. Then patch the WebLogic image according to these [instructions](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s),
3838
and copy the image to all nodes in your cluster, or put it in a Docker registry that your cluster can access.
3939

40+
g. Grant the Helm service account the `cluster-admin` role:
41+
42+
```
43+
$ cat <<EOF | kubectl apply -f -
44+
apiVersion: rbac.authorization.k8s.io/v1
45+
kind: ClusterRoleBinding
46+
metadata:
47+
name: helm-user-cluster-admin-role
48+
roleRef:
49+
apiGroup: rbac.authorization.k8s.io
50+
kind: ClusterRole
51+
name: cluster-admin
52+
subjects:
53+
- kind: ServiceAccount
54+
name: default
55+
namespace: kube-system
56+
EOF
57+
```
58+
4059
## 2. Create a Traefik (Ingress-based) load balancer.
4160

4261
Use `helm` to install the [Traefik](../kubernetes/samples/charts/traefik/README.md) load balancer. Use the [values.yaml](../kubernetes/samples/charts/traefik/values.yaml) in the sample but set `kubernetes.namespaces` specifically.
@@ -62,25 +81,8 @@ b. Create a service account for the operator in the operator's namespace:
6281
```
6382
$ kubectl create serviceaccount -n sample-weblogic-operator-ns sample-weblogic-operator-sa
6483
```
65-
c. Grant the Helm service account the `cluster-admin` role:
66-
```
67-
$ cat <<EOF | kubectl apply -f -
68-
apiVersion: rbac.authorization.k8s.io/v1
69-
kind: ClusterRoleBinding
70-
metadata:
71-
name: helm-user-cluster-admin-role
72-
roleRef:
73-
apiGroup: rbac.authorization.k8s.io
74-
kind: ClusterRole
75-
name: cluster-admin
76-
subjects:
77-
- kind: ServiceAccount
78-
name: default
79-
namespace: kube-system
80-
EOF
81-
```
8284

83-
3. Use `helm` to install and start the operator from the directory you just cloned:
85+
c. Use `helm` to install and start the operator from the directory you just cloned:
8486

8587
```
8688
$ helm install kubernetes/charts/weblogic-operator \
@@ -90,7 +92,7 @@ $ helm install kubernetes/charts/weblogic-operator \
9092
--set "domainNamespaces={}" \
9193
--wait
9294
```
93-
f. Verify that the operator is up and running by viewing the operator pod's log:
95+
d. Verify that the operator is up and running by viewing the operator pod's log:
9496

9597
```
9698
$ kubectl log -n sample-weblogic-operator-ns -c weblogic-operator deployments/weblogic-operator

0 commit comments

Comments
 (0)