Merge pull request #120 from crobby/rhods1016branch

Pull in changes to release branch for v1.0.16
red-hat-data-services · Jul 1, 2021 · 4a269f8 · 4a269f8
2 parents 2df6eca + 839e660
commit 4a269f8
Show file tree

Hide file tree

Showing 21 changed files with 212 additions and 161 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,3 +88,18 @@
 ### Features
 * Update elyra notebook image to v0.0.8 (#419)
 * Add Trino kustomize manifests (#373)
+
+## Release 1.1.0 (2021-06-18T19:42:19)
+### Features
+* support for pre-commit and python-editor (#437)
+* Update JupyterHub to v0.3.0 with new spawner UI and bump s2i-generic-notebook to v0.0.3 (#435)
+* Upgrade superset to 1.1.0 (#426)
+* feat(prometheus): Upgrade operator to 0.47.0 (#399)
+* update seldon operator to 1.7.0 (#397)
+### Improvements
+* switch to rhods based base repo for cuda builds (#438)
+* Updated jupyter deployment config to avoid Imagestream changes (#429)
+* Update JH dashboard (#425)
+* Update JH dashboard jsons (#418)
+* Add builds and buildconfigs read permissions to odh-dashboard role (#440)
+* include minimal python 3.8 with default jlab and git plugin (#407)
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-cluster-role.yaml b/jupyterhub/jupyterhub/base/jupyterhub-cluster-role.yaml
@@ -0,0 +1,24 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  labels:
+    app: jupyterhub
+  name: jupyterhub-cluster
+rules:
+  - verbs:
+      - get
+      - watch
+      - list
+    apiGroups:
+      - ''
+      - config.openshift.io
+    resources:
+      - clusterversions
+  - verbs:
+      - get
+      - list
+      - watch
+    apiGroups:
+      - ''
+    resources:
+      - nodes
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-cluster-rolebinding.yaml b/jupyterhub/jupyterhub/base/jupyterhub-cluster-rolebinding.yaml
@@ -0,0 +1,12 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: jupyterhub-cluster
+subjects:
+  - kind: ServiceAccount
+    name: jupyterhub-hub
+    namespace: $(namespace)
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: jupyterhub-cluster
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-img-imagestream.yaml b/jupyterhub/jupyterhub/base/jupyterhub-img-imagestream.yaml
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-nodereader-rolebinding.yaml b/jupyterhub/jupyterhub/base/jupyterhub-nodereader-rolebinding.yaml
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-role.yaml b/jupyterhub/jupyterhub/base/jupyterhub-role.yaml
@@ -5,6 +5,15 @@ metadata:
     app: jupyterhub
   name: jupyterhub
 rules:
+- apiGroups:
+  - ''
+  - build.openshift.io
+  resources:
+  - builds
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ''
   - image.openshift.io

diff --git a/jupyterhub/jupyterhub/base/kustomization.yaml b/jupyterhub/jupyterhub/base/kustomization.yaml
@@ -13,7 +13,8 @@ resources:
 - jupyterhub-serviceaccount.yaml
 - jupyterhub-role.yaml
 - jupyterhub-rolebinding.yaml
-- jupyterhub-nodereader-rolebinding.yaml
+- jupyterhub-cluster-role.yaml
+- jupyterhub-cluster-rolebinding.yaml
 - jupyterhub-route.yaml
 - jupyterhub-singleuser-profiles-configmap.yaml
 - jupyterhub-singleuser-profiles-sizes-configmap.yaml

diff --git a/jupyterhub/jupyterhub/overlays/build/jupyterhub-buildconfig.yaml b/jupyterhub/jupyterhub/overlays/build/jupyterhub-buildconfig.yaml
@@ -19,7 +19,7 @@ spec:
       memory: 2Gi
   source:
     git:
-      ref: v3.5.1
+      ref: v3.5.3
       uri: https://github.com/opendatahub-io/jupyterhub-quickstart.git
     type: Git
   strategy:

diff --git a/jupyterhub/notebook-images/base/kustomization.yaml b/jupyterhub/notebook-images/base/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- nbviewer-imagestream.yaml
+resources: []
 
 commonLabels:
   opendatahub.io/component: "true"

diff --git a/jupyterhub/notebook-images/base/nbviewer-imagestream.yaml b/jupyterhub/notebook-images/base/nbviewer-imagestream.yaml
diff --git a/jupyterhub/notebook-images/base/spark-notebook-imagestream.yaml b/jupyterhub/notebook-images/base/spark-notebook-imagestream.yaml
@@ -3,6 +3,8 @@ kind: ImageStream
 metadata:
   labels:
     opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-name: "Minimal Python with Apache Spark"
   name: s2i-spark-minimal-notebook
 spec:
   lookupPolicy:

diff --git a/...terhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml b/...terhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml
@@ -14,11 +14,11 @@ spec:
   tags:
   - annotations:
       opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8.3"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17.11"},{"name":"Kafka-Python","version":"2.0.2"},{"name":"Matplotlib","version":"3.1.3"},{"name":"Numpy","version":"1.20.2"},{"name":"Pandas","version":"1.2.3"},{"name":"Scipy","version":"1.6.2"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17.11"},{"name":"Kafka-Python","version":"2.0.2"},{"name":"Matplotlib","version":"3.1.3"},{"name":"Numpy","version":"1.20.3"},{"name":"Pandas","version":"1.2.4"},{"name":"Scipy","version":"1.6.3"}]'
       openshift.io/imported-from: quay.io/thoth-station/s2i-generic-data-science-notebook
     from:
       kind: DockerImage
-      name: quay.io/thoth-station/s2i-generic-data-science-notebook:v0.0.3
-    name: "v0.0.3"
+      name: quay.io/thoth-station/s2i-generic-data-science-notebook:v0.0.4
+    name: "v0.0.4"
     referencePolicy:
       type: Source
diff --git a/jupyterhub/notebook-images/overlays/additional/spark-scipy-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/spark-scipy-notebook-imagestream.yaml
@@ -3,6 +3,8 @@ kind: ImageStream
 metadata:
   labels:
     opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-name: "Minimal Python with Apache Spark and SciPy"
   name: s2i-spark-scipy-notebook
 spec:
   lookupPolicy:

diff --git a/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml b/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml
@@ -93,6 +93,15 @@ items:
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
+    triggers:
+      - imageChange: {}
+        type: ImageChange
+    source:
+      type: Git
+      git:
+        uri: "https://github.com/sclorg/s2i-base-container"
+        ref: "d777ab3"
+      contextDir: "core/"
     strategy:
       type: Docker
       dockerStrategy:
@@ -132,6 +141,15 @@ items:
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
+    triggers:
+      - imageChange: {}
+        type: ImageChange
+    source:
+      type: Git
+      git:
+        uri: "https://github.com/sclorg/s2i-base-container"
+        ref: "d777ab3"
+      contextDir: "base/"
     strategy:
       type: Docker
       dockerStrategy:
@@ -171,6 +189,15 @@ items:
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
+    triggers:
+      - imageChange: {}
+        type: ImageChange
+    source:
+      type: Git
+      git:
+        uri: "https://github.com/sclorg/s2i-python-container"
+        ref: "4d85c35"
+      contextDir: "3.8/"
     strategy:
       type: Docker
       dockerStrategy:
@@ -204,12 +231,23 @@ items:
       limits:
         cpu: "2"
         memory: 4Gi
+        ephemeral-storage: 40Gi
       requests:
         cpu: "1"
         memory: 2Gi
+        ephemeral-storage: 40Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
+    triggers:
+      - imageChange: {}
+        type: ImageChange
+    source:
+      type: Git
+      git:
+        uri: "https://github.com/thoth-station/s2i-thoth"
+        ref: "v0.28.0"
+      contextDir: "ubi8-py38/"
     strategy:
       type: Docker
       dockerStrategy:

diff --git a/odh-dashboard/base/role.yaml b/odh-dashboard/base/role.yaml
@@ -54,3 +54,11 @@ rules:
       - patch
     resources:
       - imagestreams
+      - build.openshift.io
+    verbs:
+      - get
+      - list
+      - watch
+    resources:
+      - builds
+      - buildconfigs
diff --git a/trino/README.md b/trino/README.md
@@ -46,7 +46,7 @@ HTTP endpoint exposed by your S3 object storage solution which will be made avai
 
 #### s3_credentials_secret
 
-Along with `s3_endpoint_url` this parameter configures the Trino's access to S3 object storage. Setting this parameter to any name of local Openshift/Kubernetes Secret resource name would allow Thift Server to consume S3 credentials from it. The secret of choice must contain `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` keys. If not set, credentials from [`aws-secret`](base/aws-secret.yaml) will be used instead.
+Along with `s3_endpoint_url` this parameter configures the Trino's access to S3 object storage. Setting this parameter to any name of local Openshift/Kubernetes Secret resource name would allow Thift Server to consume S3 credentials from it. The secret of choice must contain `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, and `BUCKET` variables. If not set, credentials from [`aws-secret`](base/aws-secret.yaml) will be used instead.
 
 #### trino_environment
 

diff --git a/trino/base/hadoop-config.yaml b/trino/base/hadoop-config.yaml
@@ -5,10 +5,6 @@ metadata:
 stringData:
   core-site.xml: |
     <configuration>
-      <property>
-          <name>fs.defaultFS</name>
-          <value>s3a://XXX_S3ENDPOINT_XXX/</value>
-      </property>
       <property>
           <name>fs.gs.impl</name>
           <value>com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem</value>