Merge pull request #91 from crobby/rhods110branchpicks

Picks to 1.0.0 branch for v1.0.10

Dockerfile

@@ -23,11 +23,14 @@ COPY opendatahub.yaml $HOME
 ADD monitoring $HOME/monitoring
 ADD consolelink $HOME/consolelink
 ADD groups $HOME/groups
+ADD jupyterhub $HOME/jupyterhub
+ADD partners $HOME/partners
 
 RUN chmod 755 $HOME/deploy.sh && \
     chmod 644 $HOME/opendatahub.yaml && \
     chmod 644 -R $HOME/monitoring && \
     chmod 644 -R $HOME/groups && \
+    chmod 644 -R $HOME/jupyterhub && \
     chown 1001:0 -R $HOME &&\
     chmod ug+rwx -R $HOME
 

deploy.sh

@@ -86,7 +86,11 @@ fi
 
 export jupyterhub_prometheus_api_token=$(openssl rand -hex 32)
 sed -i "s/<jupyterhub_prometheus_api_token>/$jupyterhub_prometheus_api_token/g" monitoring/jupyterhub-prometheus-token-secrets.yaml
-oc apply -n ${ODH_PROJECT} -f monitoring/jupyterhub-prometheus-token-secrets.yaml
+oc create -n ${ODH_PROJECT} -f monitoring/jupyterhub-prometheus-token-secrets.yaml || echo "INFO: Jupyterhub scrape token already exist."
+
+export jupyterhub_postgresql_password=$(openssl rand -hex 32)
+sed -i "s/<jupyterhub_postgresql_password>/$jupyterhub_postgresql_password/g" jupyterhub/jupyterhub-database-password.yaml
+oc create -n ${ODH_PROJECT} -f jupyterhub/jupyterhub-database-password.yaml || echo "INFO: Jupyterhub Password already exist."
 
 oc apply -n ${ODH_PROJECT} -f opendatahub.yaml
 if [ $? -ne 0 ]; then
@@ -157,7 +161,7 @@ oc apply -n $ODH_MONITORING_PROJECT -f monitoring/grafana/grafana.yaml
 
 oc apply -n $ODH_MONITORING_PROJECT -f monitoring/cluster-monitoring/rhods-rules.yaml
 
-oc apply -n $ODH_MONITORING_PROJECT -f monitoring/jupyterhub-db-probe/jupyterhub-db-probe.yaml
+oc apply -n $ODH_PROJECT -f monitoring/jupyterhub-db-probe/jupyterhub-db-probe.yaml
 
 # Add consoleLink CR to provide a link to the odh-dashboard via the Application Launcher in OpenShift
 cluster_domain=$(oc get ingresses.config.openshift.io cluster --template {{.spec.domain}})
@@ -173,3 +177,12 @@ if oc::object::safe::to::apply ${kind} ${resource}; then
 else
   echo "The groups ConfigMap (${kind}/${resource}) has been modified. Skipping apply."
 fi
+
+kind="secret"
+resource="anaconda-ce-access"
+
+if oc::object::safe::to::apply ${kind} ${resource}; then
+  oc apply -n ${ODH_PROJECT} -f partners/anaconda/anaconda-ce-access.yaml
+else
+  echo "The Anaconda base secret (${kind}/${resource}) has been modified. Skipping apply."
+fi

jupyterhub/jupyterhub-database-password.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: jupyterhub-database-password
+  label:
+    app: jupyterhub
+stringData:
+  POSTGRESQL_PASSWORD: <jupyterhub_postgresql_password>

monitoring/jupyterhub-db-probe/jupyterhub-db-probe.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app: jupyterhub-db-probe
   name: jupyterhub-db-probe
-  namespace: redhat-ods-monitoring
+  namespace: redhat-ods-applications
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,15 @@ spec:
         deployment: jupyterhub-db-probe
     spec:
       containers:
-      - name: db-probe
+      - env:
+        - name: JUPYTERHUB_DB_USER
+          value: jupyterhub
+        - name: JUPYTERHUB_DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: jupyterhub-database-password
+              key: POSTGRESQL_PASSWORD
+        name: db-probe
         image: quay.io/modh/jupyterhub-db-probe:v0.2
         imagePullPolicy: Always
         ports:
@@ -41,7 +49,7 @@ metadata:
   labels:
     app: jupyterhub-db-probe
   name: jupyterhub-db-probe
-  namespace: redhat-ods-monitoring
+  namespace: redhat-ods-applications
 spec:
   ports:
   - name: metrics

monitoring/prometheus/prometheus.yaml

@@ -629,7 +629,7 @@ data:
         - role: endpoints
           namespaces:
             names:
-              - redhat-ods-monitoring
+              - redhat-ods-applications
       relabel_configs:
         - source_labels: [__meta_kubernetes_service_name]
           regex: ^(jupyterhub-db-probe)$

opendatahub.yaml

@@ -21,6 +21,7 @@ spec:
     name: jupyterhub
   - kustomizeConfig:
       overlays:
+        - jupyterhub-db-deployment-patch
         - jupyterhub-deployment-patch
       repoRef:
         name: manifests
@@ -41,6 +42,11 @@ spec:
         name: manifests
         path: odh-dashboard
     name: odh-dashboard
+  - kustomizeConfig:
+      repoRef:
+        name: manifests
+        path: partners/anaconda
+    name: anaconda-ce
   repos:
   - name: manifests
     uri: file:///opt/manifests/odh-manifests.tar.gz

partners/anaconda/anaconda-ce-access.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: anaconda-ce-access
+  namespace: redhat-ods-applications
+  labels:
+    opendatahub.io/modified: "false"
+type: Opaque