From a216a475156b50fdac1d95e29d4c2790b6388a27 Mon Sep 17 00:00:00 2001 From: Sonu Kumar Singh Date: Thu, 25 May 2023 18:55:39 +0530 Subject: [PATCH] Harmonize license (#7984) --- NOTICE.md | 2 +- hack/cherry-pick-pull.sh | 2 +- pkg/admissioncontroller/webhook/auth/seed/attributes.go | 2 +- pkg/admissioncontroller/webhook/auth/seed/graph/doc.go | 2 +- pkg/component/logging/fluentoperator/custom_resources.go | 2 +- pkg/component/logging/fluentoperator/custom_resources_test.go | 2 +- .../logging/fluentoperator/customresources/cluster_filters.go | 2 +- .../fluentoperator/customresources/cluster_fluent_bit_config.go | 2 +- .../logging/fluentoperator/customresources/cluster_inputs.go | 2 +- .../logging/fluentoperator/customresources/cluster_outputs.go | 2 +- .../logging/fluentoperator/customresources/cluster_parsers.go | 2 +- .../logging/fluentoperator/customresources/fluent_bit.go | 2 +- pkg/component/logging/fluentoperator/fluent_operator.go | 2 +- pkg/component/logging/fluentoperator/fluent_operator_test.go | 2 +- pkg/component/logging/vali/logging_test.go | 2 +- pkg/component/monitoring/logging.go | 2 +- pkg/component/monitoring/logging_test.go | 2 +- pkg/component/nginxingressshoot/logging.go | 2 +- pkg/component/nginxingressshoot/logging_test.go | 2 +- pkg/component/shared/fluent_operator.go | 2 +- pkg/component/shared/fluent_operator_custom_resources.go | 2 +- .../controller/certificatesigningrequest/reconciler.go | 2 +- pkg/envtest/port.go | 2 +- pkg/gardenlet/bootstrap/certificate/certificate_util.go | 2 +- test/framework/cleanup.go | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index d6e6ad838cd..995fbfaa70f 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,5 +1,5 @@ ## Gardener -Copyright (c) 2017-2019 SAP SE or an SAP affiliate company. All rights reserved. +Copyright 2017-2019 SAP SE or an SAP affiliate company. All rights reserved. ## Seed Source diff --git a/hack/cherry-pick-pull.sh b/hack/cherry-pick-pull.sh index 9b895910d49..c23aefffa00 100755 --- a/hack/cherry-pick-pull.sh +++ b/hack/cherry-pick-pull.sh @@ -17,7 +17,7 @@ # This file was copied from the kubernetes/kubernetes project # https://github.com/kubernetes/kubernetes/blob/v1.20.0/hack/cherry_pick_pull.sh # -# Modifications Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. +# Modifications Copyright 2021 SAP SE or an SAP affiliate company. All rights reserved. # Usage Instructions: https://github.com/gardener/gardener/blob/master/docs/development/process.md#cherry-picks diff --git a/pkg/admissioncontroller/webhook/auth/seed/attributes.go b/pkg/admissioncontroller/webhook/auth/seed/attributes.go index 0da354f9b30..d7c0fa873fd 100644 --- a/pkg/admissioncontroller/webhook/auth/seed/attributes.go +++ b/pkg/admissioncontroller/webhook/auth/seed/attributes.go @@ -16,7 +16,7 @@ limitations under the License. The utility functions in this file were copied from the kubernetes/kubernetes project https://github.com/kubernetes/kubernetes/blob/v1.20.2/pkg/registry/authorization/util/helpers.go -Modifications Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. +Modifications Copyright 2021 SAP SE or an SAP affiliate company. All rights reserved. */ package seed diff --git a/pkg/admissioncontroller/webhook/auth/seed/graph/doc.go b/pkg/admissioncontroller/webhook/auth/seed/graph/doc.go index a0b5aafd224..d9004040358 100644 --- a/pkg/admissioncontroller/webhook/auth/seed/graph/doc.go +++ b/pkg/admissioncontroller/webhook/auth/seed/graph/doc.go @@ -16,7 +16,7 @@ limitations under the License. The majority of this package is heavily inspired by the kubernetes/kubernetes implementation for their NodeAuthorizer package, see https://github.com/kubernetes/kubernetes/blob/v1.20.3/plugin/pkg/auth/authorizer/node. -Modifications Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. +Modifications Copyright 2021 SAP SE or an SAP affiliate company. All rights reserved. */ package graph diff --git a/pkg/component/logging/fluentoperator/custom_resources.go b/pkg/component/logging/fluentoperator/custom_resources.go index 9dee2bb3a33..6d43a2fc8eb 100644 --- a/pkg/component/logging/fluentoperator/custom_resources.go +++ b/pkg/component/logging/fluentoperator/custom_resources.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/custom_resources_test.go b/pkg/component/logging/fluentoperator/custom_resources_test.go index 190a1ea72b7..bce9d376907 100644 --- a/pkg/component/logging/fluentoperator/custom_resources_test.go +++ b/pkg/component/logging/fluentoperator/custom_resources_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/cluster_filters.go b/pkg/component/logging/fluentoperator/customresources/cluster_filters.go index d95fc73730f..d557d5e299a 100644 --- a/pkg/component/logging/fluentoperator/customresources/cluster_filters.go +++ b/pkg/component/logging/fluentoperator/customresources/cluster_filters.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/cluster_fluent_bit_config.go b/pkg/component/logging/fluentoperator/customresources/cluster_fluent_bit_config.go index 6e0d14c73c9..d67d3796e04 100644 --- a/pkg/component/logging/fluentoperator/customresources/cluster_fluent_bit_config.go +++ b/pkg/component/logging/fluentoperator/customresources/cluster_fluent_bit_config.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/cluster_inputs.go b/pkg/component/logging/fluentoperator/customresources/cluster_inputs.go index 7db9b2ccd27..3e83a079196 100644 --- a/pkg/component/logging/fluentoperator/customresources/cluster_inputs.go +++ b/pkg/component/logging/fluentoperator/customresources/cluster_inputs.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/cluster_outputs.go b/pkg/component/logging/fluentoperator/customresources/cluster_outputs.go index f2fa774f8e4..7f9847cd8a2 100644 --- a/pkg/component/logging/fluentoperator/customresources/cluster_outputs.go +++ b/pkg/component/logging/fluentoperator/customresources/cluster_outputs.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/cluster_parsers.go b/pkg/component/logging/fluentoperator/customresources/cluster_parsers.go index 61b73378372..61a0808f55d 100644 --- a/pkg/component/logging/fluentoperator/customresources/cluster_parsers.go +++ b/pkg/component/logging/fluentoperator/customresources/cluster_parsers.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/customresources/fluent_bit.go b/pkg/component/logging/fluentoperator/customresources/fluent_bit.go index dc96a87fb4b..d33d9bd6ffe 100644 --- a/pkg/component/logging/fluentoperator/customresources/fluent_bit.go +++ b/pkg/component/logging/fluentoperator/customresources/fluent_bit.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/fluent_operator.go b/pkg/component/logging/fluentoperator/fluent_operator.go index 38b1bdef5d0..98010948f21 100644 --- a/pkg/component/logging/fluentoperator/fluent_operator.go +++ b/pkg/component/logging/fluentoperator/fluent_operator.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/fluentoperator/fluent_operator_test.go b/pkg/component/logging/fluentoperator/fluent_operator_test.go index 17d2c0b1c07..77a8edc2ab6 100644 --- a/pkg/component/logging/fluentoperator/fluent_operator_test.go +++ b/pkg/component/logging/fluentoperator/fluent_operator_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/logging/vali/logging_test.go b/pkg/component/logging/vali/logging_test.go index 3a2f10fdf21..0c6654657fd 100644 --- a/pkg/component/logging/vali/logging_test.go +++ b/pkg/component/logging/vali/logging_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/monitoring/logging.go b/pkg/component/monitoring/logging.go index f541e06a37a..2a9cd693ace 100644 --- a/pkg/component/monitoring/logging.go +++ b/pkg/component/monitoring/logging.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/monitoring/logging_test.go b/pkg/component/monitoring/logging_test.go index e5d105f443f..5f84ead91a2 100644 --- a/pkg/component/monitoring/logging_test.go +++ b/pkg/component/monitoring/logging_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/nginxingressshoot/logging.go b/pkg/component/nginxingressshoot/logging.go index fb69ebc53b1..7c0e2d859ce 100644 --- a/pkg/component/nginxingressshoot/logging.go +++ b/pkg/component/nginxingressshoot/logging.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/nginxingressshoot/logging_test.go b/pkg/component/nginxingressshoot/logging_test.go index 5ec6d75d2de..63bfe473420 100644 --- a/pkg/component/nginxingressshoot/logging_test.go +++ b/pkg/component/nginxingressshoot/logging_test.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/shared/fluent_operator.go b/pkg/component/shared/fluent_operator.go index c2be0c0b6be..a554e285bba 100644 --- a/pkg/component/shared/fluent_operator.go +++ b/pkg/component/shared/fluent_operator.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/component/shared/fluent_operator_custom_resources.go b/pkg/component/shared/fluent_operator_custom_resources.go index 5732683b66b..899b3e74d4f 100644 --- a/pkg/component/shared/fluent_operator_custom_resources.go +++ b/pkg/component/shared/fluent_operator_custom_resources.go @@ -1,4 +1,4 @@ -// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file +// Copyright 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/controllermanager/controller/certificatesigningrequest/reconciler.go b/pkg/controllermanager/controller/certificatesigningrequest/reconciler.go index aa5fe9974f8..554cb97a61c 100644 --- a/pkg/controllermanager/controller/certificatesigningrequest/reconciler.go +++ b/pkg/controllermanager/controller/certificatesigningrequest/reconciler.go @@ -16,7 +16,7 @@ limitations under the License. This file was copied and modified from the kubernetes/kubernetes project https://github.com/kubernetes/kubernetes/blob/release-1.15/pkg/controller/certificates/approver/sarapprove.go -Modifications Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. +Modifications Copyright 2019 SAP SE or an SAP affiliate company. All rights reserved. */ package certificatesigningrequest diff --git a/pkg/envtest/port.go b/pkg/envtest/port.go index 1611c511c50..c99a276b3bb 100644 --- a/pkg/envtest/port.go +++ b/pkg/envtest/port.go @@ -15,7 +15,7 @@ // This file was copied from the kubernetes-sigs/controller-runtime project // https://github.com/kubernetes-sigs/controller-runtime/blob/v0.8.0/pkg/internal/testing/integration/addr/manager.go // -// Modifications Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. +// Modifications Copyright 2021 SAP SE or an SAP affiliate company. All rights reserved. package envtest diff --git a/pkg/gardenlet/bootstrap/certificate/certificate_util.go b/pkg/gardenlet/bootstrap/certificate/certificate_util.go index 6c95ee31fcf..28fdcfad859 100644 --- a/pkg/gardenlet/bootstrap/certificate/certificate_util.go +++ b/pkg/gardenlet/bootstrap/certificate/certificate_util.go @@ -16,7 +16,7 @@ limitations under the License. The utility functions in this file were copied from the kubernetes/client-go project https://github.com/kubernetes/client-go/blob/master/util/certificate/certificate_manager.go -Modifications Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. +Modifications Copyright 2020 SAP SE or an SAP affiliate company. All rights reserved. */ package certificate diff --git a/test/framework/cleanup.go b/test/framework/cleanup.go index cb132dbd206..091dc5c044f 100644 --- a/test/framework/cleanup.go +++ b/test/framework/cleanup.go @@ -16,7 +16,7 @@ limitations under the License. This file was copied from the kubernetes/kubernetes project https://github.com/kubernetes/kubernetes/blob/v1.19.0-rc.4/test/e2e/framework/cleanup.go -Modifications Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. +Modifications Copyright 2020 SAP SE or an SAP affiliate company. All rights reserved. */ package framework