Merge pull request #92 from harshad16/sync-stable

sync master branch with upstream opendatahub stable branch

CONTRIBUTING.md

@@ -1,13 +1,4 @@
-# Kubeflow Contributor Guide
+### Review and Merge Process
 
-Welcome to the Kubeflow project! We'd love to accept your patches and 
-contributions to this project. Please read the 
-[contributor's guide in our docs](https://www.kubeflow.org/docs/about/contributing/).
-
-The contributor's guide
-
-* shows you where to find the Contributor License Agreement (CLA) that you need 
-  to sign,
-* helps you get started with your first contribution to Kubeflow,
-* and describes the pull request and review workflow in detail, including the
-  OWNERS files and automated workflow tool.
+- Once the PR is submitted, you can either select specific reviewers or let the bot to select reviewers [automatically](https://prow.ci.openshift.org/plugins?repo=opendatahub-io%2Fnotebooks).
+- For the PR to be merged, it must receive 2 reviews from the repository [approvals/reviewers](/OWNERS). Following that, an `/approve` comment must be added by someone with approval rights. If the author of the PR has approval rights, it is preferred that they perform the merge action.

OWNERS

@@ -1,6 +1,10 @@
 approvers:
   - atheo89
+  - caponetto
   - harshad16
+  - jiridanek
+  - jstourac
+  - paulovmr
 
 reviewers:
   - atheo89

components/notebook-controller/config/overlays/openshift/kustomization.yaml

@@ -7,10 +7,8 @@ commonLabels:
   app.kubernetes.io/part-of: odh-notebook-controller
   component.opendatahub.io/name: kf-notebook-controller
   opendatahub.io/component: "true"
-
 configurations:
   - params.yaml
-
 configMapGenerator:
   - name: kf-notebook-controller-image-parameters
     env: params.env
@@ -25,7 +23,6 @@ patchesStrategicMerge:
   - remove_namespace_patch.yaml
   - manager_openshift_patch.yaml
   - manager_service_openshift_patch.yaml
-
 vars:
 - name: odh-kf-notebook-controller-image
   objref:

components/notebook-controller/config/overlays/openshift/params.yaml

@@ -1,3 +1,3 @@
 varReference:
 - path: spec/template/spec/containers/image
-  kind: Deployment
+  kind: Deployment

components/odh-notebook-controller/config/base/kustomization.yaml

@@ -17,4 +17,4 @@ vars:
     name: odh-notebook-controller-image-parameters
     apiVersion: v1
   fieldref:
-    fieldpath: data.odh-notebook-controller-image
+    fieldpath: data.odh-notebook-controller-image

components/odh-notebook-controller/config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ resources:
   - manager.yaml
   - service.yaml
 configurations:
-- params.yaml
+- params.yaml

components/odh-notebook-controller/config/manager/params.yaml

@@ -1,3 +1,3 @@
 varReference:
 - path: spec/template/spec/containers/image
-  kind: Deployment
+  kind: Deployment