From 7895e77cbfec46e728d3f3d1b09d090ea43c1de7 Mon Sep 17 00:00:00 2001 From: Berat Senel Date: Mon, 30 Sep 2019 15:59:46 +0200 Subject: [PATCH] Add Apache license --- LICENSE | 202 ++++++++++++++++++ cmd/daemons/main.go | 20 ++ cmd/nodelabeler/main.go | 19 ++ cmd/selectivedeployment/main.go | 16 ++ config/crd/selectivedeployment.yaml | 13 ++ pkg/apis/selectivedeployment/register.go | 16 ++ pkg/apis/selectivedeployment/v1alpha/doc.go | 16 ++ .../selectivedeployment/v1alpha/register.go | 16 ++ pkg/apis/selectivedeployment/v1alpha/types.go | 16 ++ pkg/authorization/authorization.go | 19 ++ pkg/config/config.go | 18 +- pkg/controller/nodelabeler/controller.go | 16 ++ pkg/controller/nodelabeler/handler.go | 22 +- .../selectivedeployment/controller.go | 16 ++ pkg/controller/selectivedeployment/handler.go | 16 ++ pkg/namespace/namespace.go | 16 ++ pkg/node/infrastructure/join.go | 18 +- pkg/node/node.go | 19 ++ pkg/registration/registration.go | 20 +- pkg/remoteip/remoteip.go | 3 +- 20 files changed, 509 insertions(+), 8 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + 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/cmd/daemons/main.go b/cmd/daemons/main.go index c6a402f3f..04d411500 100644 --- a/cmd/daemons/main.go +++ b/cmd/daemons/main.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 stands as the interface between the EdgeNet portal and headnode. // This uses gorilla/mux to handle requests from the EdgeNet and make use of the // functions of packages according to the requests. All authoritative state for @@ -10,6 +26,10 @@ // offer fixed IP addresses, we use this as the DNS intermediary. Once we either // switch away from namecheap and/or switch to the Google App Engine Flex, we'll // move that to the portal. + +// The credit for this namecheap API communication goes to: +// https://github.com/billputer/go-namecheap + package main import ( diff --git a/cmd/nodelabeler/main.go b/cmd/nodelabeler/main.go index ebedfa069..b7e59e3df 100644 --- a/cmd/nodelabeler/main.go +++ b/cmd/nodelabeler/main.go @@ -1,3 +1,22 @@ +/* +Copyright 2019 Sorbonne Université + +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. +*/ + +// This nodelabeler feature includes GeoLite2 data created by MaxMind, available from +// https://www.maxmind.com. + package main import ( diff --git a/cmd/selectivedeployment/main.go b/cmd/selectivedeployment/main.go index b93204db9..8999d1283 100644 --- a/cmd/selectivedeployment/main.go +++ b/cmd/selectivedeployment/main.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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/config/crd/selectivedeployment.yaml b/config/crd/selectivedeployment.yaml index 1119ac0f6..1208fc943 100644 --- a/config/crd/selectivedeployment.yaml +++ b/config/crd/selectivedeployment.yaml @@ -1,3 +1,16 @@ +# Copyright 2019 Sorbonne Université + +# 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. apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/pkg/apis/selectivedeployment/register.go b/pkg/apis/selectivedeployment/register.go index 4d795b4bf..0dc4e8510 100644 --- a/pkg/apis/selectivedeployment/register.go +++ b/pkg/apis/selectivedeployment/register.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 selectivedeployment const GroupName = "edgenet.io" diff --git a/pkg/apis/selectivedeployment/v1alpha/doc.go b/pkg/apis/selectivedeployment/v1alpha/doc.go index 158489bae..fe4f33d4e 100644 --- a/pkg/apis/selectivedeployment/v1alpha/doc.go +++ b/pkg/apis/selectivedeployment/v1alpha/doc.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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. +*/ + // +k8s:deepcopy-gen=package // +groupName=edgenet.io diff --git a/pkg/apis/selectivedeployment/v1alpha/register.go b/pkg/apis/selectivedeployment/v1alpha/register.go index 6a6fcf35f..2bd652ea3 100644 --- a/pkg/apis/selectivedeployment/v1alpha/register.go +++ b/pkg/apis/selectivedeployment/v1alpha/register.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 v1alpha import ( diff --git a/pkg/apis/selectivedeployment/v1alpha/types.go b/pkg/apis/selectivedeployment/v1alpha/types.go index 1056ba388..2a9ad2929 100644 --- a/pkg/apis/selectivedeployment/v1alpha/types.go +++ b/pkg/apis/selectivedeployment/v1alpha/types.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 v1alpha import ( diff --git a/pkg/authorization/authorization.go b/pkg/authorization/authorization.go index 1c6ff6791..94efa492f 100644 --- a/pkg/authorization/authorization.go +++ b/pkg/authorization/authorization.go @@ -1,3 +1,22 @@ +/* +Copyright 2019 Sorbonne Université + +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. +*/ + +// The credit for this namecheap API communication goes to: +// https://github.com/billputer/go-namecheap + package authorization import ( diff --git a/pkg/config/config.go b/pkg/config/config.go index f97679a07..d0d54a1fa 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,11 +1,27 @@ +/* +Copyright 2019 Sorbonne Université + +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 config import ( "bytes" "encoding/json" "fmt" - "os" "log" + "os" yaml "gopkg.in/yaml.v2" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/controller/nodelabeler/controller.go b/pkg/controller/nodelabeler/controller.go index cbf08f484..253af8309 100644 --- a/pkg/controller/nodelabeler/controller.go +++ b/pkg/controller/nodelabeler/controller.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 nodelabeler import ( diff --git a/pkg/controller/nodelabeler/handler.go b/pkg/controller/nodelabeler/handler.go index 1fa58794f..0c69b092b 100644 --- a/pkg/controller/nodelabeler/handler.go +++ b/pkg/controller/nodelabeler/handler.go @@ -1,8 +1,24 @@ +/* +Copyright 2019 Sorbonne Université + +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 nodelabeler import ( "headnode/pkg/node" - + log "github.com/Sirupsen/logrus" api_v1 "k8s.io/api/core/v1" ) @@ -26,14 +42,14 @@ func (t *Handler) Init() error { func (t *Handler) SetNodeGeolocation(obj interface{}) { log.Info("Handler.ObjectCreated") // Get internal and external IP addresses of the node - internalIP, externalIP := node.GetNodeIPAddresses(obj.(*api_v1.Node)) + internalIP, externalIP := node.GetNodeIPAddresses(obj.(*api_v1.Node)) result := false // Check if the external IP exists to use it in the first place if externalIP != "" { log.Infof("External IP: %s", externalIP) result = node.GetGeolocationByIP(obj.(*api_v1.Node).Name, externalIP) } - // Check if the internal IP exists and + // Check if the internal IP exists and // the result of detecting geolocation by external IP is false if internalIP != "" && result == false { log.Infof("Internal IP: %s", internalIP) diff --git a/pkg/controller/selectivedeployment/controller.go b/pkg/controller/selectivedeployment/controller.go index 553200f11..07b122689 100644 --- a/pkg/controller/selectivedeployment/controller.go +++ b/pkg/controller/selectivedeployment/controller.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 selectivedeployment import ( diff --git a/pkg/controller/selectivedeployment/handler.go b/pkg/controller/selectivedeployment/handler.go index 9fb87567f..f26e43151 100644 --- a/pkg/controller/selectivedeployment/handler.go +++ b/pkg/controller/selectivedeployment/handler.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 selectivedeployment import ( diff --git a/pkg/namespace/namespace.go b/pkg/namespace/namespace.go index cdc33c875..bcff113b9 100644 --- a/pkg/namespace/namespace.go +++ b/pkg/namespace/namespace.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 namespace import ( diff --git a/pkg/node/infrastructure/join.go b/pkg/node/infrastructure/join.go index 2e5f4c066..60c0e2597 100644 --- a/pkg/node/infrastructure/join.go +++ b/pkg/node/infrastructure/join.go @@ -1,12 +1,28 @@ +/* +Copyright 2019 Sorbonne Université + +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 infrastructure import ( "crypto/sha256" "encoding/json" "fmt" + "log" s "strings" "time" - "log" custconfig "headnode/pkg/config" diff --git a/pkg/node/node.go b/pkg/node/node.go index 4717b80d2..24d262452 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -1,3 +1,22 @@ +/* +Copyright 2019 Sorbonne Université + +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. +*/ + +// This code includes GeoLite2 data created by MaxMind, available from +// https://www.maxmind.com. + package node import ( diff --git a/pkg/registration/registration.go b/pkg/registration/registration.go index 679fb7465..e17b5e4db 100644 --- a/pkg/registration/registration.go +++ b/pkg/registration/registration.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 Sorbonne Université + +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 registration import ( @@ -91,7 +107,7 @@ func MakeUser(user string) ([]byte, int) { result, _ := json.Marshal(resultMap) return result, 500 } - + rbSubjectsEdgenet := []apiv1.Subject{{Kind: "ServiceAccount", Name: "default", Namespace: user}} roleBindRefEdgenet := apiv1.RoleRef{Kind: "ClusterRole", Name: "edgenet-admin"} var roleBindEdgenet *apiv1.RoleBinding @@ -111,7 +127,7 @@ func MakeUser(user string) ([]byte, int) { result, _ := json.Marshal(resultMap) return result, 200 } - + log.Printf("Namespace couldn't be created: %s", user) resultMap := map[string]string{"status": "Failure"} result, _ := json.Marshal(resultMap) diff --git a/pkg/remoteip/remoteip.go b/pkg/remoteip/remoteip.go index a5abc7c07..27123ccee 100644 --- a/pkg/remoteip/remoteip.go +++ b/pkg/remoteip/remoteip.go @@ -1,5 +1,6 @@ -// The credit for this code goes to: +// The all credit for this code goes to: // https://husobee.github.io/golang/ip-address/2015/12/17/remote-ip-go.html + package remoteip import (