From e60162a1fc121da6ce81260fa7b4fafb65519d55 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 19:32:51 +0300 Subject: [PATCH 1/8] Use SPDX copyright and license headers The modern way to specify copyright and license is using SPDX[1] headers. This is nicer for developers and more friendly for programs that want to extract this info. This change replaces existing copyright and license boilerplate with SPDX headers. SPDX headers were added using: reuse init ... reuse addheader \ --copyright 'The RamenDR authors' \ --exclude-year \ --license Apache-2.0 \ --template ramen \ --skip-unrecognised \ `git grep -l -E '^Copyright [0-9]+ The RamenDR'` And removing the duplicate `Copyright` lines created by the `reuse` tool: // Copyright 2022 The RamenDR authors. The copyright excludes the years since this info is not really needed, and this avoids the work of updating all copyrights every year. The hack/boilerplate.go.txt and .golangci.yaml were modified manually. Signed-off-by: Nir Soffer --- .golangci.yaml | 15 +--- .reuse/dep5 | 10 +++ .reuse/templates/ramen.jinja2 | 6 ++ LICENSES/Apache-2.0.txt | 73 +++++++++++++++++++ api/v1alpha1/drcluster_types.go | 17 +---- api/v1alpha1/drplacementcontrol_types.go | 17 +---- api/v1alpha1/drpolicy_types.go | 17 +---- api/v1alpha1/groupversion_info.go | 17 +---- ...otectedvolumereplicationgrouplist_types.go | 17 +---- api/v1alpha1/ramenconfig_types.go | 17 +---- api/v1alpha1/volumereplicationgroup_types.go | 17 +---- api/v1alpha1/zz_generated.deepcopy.go | 17 +---- controllers/drcluster_controller.go | 17 +---- controllers/drcluster_controller_test.go | 16 +--- controllers/drclusters.go | 17 +---- controllers/drplacementcontrol.go | 16 +--- controllers/drplacementcontrol_controller.go | 16 +--- .../drplacementcontrol_controller_test.go | 14 +--- controllers/drpolicy.go | 17 +---- controllers/drpolicy_controller.go | 17 +---- controllers/drpolicy_controller_test.go | 16 +--- controllers/kubeobjects/requests.go | 17 +---- controllers/kubeobjects/velero/requests.go | 17 +---- controllers/predicates.go | 17 +---- ...edvolumereplicationgrouplist_controller.go | 17 +---- ...umereplicationgrouplist_controller_test.go | 16 +--- controllers/ramenconfig.go | 17 +---- controllers/ramenconfig_test.go | 17 +---- controllers/reconcile_result.go | 17 +---- controllers/s3utils.go | 14 +--- controllers/s3utils_test.go | 17 +---- controllers/status.go | 17 +---- controllers/suite_test.go | 17 +---- controllers/util/conditions.go | 17 +---- controllers/util/drpolicy_util.go | 17 +---- controllers/util/events.go | 17 +---- controllers/util/labels.go | 17 +---- controllers/util/mcv_util.go | 17 +---- controllers/util/misc.go | 17 +---- controllers/util/mw_util.go | 17 +---- controllers/util/objectmeta.go | 17 +---- controllers/util/pvcs_util.go | 17 +---- controllers/util/pvcs_util_test.go | 17 +---- controllers/util/secrets_util.go | 17 +---- controllers/util/secrets_util_test.go | 17 +---- controllers/volsync/common.go | 17 +---- controllers/volsync/deploy_volsync.go | 17 +---- controllers/volsync/secret_propagator.go | 17 +---- controllers/volsync/secretgen.go | 17 +---- controllers/volsync/vshandler.go | 17 +---- .../volumereplicationgroup_controller.go | 17 +---- controllers/vrg_kubeobjects.go | 17 +---- controllers/vrg_volrep.go | 17 +---- controllers/vrg_volsync.go | 17 +---- hack/boilerplate.go.txt | 17 +---- main.go | 14 +--- 56 files changed, 195 insertions(+), 779 deletions(-) create mode 100644 .reuse/dep5 create mode 100644 .reuse/templates/ramen.jinja2 create mode 100644 LICENSES/Apache-2.0.txt diff --git a/.golangci.yaml b/.golangci.yaml index 0361a4afc..d253391a5 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -26,19 +26,8 @@ linters-settings: min-complexity: 15 goheader: template: | - Copyright 2021 The RamenDR authors. - - 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 - - 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. + SPDX-FileCopyrightText: The RamenDR authors + SPDX-License-Identifier: Apache-2.0 misspell: locale: US wsl: diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 000000000..fd4965b80 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,10 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Ramen +Upstream-Contact: The RamenDR authors +Source: https://github.com/RamenDR/ramen + +# Sample paragraph, commented out: +# +# Files: src/* +# Copyright: $YEAR $NAME <$CONTACT> +# License: ... diff --git a/.reuse/templates/ramen.jinja2 b/.reuse/templates/ramen.jinja2 new file mode 100644 index 000000000..30c7d8d49 --- /dev/null +++ b/.reuse/templates/ramen.jinja2 @@ -0,0 +1,6 @@ +{% for copyright_line in copyright_lines %} +{{ copyright_line }} +{% endfor %} +{% for expression in spdx_expressions %} +SPDX-License-Identifier: {{ expression }} +{% endfor %} diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt new file mode 100644 index 000000000..137069b82 --- /dev/null +++ b/LICENSES/Apache-2.0.txt @@ -0,0 +1,73 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +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 + +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. diff --git a/api/v1alpha1/drcluster_types.go b/api/v1alpha1/drcluster_types.go index 566b009b8..05b456558 100644 --- a/api/v1alpha1/drcluster_types.go +++ b/api/v1alpha1/drcluster_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/drplacementcontrol_types.go b/api/v1alpha1/drplacementcontrol_types.go index 47e5d3fac..5e8791c8f 100644 --- a/api/v1alpha1/drplacementcontrol_types.go +++ b/api/v1alpha1/drplacementcontrol_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/drpolicy_types.go b/api/v1alpha1/drpolicy_types.go index 7d7ab203e..23be1e561 100644 --- a/api/v1alpha1/drpolicy_types.go +++ b/api/v1alpha1/drpolicy_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 07e7087c1..b8cece354 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 // Package v1alpha1 contains API Schema definitions for the ramendr v1alpha1 API group // +kubebuilder:object:generate=true diff --git a/api/v1alpha1/protectedvolumereplicationgrouplist_types.go b/api/v1alpha1/protectedvolumereplicationgrouplist_types.go index b125fa28f..276e28a89 100644 --- a/api/v1alpha1/protectedvolumereplicationgrouplist_types.go +++ b/api/v1alpha1/protectedvolumereplicationgrouplist_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/ramenconfig_types.go b/api/v1alpha1/ramenconfig_types.go index ebc587711..e25f43f34 100644 --- a/api/v1alpha1/ramenconfig_types.go +++ b/api/v1alpha1/ramenconfig_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/volumereplicationgroup_types.go b/api/v1alpha1/volumereplicationgroup_types.go index 2c835f0b1..c2768b807 100644 --- a/api/v1alpha1/volumereplicationgroup_types.go +++ b/api/v1alpha1/volumereplicationgroup_types.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index e03a662cd..c05708a53 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,21 +1,8 @@ //go:build !ignore_autogenerated // +build !ignore_autogenerated -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 // Code generated by controller-gen. DO NOT EDIT. diff --git a/controllers/drcluster_controller.go b/controllers/drcluster_controller.go index 933868fa3..a02f15de5 100644 --- a/controllers/drcluster_controller.go +++ b/controllers/drcluster_controller.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drcluster_controller_test.go b/controllers/drcluster_controller_test.go index e17652ce7..3c67af498 100644 --- a/controllers/drcluster_controller_test.go +++ b/controllers/drcluster_controller_test.go @@ -1,17 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/drclusters.go b/controllers/drclusters.go index 8bb7a594a..f18b85c9c 100644 --- a/controllers/drclusters.go +++ b/controllers/drclusters.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drplacementcontrol.go b/controllers/drplacementcontrol.go index 7602acb40..c69ea3e7e 100644 --- a/controllers/drplacementcontrol.go +++ b/controllers/drplacementcontrol.go @@ -1,17 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drplacementcontrol_controller.go b/controllers/drplacementcontrol_controller.go index 3e4225792..686523ac6 100644 --- a/controllers/drplacementcontrol_controller.go +++ b/controllers/drplacementcontrol_controller.go @@ -1,17 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drplacementcontrol_controller_test.go b/controllers/drplacementcontrol_controller_test.go index b18d34471..fe9136099 100644 --- a/controllers/drplacementcontrol_controller_test.go +++ b/controllers/drplacementcontrol_controller_test.go @@ -1,15 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/drpolicy.go b/controllers/drpolicy.go index a9a63c155..b3d615dac 100644 --- a/controllers/drpolicy.go +++ b/controllers/drpolicy.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drpolicy_controller.go b/controllers/drpolicy_controller.go index 9901dd9c3..6b0d93c0b 100644 --- a/controllers/drpolicy_controller.go +++ b/controllers/drpolicy_controller.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/drpolicy_controller_test.go b/controllers/drpolicy_controller_test.go index df5f98126..d4bb43c27 100644 --- a/controllers/drpolicy_controller_test.go +++ b/controllers/drpolicy_controller_test.go @@ -1,17 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/kubeobjects/requests.go b/controllers/kubeobjects/requests.go index 08ae2cbb5..490b9c240 100644 --- a/controllers/kubeobjects/requests.go +++ b/controllers/kubeobjects/requests.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package kubeobjects diff --git a/controllers/kubeobjects/velero/requests.go b/controllers/kubeobjects/velero/requests.go index 5b07c2ef5..fe93aef82 100644 --- a/controllers/kubeobjects/velero/requests.go +++ b/controllers/kubeobjects/velero/requests.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 //nolint: lll // +kubebuilder:rbac:groups=velero.io,resources=backups,verbs=create;delete;deletecollection;get;list;patch;update;watch diff --git a/controllers/predicates.go b/controllers/predicates.go index 0810b6609..5176d7222 100644 --- a/controllers/predicates.go +++ b/controllers/predicates.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/protectedvolumereplicationgrouplist_controller.go b/controllers/protectedvolumereplicationgrouplist_controller.go index d90db661b..36541e093 100644 --- a/controllers/protectedvolumereplicationgrouplist_controller.go +++ b/controllers/protectedvolumereplicationgrouplist_controller.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/protectedvolumereplicationgrouplist_controller_test.go b/controllers/protectedvolumereplicationgrouplist_controller_test.go index a7032a111..02580bb53 100644 --- a/controllers/protectedvolumereplicationgrouplist_controller_test.go +++ b/controllers/protectedvolumereplicationgrouplist_controller_test.go @@ -1,17 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/ramenconfig.go b/controllers/ramenconfig.go index a0ebc0fb8..fd2f4d154 100644 --- a/controllers/ramenconfig.go +++ b/controllers/ramenconfig.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/ramenconfig_test.go b/controllers/ramenconfig_test.go index bbf102370..9bebe73d1 100644 --- a/controllers/ramenconfig_test.go +++ b/controllers/ramenconfig_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/reconcile_result.go b/controllers/reconcile_result.go index d8ab67c2e..5867ac4f5 100644 --- a/controllers/reconcile_result.go +++ b/controllers/reconcile_result.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/s3utils.go b/controllers/s3utils.go index 3e82b8b97..8bea1ffa8 100644 --- a/controllers/s3utils.go +++ b/controllers/s3utils.go @@ -1,15 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/s3utils_test.go b/controllers/s3utils_test.go index 1d7541c6a..cba9880d8 100644 --- a/controllers/s3utils_test.go +++ b/controllers/s3utils_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/status.go b/controllers/status.go index 0eee723f7..7ddbd6d81 100644 --- a/controllers/status.go +++ b/controllers/status.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/suite_test.go b/controllers/suite_test.go index c94f67d93..ba870c304 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers_test diff --git a/controllers/util/conditions.go b/controllers/util/conditions.go index 18a2af593..94caed85c 100644 --- a/controllers/util/conditions.go +++ b/controllers/util/conditions.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/drpolicy_util.go b/controllers/util/drpolicy_util.go index 2dbeb2671..dd49a1005 100644 --- a/controllers/util/drpolicy_util.go +++ b/controllers/util/drpolicy_util.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/events.go b/controllers/util/events.go index 2183dc71f..afbe96480 100644 --- a/controllers/util/events.go +++ b/controllers/util/events.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/labels.go b/controllers/util/labels.go index e152cf55f..4258b20a5 100644 --- a/controllers/util/labels.go +++ b/controllers/util/labels.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/mcv_util.go b/controllers/util/mcv_util.go index 3b91c4988..6c435cebe 100644 --- a/controllers/util/mcv_util.go +++ b/controllers/util/mcv_util.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/misc.go b/controllers/util/misc.go index 5a16e0284..1cb7a353a 100644 --- a/controllers/util/misc.go +++ b/controllers/util/misc.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/mw_util.go b/controllers/util/mw_util.go index c3250afef..3ed90acc1 100644 --- a/controllers/util/mw_util.go +++ b/controllers/util/mw_util.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/objectmeta.go b/controllers/util/objectmeta.go index 7cdf908df..b10350ba6 100644 --- a/controllers/util/objectmeta.go +++ b/controllers/util/objectmeta.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/pvcs_util.go b/controllers/util/pvcs_util.go index 952d46357..bc06365d0 100644 --- a/controllers/util/pvcs_util.go +++ b/controllers/util/pvcs_util.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util diff --git a/controllers/util/pvcs_util_test.go b/controllers/util/pvcs_util_test.go index 363e12681..ca72ff24f 100644 --- a/controllers/util/pvcs_util_test.go +++ b/controllers/util/pvcs_util_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util_test diff --git a/controllers/util/secrets_util.go b/controllers/util/secrets_util.go index e63f6f03b..8d813295b 100644 --- a/controllers/util/secrets_util.go +++ b/controllers/util/secrets_util.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 // NOTE: Added to skip creating shadow manifests for localSecret struct // +kubebuilder:skip diff --git a/controllers/util/secrets_util_test.go b/controllers/util/secrets_util_test.go index 251b0738e..33fa46f0c 100644 --- a/controllers/util/secrets_util_test.go +++ b/controllers/util/secrets_util_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package util_test diff --git a/controllers/volsync/common.go b/controllers/volsync/common.go index 6048f2e44..a1e9d147e 100644 --- a/controllers/volsync/common.go +++ b/controllers/volsync/common.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package volsync diff --git a/controllers/volsync/deploy_volsync.go b/controllers/volsync/deploy_volsync.go index 95afb022f..18c8c280a 100644 --- a/controllers/volsync/deploy_volsync.go +++ b/controllers/volsync/deploy_volsync.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package volsync diff --git a/controllers/volsync/secret_propagator.go b/controllers/volsync/secret_propagator.go index d90d06eb6..5a6d9e066 100644 --- a/controllers/volsync/secret_propagator.go +++ b/controllers/volsync/secret_propagator.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package volsync diff --git a/controllers/volsync/secretgen.go b/controllers/volsync/secretgen.go index 750ef9fc3..b1fe269d2 100644 --- a/controllers/volsync/secretgen.go +++ b/controllers/volsync/secretgen.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package volsync diff --git a/controllers/volsync/vshandler.go b/controllers/volsync/vshandler.go index bdf7efa99..290506d52 100644 --- a/controllers/volsync/vshandler.go +++ b/controllers/volsync/vshandler.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package volsync diff --git a/controllers/volumereplicationgroup_controller.go b/controllers/volumereplicationgroup_controller.go index 6adeeabf7..72d837118 100644 --- a/controllers/volumereplicationgroup_controller.go +++ b/controllers/volumereplicationgroup_controller.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/vrg_kubeobjects.go b/controllers/vrg_kubeobjects.go index f52381a52..654d3caf5 100644 --- a/controllers/vrg_kubeobjects.go +++ b/controllers/vrg_kubeobjects.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/vrg_volrep.go b/controllers/vrg_volrep.go index e75df63a7..94502d8ee 100644 --- a/controllers/vrg_volrep.go +++ b/controllers/vrg_volrep.go @@ -1,18 +1,5 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/controllers/vrg_volsync.go b/controllers/vrg_volsync.go index 06339d452..d870632c2 100644 --- a/controllers/vrg_volsync.go +++ b/controllers/vrg_volsync.go @@ -1,18 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. - -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 - -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package controllers diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index 6d6dac5cd..6b673a28c 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,15 +1,2 @@ -/* -Copyright 2022 The RamenDR authors. - -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 - -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. -*/ \ No newline at end of file +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 diff --git a/main.go b/main.go index fc3e3faa0..d74271e6b 100644 --- a/main.go +++ b/main.go @@ -1,15 +1,5 @@ -/* -Copyright 2021 The RamenDR authors. -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 -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. -*/ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 package main From 2dd963c1d636c0517c382b627abd9ac02199b330 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Fri, 28 Oct 2022 03:35:04 +0300 Subject: [PATCH 2/8] Convert LICENSE to symlink Keeping LICENSE helps github and Go tools to detect the license. Signed-off-by: Nir Soffer --- CONTRIBUTING.md | 8 +- LICENSE | 202 +----------------------------------------------- README.md | 2 +- 3 files changed, 6 insertions(+), 206 deletions(-) mode change 100644 => 120000 LICENSE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 160e3b5a0..3598a56e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,9 @@ # How to Contribute -The Ramen project in under [Apache 2.0 license](LICENSE). We accept -contributions via GitHub pull requests. This document outlines some of the -conventions related to development workflow to make it easier to get your -contribution accepted. +The Ramen project in under [Apache 2.0 license](LICENSES/Apache-2.0.txt). +We accept contributions via GitHub pull requests. This document outlines +some of the conventions related to development workflow to make it +easier to get your contribution accepted. ## Certificate of Origin diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8e8487438..000000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2016 The Rook 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. - You may obtain a copy of the License at - - http://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. diff --git a/LICENSE b/LICENSE new file mode 120000 index 000000000..5431dc12a --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +LICENSES/Apache-2.0.txt \ No newline at end of file diff --git a/README.md b/README.md index 7f5542855..41e07bf93 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,4 @@ are currently **alpha**. There are no releases as yet. ## Licensing -Ramen is under the [Apache 2.0 license.](LICENSE) +Ramen is under the [Apache 2.0 license.](LICENSES/Apache-2.0.txt) From d680fd96d21b51ffbec5185caf3556efad1d859a Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 21:56:06 +0300 Subject: [PATCH 3/8] Add missing copyright and license to Go module For some reason drplacementcontrolvolsync.go did not have copyright and license boileplate, add SPDX haders. Signed-off-by: Nir Soffer --- controllers/drplacementcontrolvolsync.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/drplacementcontrolvolsync.go b/controllers/drplacementcontrolvolsync.go index 63de9b1cb..60ad770c1 100644 --- a/controllers/drplacementcontrolvolsync.go +++ b/controllers/drplacementcontrolvolsync.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package controllers import ( From 2270dcf6f691e36fb36dd2625209d9b0864fcee0 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 22:03:24 +0300 Subject: [PATCH 4/8] Add SPDX header to tests files For some reason some of the tests had no copyright and license boilerplate, add SPDX headers. Added using: $ reuse addheader \ --copyright 'The RamenDR authors' \ --exclude-year \ --license Apache-2.0 \ --template ramen \ `git ls-files | grep _test.g` Signed-off-by: Nir Soffer --- controllers/util/mw_util_test.go | 3 +++ controllers/util/util_suite_test.go | 3 +++ controllers/volsync/deploy_volsync_test.go | 3 +++ controllers/volsync/secret_propagator_test.go | 3 +++ controllers/volsync/secretgen_test.go | 3 +++ controllers/volsync/volsync_suite_test.go | 3 +++ controllers/volsync/vshandler_test.go | 3 +++ controllers/vrg_volrep_test.go | 3 +++ controllers/vrg_volsync_test.go | 3 +++ 9 files changed, 27 insertions(+) diff --git a/controllers/util/mw_util_test.go b/controllers/util/mw_util_test.go index f82fbdb05..286cae6e5 100644 --- a/controllers/util/mw_util_test.go +++ b/controllers/util/mw_util_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package util_test import ( diff --git a/controllers/util/util_suite_test.go b/controllers/util/util_suite_test.go index 94038c526..d4427120b 100644 --- a/controllers/util/util_suite_test.go +++ b/controllers/util/util_suite_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package util_test import ( diff --git a/controllers/volsync/deploy_volsync_test.go b/controllers/volsync/deploy_volsync_test.go index 71a3accd5..21228d572 100644 --- a/controllers/volsync/deploy_volsync_test.go +++ b/controllers/volsync/deploy_volsync_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package volsync_test import ( diff --git a/controllers/volsync/secret_propagator_test.go b/controllers/volsync/secret_propagator_test.go index bc09ab8ef..97688d9e2 100644 --- a/controllers/volsync/secret_propagator_test.go +++ b/controllers/volsync/secret_propagator_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package volsync_test import ( diff --git a/controllers/volsync/secretgen_test.go b/controllers/volsync/secretgen_test.go index 056122f1a..dea96e6ea 100644 --- a/controllers/volsync/secretgen_test.go +++ b/controllers/volsync/secretgen_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package volsync_test import ( diff --git a/controllers/volsync/volsync_suite_test.go b/controllers/volsync/volsync_suite_test.go index 0e7fac8b7..5b6f6e779 100644 --- a/controllers/volsync/volsync_suite_test.go +++ b/controllers/volsync/volsync_suite_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package volsync_test import ( diff --git a/controllers/volsync/vshandler_test.go b/controllers/volsync/vshandler_test.go index 7d9663dec..37cbeb1b6 100644 --- a/controllers/volsync/vshandler_test.go +++ b/controllers/volsync/vshandler_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package volsync_test import ( diff --git a/controllers/vrg_volrep_test.go b/controllers/vrg_volrep_test.go index 82bbc7118..b3591d485 100644 --- a/controllers/vrg_volrep_test.go +++ b/controllers/vrg_volrep_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package controllers_test import ( diff --git a/controllers/vrg_volsync_test.go b/controllers/vrg_volsync_test.go index 8d3425c64..4ce4831ce 100644 --- a/controllers/vrg_volsync_test.go +++ b/controllers/vrg_volsync_test.go @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: The RamenDR authors +// SPDX-License-Identifier: Apache-2.0 + package controllers_test import ( From 3fa4dffbdd0009e07f36035d1c5eaad44cb6eff5 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 21:41:43 +0300 Subject: [PATCH 5/8] Add SPDX headers to markdown files Various documents had no license or copyright information. Add the same copyright and license used by the Go files. Added using: $ reuse addheader \ --copyright 'The RamenDR authors' \ --exclude-year \ --license Apache-2.0 \ --template ramen \ `git ls-files | grep '.md$' Signed-off-by: Nir Soffer --- CONTRIBUTING.md | 5 +++++ README.md | 5 +++++ docs/configure.md | 5 +++++ docs/design/VRG-TypeSequence.md | 5 +++++ docs/design/proposals/VRG-Reconciliation.md | 5 +++++ docs/drpc-crd.md | 5 +++++ docs/drpolicy-crd.md | 5 +++++ docs/install.md | 5 +++++ docs/krp.md | 5 +++++ docs/metrics.md | 5 +++++ docs/motivation.md | 5 +++++ docs/testing.md | 5 +++++ docs/usage.md | 5 +++++ docs/vrg-crd.md | 5 +++++ docs/vrg-usage.md | 5 +++++ examples/managedclusterview/README.md | 5 +++++ hack/README.md | 5 +++++ 17 files changed, 85 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3598a56e1..d58a93cc4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,8 @@ + + # How to Contribute The Ramen project in under [Apache 2.0 license](LICENSES/Apache-2.0.txt). diff --git a/README.md b/README.md index 41e07bf93..1cdcad104 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # Ramen Ramen is an [open-cluster-management (OCM)](https://open-cluster-management.io/concepts/architecture/) diff --git a/docs/configure.md b/docs/configure.md index a4aeb23fd..5400b949d 100644 --- a/docs/configure.md +++ b/docs/configure.md @@ -1,3 +1,8 @@ + + # Configure ## **Under construction** diff --git a/docs/design/VRG-TypeSequence.md b/docs/design/VRG-TypeSequence.md index a3762f130..48604e6ad 100644 --- a/docs/design/VRG-TypeSequence.md +++ b/docs/design/VRG-TypeSequence.md @@ -1,3 +1,8 @@ + + # VRG Type Sequence ## Overview diff --git a/docs/design/proposals/VRG-Reconciliation.md b/docs/design/proposals/VRG-Reconciliation.md index 6d47127dd..d8edfa01c 100644 --- a/docs/design/proposals/VRG-Reconciliation.md +++ b/docs/design/proposals/VRG-Reconciliation.md @@ -1,3 +1,8 @@ + + # VRG reconciler workflow This design document covers the VRG CRD and its reconciliation workflow. diff --git a/docs/drpc-crd.md b/docs/drpc-crd.md index 713f351cb..979bf089a 100644 --- a/docs/drpc-crd.md +++ b/docs/drpc-crd.md @@ -1,3 +1,8 @@ + + # DRPlacementControl(drpc) CRD ## **Under construction** diff --git a/docs/drpolicy-crd.md b/docs/drpolicy-crd.md index 2934bd61e..220c88035 100644 --- a/docs/drpolicy-crd.md +++ b/docs/drpolicy-crd.md @@ -1,3 +1,8 @@ + + # DRPolicy CRD ## **Under construction** diff --git a/docs/install.md b/docs/install.md index 0e92b4eee..fc05f5551 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,3 +1,8 @@ + + # Install ## Prerequisites diff --git a/docs/krp.md b/docs/krp.md index cd950b06e..06cd9e6ea 100644 --- a/docs/krp.md +++ b/docs/krp.md @@ -1,3 +1,8 @@ + + # Kubernetes Resource Protection ## Overview diff --git a/docs/metrics.md b/docs/metrics.md index 23c929a15..5eb358d9a 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -1,3 +1,8 @@ + + # Metrics Metrics are collected using Prometheus, and registered with its global metrics diff --git a/docs/motivation.md b/docs/motivation.md index 33b5f7e83..f4b695485 100644 --- a/docs/motivation.md +++ b/docs/motivation.md @@ -1,3 +1,8 @@ + + # Motivation ## **Under Construction** diff --git a/docs/testing.md b/docs/testing.md index 2c8016d4a..2f1a9c6ee 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -1,3 +1,8 @@ + + # Testing ## **Under construction** diff --git a/docs/usage.md b/docs/usage.md index 715040e1d..1855dc6f0 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -1,3 +1,8 @@ + + # Sample workload management using Ramen ## **Under construction** diff --git a/docs/vrg-crd.md b/docs/vrg-crd.md index cff62f7d8..0e5bc7c83 100644 --- a/docs/vrg-crd.md +++ b/docs/vrg-crd.md @@ -1,3 +1,8 @@ + + # VolumeReplicationGroup(VRG) CRD ## **Under construction** diff --git a/docs/vrg-usage.md b/docs/vrg-usage.md index 94694e7ba..7ffb8ac82 100644 --- a/docs/vrg-usage.md +++ b/docs/vrg-usage.md @@ -1,3 +1,8 @@ + + # Volume Replication Group (VRG) usage ## Protect application on cluster1 diff --git a/examples/managedclusterview/README.md b/examples/managedclusterview/README.md index 6791cea33..5158dbc64 100644 --- a/examples/managedclusterview/README.md +++ b/examples/managedclusterview/README.md @@ -1,3 +1,8 @@ + + # ManagedClusterView ## Usage Description diff --git a/hack/README.md b/hack/README.md index c199735a6..d27dfe0c9 100644 --- a/hack/README.md +++ b/hack/README.md @@ -1,3 +1,8 @@ + + # hack/ ## minikube-ramen.sh From 88e185e9b0737229adb602e8595610adc8614859 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 22:18:51 +0300 Subject: [PATCH 6/8] Add explicit .license file for docs/*.png Like the rest of the documents, the images should have copyright and license information. This is done by an explicit .license file. Add using: reuse addheader \ --copyright 'The RamenDR authors' \ --exclude-year \ --license Apache-2.0 \ --template ramen \ docs/interfaces.png Signed-off-by: Nir Soffer --- docs/interfaces.png.license | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 docs/interfaces.png.license diff --git a/docs/interfaces.png.license b/docs/interfaces.png.license new file mode 100644 index 000000000..7d48ce557 --- /dev/null +++ b/docs/interfaces.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: The RamenDR authors +SPDX-License-Identifier: Apache-2.0 From 8441292bf1010c4db74ef68bc3da4f0d9f0e5218 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 21:49:24 +0300 Subject: [PATCH 7/8] Add SPDX headers to hack scripts The hack directory scripts had no copyright info. Use the same as the Go files. Added using: $ reuse addheader \ --copyright 'The RamenDR authors' \ --exclude-year \ --license Apache-2.0 \ --template ramen \ `git ls-files | grep -E 'hack/.+\.sh$'` Signed-off-by: Nir Soffer --- hack/curl-install.sh | 4 ++++ hack/docker-client-install.sh | 4 ++++ hack/docker-install.sh | 3 +++ hack/docker-uninstall.sh | 4 ++++ hack/exit_stack.sh | 3 +++ hack/fuse-overlayfs-install.sh | 4 ++++ hack/git-checkout.sh | 3 +++ hack/github-url.sh | 4 ++++ hack/go-install.sh | 3 +++ hack/kubectl-install.sh | 4 ++++ hack/kustomize-install.sh | 4 ++++ hack/minikube-install.sh | 4 ++++ hack/minikube-ramen.sh | 4 ++++ hack/minikube-rook-mirror-setup.sh | 4 ++++ hack/minikube-rook-mirror-test.sh | 4 ++++ hack/minikube-rook-setup.sh | 4 ++++ hack/minikube.sh | 4 ++++ hack/ocm-minikube-ramen.sh | 4 ++++ hack/ocm-minikube.sh | 4 ++++ hack/olm.sh | 4 ++++ hack/podman-docker-install.sh | 4 ++++ hack/podman-docker-uninstall.sh | 4 ++++ hack/podman-install.sh | 4 ++++ hack/podman-uninstall.sh | 4 ++++ hack/pre-commit.sh | 4 ++++ hack/setup-kind-cluster.sh | 4 ++++ hack/shell_option_store_restore.sh | 3 +++ hack/shio-demo.sh | 4 ++++ hack/true_if_exit_status_and_stderr.sh | 3 +++ hack/uidmap-install.sh | 4 ++++ hack/until_true_or_n.sh | 3 +++ hack/velero-install.sh | 4 ++++ hack/velero-test.sh | 4 ++++ hack/velero-uninstall.sh | 4 ++++ 34 files changed, 129 insertions(+) diff --git a/hack/curl-install.sh b/hack/curl-install.sh index 39d029f56..6a76b6de6 100755 --- a/hack/curl-install.sh +++ b/hack/curl-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 if ! command -v curl; then wget -O ${1}/curl https://github.com/moparisthebest/static-curl/releases/download/v7.76.0/curl-amd64 diff --git a/hack/docker-client-install.sh b/hack/docker-client-install.sh index dafab3af5..e7746ba3c 100755 --- a/hack/docker-client-install.sh +++ b/hack/docker-client-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2046,2086 set -x set -- $1 20.10.6 diff --git a/hack/docker-install.sh b/hack/docker-install.sh index 675a829ee..1fd110afa 100644 --- a/hack/docker-install.sh +++ b/hack/docker-install.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2046,2086 docker_install() { diff --git a/hack/docker-uninstall.sh b/hack/docker-uninstall.sh index 25fcc4c4f..5d3f0ce52 100755 --- a/hack/docker-uninstall.sh +++ b/hack/docker-uninstall.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + set -x set -e if test -x "${1}"/dockerd-rootless-setuptool.sh; then diff --git a/hack/exit_stack.sh b/hack/exit_stack.sh index 6e91b892b..6b7b4badf 100644 --- a/hack/exit_stack.sh +++ b/hack/exit_stack.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh trap 'set -- $?; trap - EXIT; eval $exit_stack; echo exit status: $1' EXIT trap 'trap - EXIT; eval $exit_stack' EXIT diff --git a/hack/fuse-overlayfs-install.sh b/hack/fuse-overlayfs-install.sh index 62f3f7f43..9d617f29c 100755 --- a/hack/fuse-overlayfs-install.sh +++ b/hack/fuse-overlayfs-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 set -x # https://github.com/containers/fuse-overlayfs diff --git a/hack/git-checkout.sh b/hack/git-checkout.sh index 6cd4932bf..316f1d0e5 100644 --- a/hack/git-checkout.sh +++ b/hack/git-checkout.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2086 git_checkout() { diff --git a/hack/github-url.sh b/hack/github-url.sh index b6a0ac81a..035557c67 100644 --- a/hack/github-url.sh +++ b/hack/github-url.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + github_url_file() { echo https://raw.githubusercontent.com/"$1"/"$3"/"$2" diff --git a/hack/go-install.sh b/hack/go-install.sh index 54d9a2ce6..44811d0e5 100644 --- a/hack/go-install.sh +++ b/hack/go-install.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2046,2086 go_install() { diff --git a/hack/kubectl-install.sh b/hack/kubectl-install.sh index df748e790..42f452507 100755 --- a/hack/kubectl-install.sh +++ b/hack/kubectl-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2046,2086 if ! command -v kubectl\ ||\ diff --git a/hack/kustomize-install.sh b/hack/kustomize-install.sh index c94457363..355801cd3 100755 --- a/hack/kustomize-install.sh +++ b/hack/kustomize-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2046,2086 if ! command -v kustomize; then $(dirname ${0})/curl-install.sh ${1} diff --git a/hack/minikube-install.sh b/hack/minikube-install.sh index 8007059a0..8515482cf 100755 --- a/hack/minikube-install.sh +++ b/hack/minikube-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2046,2086 if ! command -v minikube; then # https://minikube.sigs.k8s.io/docs/start/ diff --git a/hack/minikube-ramen.sh b/hack/minikube-ramen.sh index a3951e21a..cfeee6c63 100755 --- a/hack/minikube-ramen.sh +++ b/hack/minikube-ramen.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 set -e ramen_hack_directory_path_name=$(dirname $0) diff --git a/hack/minikube-rook-mirror-setup.sh b/hack/minikube-rook-mirror-setup.sh index 9c19fbb15..5263e1b26 100755 --- a/hack/minikube-rook-mirror-setup.sh +++ b/hack/minikube-rook-mirror-setup.sh @@ -1,4 +1,8 @@ #!/bin/bash + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + set -x set -e -o pipefail scriptdir="$(dirname "$(realpath "$0")")" diff --git a/hack/minikube-rook-mirror-test.sh b/hack/minikube-rook-mirror-test.sh index 123d60198..931213d09 100755 --- a/hack/minikube-rook-mirror-test.sh +++ b/hack/minikube-rook-mirror-test.sh @@ -1,4 +1,8 @@ #!/bin/bash + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + set -x set -e -o pipefail diff --git a/hack/minikube-rook-setup.sh b/hack/minikube-rook-setup.sh index d461ef958..d61bfe074 100755 --- a/hack/minikube-rook-setup.sh +++ b/hack/minikube-rook-setup.sh @@ -1,4 +1,8 @@ #!/bin/bash + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + set -x set -e -o pipefail diff --git a/hack/minikube.sh b/hack/minikube.sh index e0b8f2449..54948d7d3 100644 --- a/hack/minikube.sh +++ b/hack/minikube.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 minikube_minio_url() { diff --git a/hack/ocm-minikube-ramen.sh b/hack/ocm-minikube-ramen.sh index ccfdb6ba5..2f5b5a05a 100755 --- a/hack/ocm-minikube-ramen.sh +++ b/hack/ocm-minikube-ramen.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1090,2046,2086,1091 set -x set -e diff --git a/hack/ocm-minikube.sh b/hack/ocm-minikube.sh index 270222559..f9b8865c9 100755 --- a/hack/ocm-minikube.sh +++ b/hack/ocm-minikube.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1090,1091,2046,2086 # open cluster management (ocm) hub and managed minikube kvm amd64 clusters deploy diff --git a/hack/olm.sh b/hack/olm.sh index 4326df6d5..1b4b46b89 100644 --- a/hack/olm.sh +++ b/hack/olm.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1090,2086,1091 OLM_BASE_URL="https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.19.1" diff --git a/hack/podman-docker-install.sh b/hack/podman-docker-install.sh index a2d1295b6..8607f8751 100755 --- a/hack/podman-docker-install.sh +++ b/hack/podman-docker-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2046,2086 if ! command -v docker; then $(dirname ${0})/podman-install.sh diff --git a/hack/podman-docker-uninstall.sh b/hack/podman-docker-uninstall.sh index bbc134990..889c9d9f5 100755 --- a/hack/podman-docker-uninstall.sh +++ b/hack/podman-docker-uninstall.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 if test "$(file -h /usr/bin/docker)" = '/usr/bin/docker: symbolic link to /usr/bin/podman' then diff --git a/hack/podman-install.sh b/hack/podman-install.sh index 65642fede..c0092f6ba 100755 --- a/hack/podman-install.sh +++ b/hack/podman-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 if ! command -v podman; then # https://podman.io/getting-started/installation#linux-distributions diff --git a/hack/podman-uninstall.sh b/hack/podman-uninstall.sh index 306632986..a43228ab9 100755 --- a/hack/podman-uninstall.sh +++ b/hack/podman-uninstall.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2046,2086 if command -v podman; then $(dirname ${0})/podman-docker-uninstall.sh diff --git a/hack/pre-commit.sh b/hack/pre-commit.sh index 6666ad6ca..65be822a0 100755 --- a/hack/pre-commit.sh +++ b/hack/pre-commit.sh @@ -1,4 +1,8 @@ #! /bin/bash + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # vim: set ts=4 sw=4 et : # Usage: pre-commit.sh diff --git a/hack/setup-kind-cluster.sh b/hack/setup-kind-cluster.sh index e580343a0..77d1356a3 100755 --- a/hack/setup-kind-cluster.sh +++ b/hack/setup-kind-cluster.sh @@ -1,4 +1,8 @@ #! /bin/bash + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + set -e -o pipefail KIND_IMAGE="${KIND_IMAGE:-1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9}" diff --git a/hack/shell_option_store_restore.sh b/hack/shell_option_store_restore.sh index bede3615a..e399c4cb4 100644 --- a/hack/shell_option_store_restore.sh +++ b/hack/shell_option_store_restore.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2086 shell_option_store() { diff --git a/hack/shio-demo.sh b/hack/shio-demo.sh index 879707d13..4e180a588 100755 --- a/hack/shio-demo.sh +++ b/hack/shio-demo.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1090,2046,2086 set -e diff --git a/hack/true_if_exit_status_and_stderr.sh b/hack/true_if_exit_status_and_stderr.sh index 6ab0245ec..3d63c2da5 100644 --- a/hack/true_if_exit_status_and_stderr.sh +++ b/hack/true_if_exit_status_and_stderr.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh true_if_exit_status_and_stderr() { diff --git a/hack/uidmap-install.sh b/hack/uidmap-install.sh index 22b5dd894..ed744587e 100755 --- a/hack/uidmap-install.sh +++ b/hack/uidmap-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1091 if ! command -v newuidmap then diff --git a/hack/until_true_or_n.sh b/hack/until_true_or_n.sh index 4b03e7aaa..97dc83dba 100644 --- a/hack/until_true_or_n.sh +++ b/hack/until_true_or_n.sh @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck shell=sh disable=2086 until_true_or_n() { diff --git a/hack/velero-install.sh b/hack/velero-install.sh index 45ea86caa..341c91af2 100755 --- a/hack/velero-install.sh +++ b/hack/velero-install.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 set -x set -e diff --git a/hack/velero-test.sh b/hack/velero-test.sh index 43f26630a..1a88bd5dd 100755 --- a/hack/velero-test.sh +++ b/hack/velero-test.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=1090,2046,2086 set -e ramen_hack_directory_path_name=$(dirname $0) diff --git a/hack/velero-uninstall.sh b/hack/velero-uninstall.sh index 067235bf2..3dcbd21a3 100755 --- a/hack/velero-uninstall.sh +++ b/hack/velero-uninstall.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # shellcheck disable=2086 set -x set -e From f90ebb0058f0374c209a668f987bd91c5f30af4f Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Thu, 27 Oct 2022 22:12:06 +0300 Subject: [PATCH 8/8] Add SPDX header to rest of files To make the project compliant with the REUSE spec[1], all files should have SPDX headers. For simplicity, treat the rest of the files in the same way we treat code. Some files in config, examples, and hack directories are not handled yet, since it is not clear if we own them and which license should be used. We did not decide yet how to license go.mod, go.sum, .*ignore, so they are not included in this commit. [1] https://reuse.software/spec/ Signed-off-by: Nir Soffer --- .github/workflows/sanity.yml | 3 +++ .gitignore | 1 - Dockerfile | 3 +++ Makefile | 3 +++ PROJECT | 3 +++ hack/mdl-style.rb | 3 +++ hack/yamlconfig.yaml | 3 +++ 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml index 3ed124a98..ae71712c5 100644 --- a/.github/workflows/sanity.yml +++ b/.github/workflows/sanity.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + --- # yamllint disable rule:line-length diff --git a/.gitignore b/.gitignore index f1274dbab..ec43b6fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/Dockerfile b/Dockerfile index 91321c06a..088d65c0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # Build the manager binary FROM golang:1.18 as builder diff --git a/Makefile b/Makefile index a469864d2..6140a2099 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + # Enable GOPROXY. This speeds up a lot of vendoring operations. export GOPROXY=https://proxy.golang.org diff --git a/PROJECT b/PROJECT index aa9341360..244ca9d70 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + domain: openshift.io layout: - go.kubebuilder.io/v3 diff --git a/hack/mdl-style.rb b/hack/mdl-style.rb index 1a9954dce..e969d0265 100644 --- a/hack/mdl-style.rb +++ b/hack/mdl-style.rb @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + all #Refer below url for more information about the markdown rules. diff --git a/hack/yamlconfig.yaml b/hack/yamlconfig.yaml index baae962c8..e765a2637 100644 --- a/hack/yamlconfig.yaml +++ b/hack/yamlconfig.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: The RamenDR authors +# SPDX-License-Identifier: Apache-2.0 + --- # https://yamllint.readthedocs.io/en/stable/configuration.html