Skip to content

Commit 7abb8fc

Browse files
committed
Fix LICENSE and NOTICE
- move legal information about subcomponents from NOTICE to LICENSE - include verbatim copy of subcomponent licenses in LICENSE - add disclaimer regarding third party APIs - fix copyright statements in license headers
1 parent 40a823f commit 7abb8fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+177
-138
lines changed

.ci/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2018 The Gardener Authors.
3+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

.ci/check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2018 The Gardener Authors.
3+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

.ci/integration-tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2018 The Gardener Authors.
3+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

.ci/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright 2018 The Gardener Authors.
3+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

LICENSE.md

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,112 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203+
```
204+
205+
## APIs
206+
207+
This project may include APIs to SAP or third party products or services. The use of these APIs, products and services may be subject to additional agreements. In no event shall the application of the Apache Software License, v.2 to this project grant any rights in or to these APIs, products or services that would alter, expand, be inconsistent with, or supersede any terms of these additional agreements. API means application programming interfaces, as well as their respective specifications and implementing code that allows other software products to communicate with or call on SAP or third party products or services (for example, SAP Enterprise Services, BAPIs, Idocs, RFCs and ABAP calls or other user exits) and may be made available through SAP or third party products, SDKs, documentation or other media.
208+
209+
## Subcomponents
210+
211+
This project includes the following subcomponents that are subject to separate license terms.
212+
Your use of these subcomponents is subject to the separate license terms applicable to
213+
each subcomponent.
214+
215+
OAI Object Model.
216+
https://github.com/go-openapi/spec.
217+
Copyright 2015 go-swagger maintainers.
218+
Apache 2 license (https://github.com/go-openapi/spec/blob/master/LICENSE ).
219+
220+
Glog.
221+
https://github.com/golang/glog.
222+
Copyright 2013 Google Inc. All Rights Reserved.
223+
Apache 2 license (https://github.com/golang/glog/blob/master/LICENSE ).
224+
225+
Prometheus Go Client Library.
226+
https://github.com/prometheus/client_golang.
227+
Copyright 2015 The Prometheus Authors.
228+
Apache 2 license (https://github.com/prometheus/client_golang/blob/master/LICENSE ).
229+
230+
Pflag.
231+
https://github.com/spf13/pflag.
232+
Copyright (c) 2012 Alex Ogier. Copyright (c) 2012 The Go Authors.
233+
BSD 3-clause "New" or "Revised" License (https://github.com/spf13/pflag/blob/master/LICENSE ).
234+
235+
API.
236+
https://github.com/kubernetes/api/.
237+
Copyright 2017 The Kubernetes Authors.
238+
Apache 2 license (https://github.com/kubernetes/api/blob/master/LICENSE ).
239+
240+
APIMachinery.
241+
https://github.com/kubernetes/apimachinery.
242+
Copyright 2017 The Kubernetes Authors.
243+
Apache 2 license (https://github.com/kubernetes/apimachinery/blob/master/LICENSE ).
244+
245+
APIServer.
246+
https://github.com/kubernetes/apiserver.
247+
Copyright 2017 The Kubernetes Authors.
248+
Apache 2 license (https://github.com/kubernetes/apiserver/blob/master/LICENSE ).
249+
250+
Client-go.
251+
https://github.com/kubernetes/client-go.
252+
Copyright 2017 The Kubernetes Authors.
253+
Apache 2 license (https://github.com/kubernetes/client-go/blob/master/LICENSE ).
254+
255+
Code-generator.
256+
https://github.com/kubernetes/code-generator.
257+
Copyright 2017 The Kubernetes Authors.
258+
Apache 2 license (https://github.com/kubernetes/code-generator/blob/master/LICENSE ).
259+
260+
Gengo.
261+
https://github.com/kubernetes/gengo.
262+
Copyright 2017 The Kubernetes Authors.
263+
Apache 2 license (https://github.com/kubernetes/gengo/blob/master/LICENSE ).
264+
265+
Kube OpenAPI.
266+
https://github.com/kubernetes/kube-openapi.
267+
Copyright 2017 The Kubernetes Authors.
268+
Apache 2 license (https://github.com/kubernetes/kube-openapi/blob/master/LICENSE ).
269+
270+
Google Cloud Go SDK.
271+
https://cloud.google.com/compute/docs/api/libraries#google_apis_go_client_library.
272+
Copyright (c) 2011 Google Inc. All rights reserved.
273+
BSD-3 license (https://github.com/google/google-api-go-client/blob/master/LICENSE)
274+
275+
Gophercloud.
276+
https://github.com/gophercloud/gophercloud.
277+
Copyright 2012-2013 Rackspace, Inc.
278+
Apache 2 license (https://github.com/gophercloud/gophercloud/blob/master/LICENSE)
279+
280+
------
281+
## BSD 3-clause "New" or "Revised" License
282+
```
283+
Copyright (c) <year> <author> All rights reserved.
284+
Copyright (c) <year> <author> All rights reserved.
285+
286+
Redistribution and use in source and binary forms, with or without
287+
modification, are permitted provided that the following conditions are
288+
met:
289+
290+
* Redistributions of source code must retain the above copyright
291+
notice, this list of conditions and the following disclaimer.
292+
* Redistributions in binary form must reproduce the above
293+
copyright notice, this list of conditions and the following disclaimer
294+
in the documentation and/or other materials provided with the
295+
distribution.
296+
* Neither the name of Google Inc. nor the names of its
297+
contributors may be used to endorse or promote products derived from
298+
this software without specific prior written permission.
299+
300+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
301+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
302+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
303+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
304+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
305+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
306+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
307+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
308+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
309+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
310+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
203311
```

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2018 The Gardener Authors.
1+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

NOTICE.md

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
## Machine Controller Manager.
2-
Copyright (c) 2017-2018 SAP SE or an SAP affiliate company. All rights reserved.
3-
[Apache 2 license](./LICENSE.md ).
2+
Copyright (c) 2017-2018 SAP SE or an SAP affiliate company. All rights reserved.
43

54
## Seed Source
65

@@ -32,71 +31,3 @@ To the left are the list of copied files -> and to the right the current locatio
3231
pkg/controller/replicaset/replica_set.go -> pkg/controller/machineset.go
3332
pkg/controller/deployment/util/replicaset_util.go -> pkg/controller/machineset_util.go
3433

35-
## Dependencies
36-
37-
The machine-controller-manager includes the following components
38-
39-
OAI Object Model.
40-
https://github.com/go-openapi/spec.
41-
Copyright 2015 go-swagger maintainers.
42-
Apache 2 license (https://github.com/go-openapi/spec/blob/master/LICENSE ).
43-
44-
Glog.
45-
https://github.com/golang/glog.
46-
Copyright 2013 Google Inc. All Rights Reserved.
47-
Apache 2 license (https://github.com/golang/glog/blob/master/LICENSE ).
48-
49-
Prometheus Go Client Library.
50-
https://github.com/prometheus/client_golang.
51-
Copyright 2015 The Prometheus Authors.
52-
Apache 2 license (https://github.com/prometheus/client_golang/blob/master/LICENSE ).
53-
54-
Pflag.
55-
https://github.com/spf13/pflag.
56-
Copyright (c) 2012 Alex Ogier. Copyright (c) 2012 The Go Authors.
57-
BSD 3-clause "New" or "Revised" License (https://github.com/spf13/pflag/blob/master/LICENSE ).
58-
59-
API.
60-
https://github.com/kubernetes/api/.
61-
Copyright 2017 The Kubernetes Authors.
62-
Apache 2 license (https://github.com/kubernetes/api/blob/master/LICENSE ).
63-
64-
APIMachinery.
65-
https://github.com/kubernetes/apimachinery.
66-
Copyright 2017 The Kubernetes Authors.
67-
Apache 2 license (https://github.com/kubernetes/apimachinery/blob/master/LICENSE ).
68-
69-
APIServer.
70-
https://github.com/kubernetes/apiserver.
71-
Copyright 2017 The Kubernetes Authors.
72-
Apache 2 license (https://github.com/kubernetes/apiserver/blob/master/LICENSE ).
73-
74-
Client-go.
75-
https://github.com/kubernetes/client-go.
76-
Copyright 2017 The Kubernetes Authors.
77-
Apache 2 license (https://github.com/kubernetes/client-go/blob/master/LICENSE ).
78-
79-
Code-generator.
80-
https://github.com/kubernetes/code-generator.
81-
Copyright 2017 The Kubernetes Authors.
82-
Apache 2 license (https://github.com/kubernetes/code-generator/blob/master/LICENSE ).
83-
84-
Gengo.
85-
https://github.com/kubernetes/gengo.
86-
Copyright 2017 The Kubernetes Authors.
87-
Apache 2 license (https://github.com/kubernetes/gengo/blob/master/LICENSE ).
88-
89-
Kube OpenAPI.
90-
https://github.com/kubernetes/kube-openapi.
91-
Copyright 2017 The Kubernetes Authors.
92-
Apache 2 license (https://github.com/kubernetes/kube-openapi/blob/master/LICENSE ).
93-
94-
Google Cloud Go SDK.
95-
https://cloud.google.com/compute/docs/api/libraries#google_apis_go_client_library.
96-
Copyright (c) 2011 Google Inc. All rights reserved.
97-
BSD-3 license (https://github.com/google/google-api-go-client/blob/master/LICENSE)
98-
99-
Gophercloud.
100-
https://github.com/gophercloud/gophercloud.
101-
Copyright 2012-2013 Rackspace, Inc.
102-
Apache 2 license (https://github.com/gophercloud/gophercloud/blob/master/LICENSE)

cmd/machine-controller-manager/app/controllermanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
This file was copied and modified from the kubernetes/kubernetes project
1717
https://github.com/kubernetes/kubernetes/release-1.8/cmd/kube-controller-manager/app/controllermanager.go
1818
19-
Modifications Copyright 2017 The Gardener Authors.
19+
Modifications Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
2020
*/
2121

2222
package app

cmd/machine-controller-manager/app/options/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
This file was copied and modified from the kubernetes/kubernetes project
1717
https://github.com/kubernetes/kubernetes/release-1.8/cmd/kube-controller-manager/app/options/options.go
1818
19-
Modifications Copyright 2017 The Gardener Authors.
19+
Modifications Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
2020
*/
2121

2222
package options

cmd/machine-controller-manager/controller_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
This file was copied and modified from the kubernetes/kubernetes project
1717
https://github.com/kubernetes/kubernetes/release-1.8/cmd/kube-controller-manager/controller_manager.go
1818
19-
Modifications Copyright 2017 The Gardener Authors.
19+
Modifications Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
2020
*/
2121

2222
package main

hack/generate-code

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2018 The Gardener Authors.
3+
# Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

pkg/apis/machine/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018 The Gardener Authors.
1+
// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

pkg/apis/machine/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/v1alpha1/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/v1alpha1/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018 The Gardener Authors.
1+
// Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

pkg/apis/machine/v1alpha1/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// +build !ignore_autogenerated
22

33
/*
4-
Copyright 2018 The Gardener Authors.
4+
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/awsmachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/azuremachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/gcpmachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/machine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/machinedeployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/machineset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/validation/openstackmachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/apis/machine/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// +build !ignore_autogenerated
22

33
/*
4-
Copyright 2018 The Gardener Authors.
4+
Copyright (c) 2018 SAP SE or an SAP affiliate company. All rights reserved.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

pkg/controller/awsmachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/controller/azuremachineclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Gardener Authors.
2+
Copyright (c) 2017 SAP SE or an SAP affiliate company. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)