Sample updates

Author: rjeberhard

kubernetes/samples/scripts/common/utility.sh

@@ -641,7 +641,7 @@ function checkPodState(){
  kubectl -n ${ns} get po ${pname}
 }
 
-# Checks if a pod is available in a given namesapce 
+# Checks if a pod is available in a given namespace
 function checkPod(){
 
  max=20
@@ -676,3 +676,21 @@ function checkPod(){
   exit 1
  fi
 }
+
+# Checks if a service is available in a given namespace
+function checkService(){
+ svc=$1
+ ns=$2
+ startSecs=$SECONDS
+ maxWaitSecs=20
+ while [ -z "`kubectl get service -n ${ns} | grep -w ${svc}`" ]; do
+   if [ $((SECONDS - startSecs)) -lt $maxWaitSecs ]; then
+     echo "Service [$svc] not found after $((SECONDS - startSecs)) seconds, retrying ..."
+     sleep 5
+   else
+     echo "[Error] Could not find Service [$svc] after $((SECONDS - startSecs)) seconds"
+     exit 1
+   fi
+ done
+ echo "Service [$svc] found"
+}

kubernetes/samples/scripts/create-oracle-db-service/README.md

@@ -17,7 +17,7 @@ usage: ./start-db-service.sh -p <nodeport> -i <image> -s <pullsecret> -n <namesp
  -i  Oracle DB Image (optional)
     (default: container-registry.oracle.com/database/enterprise:12.2.0.1-slim)
   -p DB Service NodePort (optional)
-    (default: 30011)
+    (default: 30011, set to 'none' to deploy service without a NodePort)
   -s DB Image PullSecret (optional)
     (default: docker-store)
   -n Configurable Kubernetes NameSpace for Oracle DB Service (optional)"

kubernetes/samples/scripts/create-oracle-db-service/common/oracle.db.yaml

@@ -59,8 +59,10 @@ spec:
           limits:
             cpu: "2"
             memory: "6Gi"
+            ephemeral-storage: "8Gi"
           requests:
             cpu: 500m
+            ephemeral-storage: "6Gi"
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
       dnsPolicy: ClusterFirst

kubernetes/samples/scripts/create-oracle-db-service/start-db-service.sh

@@ -11,9 +11,9 @@ source ${scriptDir}/../common/utility.sh
 function usage {
   echo "usage: ${script} -p <nodeport> -i <image> -s <pullsecret> -n <namespace>  [-h]"
   echo "  -i  Oracle DB Image (optional)"
-  echo "      (default: container-registry.oracle.com/database/enterprise:12.2.0.1-slim ) "
+  echo "      (default: container-registry.oracle.com/database/enterprise:12.2.0.1-slim)"
   echo "  -p DB Service NodePort (optional)"
-  echo "      (default: 30011) "
+  echo "      (default: 30011, set to 'none' to deploy service without a NodePort)"
   echo "  -s DB Image PullSecret (optional)"
   echo "      (default: docker-store) "
   echo "  -n Configurable Kubernetes NameSpace for Oracle DB Service (optional)"
@@ -73,25 +73,40 @@ echo '           - name: docker-store' >> ${scriptDir}/common/oracle.db.yaml
 sed -i -e "s?name: docker-store?name: ${pullsecret}?g" ${scriptDir}/common/oracle.db.yaml
 sed -i -e "s?image:.*?image: ${dbimage}?g" ${scriptDir}/common/oracle.db.yaml
 sed -i -e "s?namespace:.*?namespace: ${namespace}?g" ${scriptDir}/common/oracle.db.yaml
-kubectl apply -f ${scriptDir}/common/oracle.db.yaml
 
-# Modify the NodePort based on input 
-sed -i -e "s?nodePort:.*?nodePort: ${nodeport}?g" ${scriptDir}/common/oracle.db.yaml
+# Modify the NodePort based on input
+if [ "${nodeport}" = "none" ]; then
+  sed -i -e "s? nodePort:? #nodePort:?g" ${scriptDir}/common/oracle.db.yaml
+  sed -i -e "s? type:.*LoadBalancer? #type: LoadBalancer?g" ${scriptDir}/common/oracle.db.yaml
+else
+  sed -i -e "s?[#]*nodePort:.*?nodePort: ${nodeport}?g" ${scriptDir}/common/oracle.db.yaml
+  sed -i -e "s?[#]*type:.*LoadBalancer?type: LoadBalancer?g" ${scriptDir}/common/oracle.db.yaml # default type is ClusterIP
+fi
+
+kubectl delete service oracle-db -n ${namespace} --ignore-not-found
 kubectl apply -f ${scriptDir}/common/oracle.db.yaml
+
 dbpod=`kubectl get po -n ${namespace} | grep oracle-db | cut -f1 -d " " `
+
 checkPod ${dbpod} ${namespace}
 checkPodState ${dbpod} ${namespace} "1/1"
+checkService oracle-db ${namespace}
+
 kubectl get po -n ${namespace}
 kubectl get service -n ${namespace}
 
 kubectl cp ${scriptDir}/common/checkDbState.sh -n ${namespace} ${dbpod}:/home/oracle/
 kubectl exec -it ${dbpod} -n ${namespace} /bin/bash /home/oracle/checkDbState.sh
 if [ $? != 0  ]; then
  echo "######################";
- echo "[ERROR] Could not create Oracle DB Service";
+ echo "[ERROR] Could not create Oracle DB Service, check the pod log for pod ${dbpod} in namespace ${namespace}";
  echo "######################";
  exit -3;
 fi
 
-echo "Oracle DB Service is RUNNING with NodePort [${nodeport}]"
-echo "Oracle DB Service URL [oracle-db.${namespace}.svc.cluster.local:1521/devpdb.k8s]"
+if [ ! "${nodeport}" = "none" ]; then
+  echo "Oracle DB Service is RUNNING with NodePort [${nodeport}]"
+else
+  echo "Oracle DB Service is RUNNING and does not specify a public NodePort"
+fi
+echo "Oracle DB Service URL [oracle-db.${namespace}.svc.cluster.local:1521/devpdb.k8s]"

kubernetes/samples/scripts/create-rcu-schema/common/createRepository.sh

@@ -24,6 +24,8 @@ do
 done
 
 if [ $counter -gt ${max} ]; then
+ echo "Error output from 'java utils.dbping ORACLE_THIN \"sys as sysdba\" SYSPASSWORD ${connectString}' from '$(pwd)/dbping.err':"
+ cat dbping.err
  echo "[ERROR] Oracle DB Service is not ready after [${max}] iterations ..."
  exit -1
 else