diff --git a/LICENSE b/LICENSE index 261eeb9e..d49babf1 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright (c) The Spin Framework Contributors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 419ad737..be2d7945 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. - $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." + $(CONTROLLER_GEN) object paths="./..." .PHONY: fmt fmt: ## Run go fmt against code. @@ -174,11 +174,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in $(KUSTOMIZE) build config/default | $(KUBECTL) apply -f - .PHONY: deploy-samples -deploy-samples: ## Install test shims from ./hack/. +deploy-samples: ## Install test shims from ./config/samples. $(KUSTOMIZE) build config/samples | $(KUBECTL) apply -f - .PHONY: undeploy-samples -undeploy-samples: ## Install test shims from ./hack/. +undeploy-samples: ## Install test shims from ./config/samples. $(KUSTOMIZE) build config/samples | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f - .PHONY: undeploy diff --git a/README.md b/README.md index 36148ab1..72d912a3 100644 --- a/README.md +++ b/README.md @@ -87,16 +87,4 @@ make undeploy ## License -Copyright 2024. - -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. +See [LICENSE](./LICENSE). diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 51c25475..864cf612 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - // Package v1alpha1 contains API Schema definitions for the runtime v1alpha1 API group // +kubebuilder:object:generate=true // +groupName=runtime.spinkube.dev diff --git a/api/v1alpha1/shim_types.go b/api/v1alpha1/shim_types.go index e8ec652a..ceaa0e53 100644 --- a/api/v1alpha1/shim_types.go +++ b/api/v1alpha1/shim_types.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - package v1alpha1 import ( diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index de587e2b..c8740592 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,21 +1,5 @@ //go:build !ignore_autogenerated -/* -Copyright 2024. - -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. -*/ - // Code generated by controller-gen. DO NOT EDIT. package v1alpha1 diff --git a/cmd/node-installer/config.go b/cmd/node-installer/config.go index e96809e9..b040f678 100644 --- a/cmd/node-installer/config.go +++ b/cmd/node-installer/config.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main type Config struct { diff --git a/cmd/node-installer/detect.go b/cmd/node-installer/detect.go index 8366a5aa..f2069bfe 100644 --- a/cmd/node-installer/detect.go +++ b/cmd/node-installer/detect.go @@ -1,19 +1,3 @@ -/* - Copyright The SpinKube 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. -*/ - package main import ( diff --git a/cmd/node-installer/detect_test.go b/cmd/node-installer/detect_test.go index ee7ccbb4..bfb0158d 100644 --- a/cmd/node-installer/detect_test.go +++ b/cmd/node-installer/detect_test.go @@ -1,19 +1,3 @@ -/* - Copyright The SpinKube 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. -*/ - package main_test import ( diff --git a/cmd/node-installer/install.go b/cmd/node-installer/install.go index ab2e7fa0..739aff9f 100644 --- a/cmd/node-installer/install.go +++ b/cmd/node-installer/install.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main import ( diff --git a/cmd/node-installer/install_test.go b/cmd/node-installer/install_test.go index 1cce0730..2c697e39 100644 --- a/cmd/node-installer/install_test.go +++ b/cmd/node-installer/install_test.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main_test import ( diff --git a/cmd/node-installer/main.go b/cmd/node-installer/main.go index 2f302d72..736ef310 100644 --- a/cmd/node-installer/main.go +++ b/cmd/node-installer/main.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main func main() { diff --git a/cmd/node-installer/root.go b/cmd/node-installer/root.go index f7254889..08ddda59 100644 --- a/cmd/node-installer/root.go +++ b/cmd/node-installer/root.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main import ( diff --git a/cmd/node-installer/uninstall.go b/cmd/node-installer/uninstall.go index f63d790b..63a318d4 100644 --- a/cmd/node-installer/uninstall.go +++ b/cmd/node-installer/uninstall.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package main import ( diff --git a/cmd/rcm/main.go b/cmd/rcm/main.go index 686eb64c..20cec608 100644 --- a/cmd/rcm/main.go +++ b/cmd/rcm/main.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - package main import ( diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt deleted file mode 100644 index ff72ff2a..00000000 --- a/hack/boilerplate.go.txt +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2024. - -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 diff --git a/internal/containerd/configure.go b/internal/containerd/configure.go index 620960d8..ff2f3915 100644 --- a/internal/containerd/configure.go +++ b/internal/containerd/configure.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package containerd import ( diff --git a/internal/containerd/configure_test.go b/internal/containerd/configure_test.go index 60173e9b..b397e32c 100644 --- a/internal/containerd/configure_test.go +++ b/internal/containerd/configure_test.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package containerd //nolint:testpackage // whitebox test import ( diff --git a/internal/containerd/restart_unix.go b/internal/containerd/restart_unix.go index ced9371f..19040157 100644 --- a/internal/containerd/restart_unix.go +++ b/internal/containerd/restart_unix.go @@ -1,22 +1,6 @@ //go:build unix // +build unix -/* - Copyright The KWasm 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. -*/ - package containerd import ( diff --git a/internal/controller/job_controller.go b/internal/controller/job_controller.go index 6d2ca4a2..113970b0 100644 --- a/internal/controller/job_controller.go +++ b/internal/controller/job_controller.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - package controller import ( diff --git a/internal/controller/shim_controller.go b/internal/controller/shim_controller.go index e080f7e3..ea6bb829 100644 --- a/internal/controller/shim_controller.go +++ b/internal/controller/shim_controller.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - package controller import ( diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 3a94e5d4..03bfd219 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -1,19 +1,3 @@ -/* -Copyright 2024. - -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. -*/ - package controller_test import ( diff --git a/internal/shim/install.go b/internal/shim/install.go index 1487749f..3a2f86ce 100644 --- a/internal/shim/install.go +++ b/internal/shim/install.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package shim import ( diff --git a/internal/shim/install_test.go b/internal/shim/install_test.go index ab1873a2..39d8500a 100644 --- a/internal/shim/install_test.go +++ b/internal/shim/install_test.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package shim //nolint:testpackage // whitebox test import ( diff --git a/internal/shim/shim.go b/internal/shim/shim.go index 4b3cf087..8c3a2ba5 100644 --- a/internal/shim/shim.go +++ b/internal/shim/shim.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package shim import ( diff --git a/internal/shim/uninstall_test.go b/internal/shim/uninstall_test.go index b053e00d..3a1c64b8 100644 --- a/internal/shim/uninstall_test.go +++ b/internal/shim/uninstall_test.go @@ -1,19 +1,3 @@ -/* - Copyright The KWasm 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. -*/ - package shim //nolint:testpackage // whitebox test import (