Skip to content
Permalink
Browse files

Issue #472 Restore Kubernetes copyright notices

This reverts commit 6abc7d6.

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
  • Loading branch information...
LalatenduMohanty committed Feb 27, 2017
1 parent f185a14 commit eff0477aa242432aaba284febf9496ebe6cd2371
Showing with 69 additions and 54 deletions.
  1. +1 −1 LICENSE
  2. +1 −1 Makefile
  3. +1 −1 cmd/minishift/cmd/console.go
  4. +1 −1 cmd/minishift/cmd/delete.go
  5. +1 −1 cmd/minishift/cmd/env.go
  6. +1 −1 cmd/minishift/cmd/get_openshift_versions.go
  7. +1 −1 cmd/minishift/cmd/ip.go
  8. +1 −1 cmd/minishift/cmd/logs.go
  9. +1 −1 cmd/minishift/cmd/openshift/restart_test.go
  10. +1 −1 cmd/minishift/cmd/root.go
  11. +1 −1 cmd/minishift/cmd/ssh.go
  12. +1 −1 cmd/minishift/cmd/start.go
  13. +1 −1 cmd/minishift/cmd/status.go
  14. +1 −1 cmd/minishift/cmd/stop.go
  15. +1 −1 cmd/minishift/cmd/version.go
  16. +1 −1 cmd/minishift/main.go
  17. +1 −1 gen_help_text.go
  18. +1 −1 hack/boilerplate/boilerplate.Dockerfile.txt
  19. +1 −1 hack/boilerplate/boilerplate.Makefile.txt
  20. +1 −1 hack/boilerplate/boilerplate.go.txt
  21. +17 −2 hack/boilerplate/boilerplate.py
  22. +1 −1 hack/boilerplate/boilerplate.py.txt
  23. +1 −1 hack/boilerplate/boilerplate.sh.txt
  24. +1 −1 pkg/minikube/cluster/cluster.go
  25. +1 −1 pkg/minikube/cluster/cluster_darwin.go
  26. +1 −1 pkg/minikube/cluster/cluster_linux.go
  27. +1 −1 pkg/minikube/cluster/cluster_non_darwin_panic.go
  28. +1 −1 pkg/minikube/cluster/cluster_non_linux_panic.go
  29. +1 −1 pkg/minikube/cluster/cluster_test.go
  30. +1 −1 pkg/minikube/cluster/credentials.go
  31. +1 −1 pkg/minikube/config/config.go
  32. +1 −1 pkg/minikube/constants/constants.go
  33. +1 −1 pkg/minikube/kubeconfig/config.go
  34. +1 −1 pkg/minikube/kubeconfig/config_test.go
  35. +1 −1 pkg/minikube/machine/client.go
  36. +1 −1 pkg/minikube/machine/client_test.go
  37. +1 −1 pkg/minikube/sshutil/sshutil.go
  38. +1 −1 pkg/minikube/sshutil/sshutil_test.go
  39. +1 −1 pkg/minikube/tests/api_mock.go
  40. +1 −1 pkg/minikube/tests/driver_mock.go
  41. +1 −1 pkg/minikube/tests/host_mock.go
  42. +1 −1 pkg/minikube/tests/provision_mock.go
  43. +1 −1 pkg/minikube/tests/ssh_mock.go
  44. +1 −1 pkg/minikube/update/update_test.go
  45. +1 −1 pkg/util/constants.go
  46. +1 −1 pkg/util/crypto.go
  47. +1 −1 pkg/util/utils.go
  48. +1 −1 pkg/util/utils_test.go
  49. +1 −1 pkg/version/version.go
  50. +1 −1 test/integration/flags.go
  51. +1 −1 test/integration/ssh_test.go
  52. +1 −1 test/integration/start_stop_delete_test.go
  53. +1 −1 test/integration/util/util.go
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,4 +1,4 @@
# Copyright (C) 2016 Red Hat, Inc.
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,4 +1,4 @@
# Copyright (C) YEAR Red Hat, Inc.
# COPYRIGHTHOLDER.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1,4 +1,4 @@
# Copyright (C) YEAR Red Hat, Inc.
# COPYRIGHTHOLDER.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) YEAR Red Hat, Inc.
COPYRIGHTHOLDER.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright (C) 2016 Red Hat, Inc.
# Copyright 2015 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -54,7 +54,6 @@ def file_passes(filename, refs, regexs):
f = open(filename, 'r')
except:
return False

data = f.read()
f.close()

@@ -96,6 +95,18 @@ def file_passes(filename, refs, regexs):
if found != 0:
break

p = regexs["kubernetes_copyright"]
for i, d in enumerate(data):
(data[i], found) = p.subn('COPYRIGHTHOLDER', d)
if found != 0:
break

p = regexs["redhat_copyright"]
for i, d in enumerate(data):
(data[i], found) = p.subn('COPYRIGHTHOLDER', d)
if found != 0:
break

# if we don't match the reference at this point, fail
if ref != data:
return False
@@ -155,6 +166,10 @@ def get_regexs():
regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
# strip #!.* from shell scripts
regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
# Search for Kubernetes copyright notice
regexs["kubernetes_copyright"] = re.compile(r"(Copyright YEAR The Kubernetes Authors All rights reserved)\n*", re.MULTILINE)
# Search for Red Hat copyright notice
regexs["redhat_copyright"] = re.compile(r"(Copyright \(C\) YEAR Red Hat, Inc)\n*", re.MULTILINE)
return regexs

def main():
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright (C) YEAR Red Hat, Inc.
# COPYRIGHTHOLDER.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1,4 +1,4 @@
# Copyright (C) YEAR Red Hat, Inc.
# COPYRIGHTHOLDER.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
// +build !darwin

/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
// +build !linux

/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
// +build integration

/*
Copyright (C) 2016 Red Hat, Inc.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Oops, something went wrong.

0 comments on commit eff0477

Please sign in to comment.
You can’t perform that action at this time.