Update Contributing.md, and add license headers

CONTRIBUTING.md

@@ -1,3 +1,27 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution,
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+
 ## Get involved
 
 * [Slack](http://kubeflow.slack.com/)

components/jupyterhub/docker/Dockerfile

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

components/jupyterhub/docker/Makefile

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,4 +24,4 @@ build:
 push: build
 	gcloud docker -- push ${PROJECT}/jupyterhub-k8s:${VERSION}
 
-.PHONY: all build push
+.PHONY: all build push

components/jupyterhub/manifests/config.yaml

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -107,4 +107,4 @@ data:
     # c.GitHubOAuthenticator.client_secret = '<placeholder>'
 kind: ConfigMap
 metadata:
-  name: jupyterhub-config
+  name: jupyterhub-config

components/jupyterhub/manifests/jupyterhub.yaml

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

components/jupyterhub/manifests/rbac.yaml

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,4 +35,4 @@ subjects:
 roleRef:
   kind: Role
   name: edit-pod
-  apiGroup: rbac.authorization.k8s.io
+  apiGroup: rbac.authorization.k8s.io

components/jupyterhub/manifests/service.yaml

@@ -1,10 +1,10 @@
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,4 +25,4 @@ spec:
     name: http
     targetPort: 8000
   selector:
-    app: tf-hub
+    app: tf-hub

components/k8s-model-server/docker/Dockerfile

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM ubuntu:16.04
 
 MAINTAINER Kenneth Owens <kowens@google.com>
@@ -25,11 +39,11 @@ RUN apt-get update && apt-get install -y \
 
 RUN echo "deb [arch=amd64] http://storage.googleapis.com/tensorflow-serving-apt stable \
  tensorflow-model-server \
- tensorflow-model-server-universal" \ 
+ tensorflow-model-server-universal" \
  | tee /etc/apt/sources.list.d/tensorflow-serving.list && \
  curl https://storage.googleapis.com/tensorflow-serving-apt/tensorflow-serving.release.pub.gpg \
  | apt-key add -
-  
+
 RUN apt-get update && apt-get install -y \
         tensorflow-model-server && \
     apt-get clean && \
@@ -38,6 +52,6 @@ RUN apt-get update && apt-get install -y \
 RUN set -x \
     && useradd $MS_USER \
     && [ `id -u $MS_USER` -eq 1000 ] \
-    && [ `id -g $MS_USER` -eq 1000 ] 
-    
-CMD ["/bin/bash"]
+    && [ `id -g $MS_USER` -eq 1000 ]
+
+CMD ["/bin/bash"]

components/k8s-model-server/docker/Makefile

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 VERSION=1.0
 PROJECT_ID=kubeflow
 PROJECT=gcr.io/${PROJECT_ID}
@@ -11,4 +25,3 @@ push: build
 	gcloud docker -- push ${PROJECT}/model-server:${VERSION}
 
 .PHONY: all build push
-

components/k8s-model-server/manifests/model-server.yaml

@@ -1,16 +1,16 @@
+# Copyright 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ==============================================================================
 
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -61,4 +61,4 @@ spec:
     targetPort: 9000
   selector:
     app: model-server
-  type: LoadBalancer
+  type: LoadBalancer

components/tf-controller/Makefile

@@ -1,14 +1,26 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Create a yaml template to deploy the CRD
 # Requires the template plugin
 # https://github.com/technosophos/helm-template
 CHART := https://storage.googleapis.com/tf-on-k8s-dogfood-releases/latest/tf-job-operator-chart-latest.tgz
-deploy_config: 	
+deploy_config:
 	rm -rf /tmp/tfjob_config_builder
 	mkdir -p /tmp/tfjob_config_builder
 	wget -O /tmp/tfjob_config_builder/tf-job-operator-chart-latest.tgz https://storage.googleapis.com/tf-on-k8s-dogfood-releases/latest/tf-job-operator-chart-latest.tgz
-	tar -C /tmp/tfjob_config_builder -xvf  /tmp/tfjob_config_builder/tf-job-operator-chart-latest.tgz 
+	tar -C /tmp/tfjob_config_builder -xvf  /tmp/tfjob_config_builder/tf-job-operator-chart-latest.tgz
 	# We set the templates to render because we don't want to render the tests.
 	helm template /tmp/tfjob_config_builder/tf-job-operator-chart --set cloud=gke,rbac.install=true  \
 		-x ./templates/config.yaml -x ./templates/deployment.yaml -x ./templates/rbac.yaml -x ./templates/service-account.yaml > deploy_crd.yaml
-		

components/tf-controller/deploy_crd.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ---
 # Source: tf-job-operator-chart/templates/config.yaml
 
@@ -136,4 +150,3 @@ spec:
         - name: config-volume
           configMap:
             name: tf-job-operator-config
-

tf-controller-examples/tf-cnn/Dockerfile.cpu

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Docker image for running examples in Tensorflow models.
 # base_image depends on whether we are running on GPUs or non-GPUs
 FROM tensorflow/tensorflow@sha256:5edc0446cc989ad75bc30631f89f20694fe5bf5226f665d47e5c7f35a3b18484
@@ -13,4 +27,4 @@ RUN git clone https://github.com/tensorflow/benchmarks.git /opt/tf-benchmarks
 
 COPY launcher.py /opt
 RUN chmod u+x /opt/*
-ENTRYPOINT ["/opt/launcher.py"]
+ENTRYPOINT ["/opt/launcher.py"]

tf-controller-examples/tf-cnn/Dockerfile.gpu

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Docker image for running examples in Tensorflow models.
 # base_image depends on whether we are running on GPUs or non-GPUs
 FROM tensorflow/tensorflow@sha256:bfadad8f2c80424d8d6059d3b8cd6947bf23111dc786fc33db72b56b632a1f28
@@ -13,4 +27,4 @@ RUN git clone https://github.com/tensorflow/benchmarks.git /opt/tf-benchmarks
 
 COPY launcher.py /opt
 RUN chmod u+x /opt/*
-ENTRYPOINT ["/opt/launcher.py"]
+ENTRYPOINT ["/opt/launcher.py"]

tf-controller-examples/tf-cnn/Dockerfile.template

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Docker image for running examples in Tensorflow models.
 # base_image depends on whether we are running on GPUs or non-GPUs
 FROM {{base_image}}
@@ -13,4 +27,4 @@ RUN git clone https://github.com/tensorflow/benchmarks.git /opt/tf-benchmarks
 
 COPY launcher.py /opt
 RUN chmod u+x /opt/*
-ENTRYPOINT ["/opt/launcher.py"]
+ENTRYPOINT ["/opt/launcher.py"]

tf-controller-examples/tf-cnn/Makefile

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 REGISTRY := gcr.io/kubeflow
 TAG := $(shell date +v%Y%m%d)-$(shell git describe --tags --always --dirty)-$(shell git diff | sha256sum | cut -c -6)
 DIR := ${CURDIR}
@@ -37,4 +51,4 @@ build-templates:
 	python create_job_specs.py --cpu_image=$(PUBLISHED_CPU) --gpu_image=$(PUBLISHED_GPU) \
 		--no-gpu --num_workers=1 --output=tf_job_cpu.yaml
 	python create_job_specs.py --cpu_image=$(PUBLISHED_CPU) --gpu_image=$(PUBLISHED_GPU) \
-		--no-gpu --num_workers=3 --output=tf_job_cpu_distributed.yaml
+		--no-gpu --num_workers=3 --output=tf_job_cpu_distributed.yaml

tf-controller-examples/tf-cnn/create_job_specs.py

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """A simple script to generate TfJob templates based on various parameters."""
 
 import argparse

tf-controller-examples/tf-cnn/launcher.py

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #!/usr/bin/python
 """A launcher suitable for invoking tf_cnn_benchmarks using TfJob.
 
@@ -82,4 +96,4 @@ if __name__ == "__main__":
   # just restart the job.
   while True:
     logging.info("Command ran successfully sleep for ever.")
-    time.sleep(600)
+    time.sleep(600)

tf-controller-examples/tf-cnn/tf_job_cpu.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: tensorflow.org/v1alpha1
 kind: TfJob
 metadata:

tf-controller-examples/tf-cnn/tf_job_cpu_distributed.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: tensorflow.org/v1alpha1
 kind: TfJob
 metadata:

tf-controller-examples/tf-cnn/tf_job_gpu.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: tensorflow.org/v1alpha1
 kind: TfJob
 metadata:

tf-controller-examples/tf-cnn/tf_job_gpu_distributed.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: tensorflow.org/v1alpha1
 kind: TfJob
 metadata: