Merge branch 'doc-11' into 2.0-rc1

Author: markxnelson

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

@@ -24,5 +24,5 @@ To install ElasticSearch and Kibana, use:
 
 To remove them, use:
 ```
-  kubectl apply -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
+  kubectl delete -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
 ```

kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml

@@ -21,7 +21,7 @@
 #   kubectl apply -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
 #
 # To remove them, use:
-#   kubectl apply -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
+#   kubectl delete -f kubernetes/samples/scripts/elasticsearch_and_kibana.yaml
 
 ---
 apiVersion: apps/v1beta1

site/database.md

@@ -4,15 +4,25 @@ persistent store/leases etc in there
 
 # Running the Oracle Database in Kubernetes
 
-**PLEASE NOTE**:  This page is a work in progress.  We will update this with either better details about how to put the data files onto a persistent volume, or a pointer to the official Oracle Database Kubernetes pages, or both.
+If you wish to run the Oracle Database inside your Kubernetes cluster, in order to place 
+your state store, leasing tables, etc., in that database, then you can use this 
+sample to install the database. 
 
+First create a namespace for the database: 
+
+``` 
+kubectl create namespace database-namespace
 ```
 
+Next, create a file called `database.yml` with the following content.  Make sure you update the
+password field with you chosen administrator password for the database. 
+
+```
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: database
-  namespace: domain2
+  namespace: database-namespace
   labels:
     app: database
     version: 12.1.0.2
@@ -68,7 +78,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: database
-  namespace: domain2
+  namespace: database-namespace
 spec:
   selector:
     app: database
@@ -78,3 +88,30 @@ spec:
     port: 1521
     targetPort: 1521
 ```
+
+If you have not previously done so, you will need to go to the [Oracle Container Registry](https://container-registry.oracle.com)
+and accept the license for the [Oracle database image](https://container-registry.oracle.com/pls/apex/f?p=113:4:11538835301670).
+
+Create a Docker registry secret so that Kubernetes can pull the database image:
+
+``` 
+kubectl create secret docker-registry regsecret \
+        --docker-server=container-registry.oracle.com \
+        [email protected] \
+        --docker-password=your-password \
+        [email protected] \
+        -n database-namespace
+
+```
+
+Now use the following command to install the database:
+
+``` 
+kubectl apply -f database.yml
+```
+
+This will start up the database and expose it in the cluster at the following address:
+
+``` 
+database.database-namespace.svc.cluster.local:1521
+```

site/domains.md

@@ -111,6 +111,8 @@ In Operator 2.0 you can perform lifecycle operations on WebLogic servers, cluste
 
 ### Patching WebLogic and performing application updates
 
+**TODO** write me
+
 ### Scaling clusters
 
 The operator allows you to initiate scaling of clusters in various ways:
@@ -122,5 +124,9 @@ The operator allows you to initiate scaling of clusters in various ways:
 
 ###  Shutting down domains
 
+**TODO** write me
+
 ###  Deleting domains
 (Point to sample)
+
+**TODO** write me

site/user-guide.md

@@ -41,7 +41,7 @@ presented in the correct order.
   * [Deleting domains](domains.md#deleting-domains)
 * [Additional integrations](additional-integrations.md)
   * [Sending WebLogic metrics to Prometheus](additional-integrations.md#sending-weblogic-metrics-to-prometheus)
-
+  * [Running an Oracle database in your cluster](database.md) for state stores, leasing, etc.
 
 ## Important terms