diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index bec81a04..c1e6702a 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -53,16 +53,6 @@ jobs: - name: Run golangci-lint run: make golangci-lint - headers: - name: License Headers - runs-on: ubuntu-latest - steps: - - name: Check out the repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - - name: Check License Headers - uses: kt3k/license_checker@d12a6d90c58e30fefed09f2c4d03ba57f4c673a8 - markdown-link-check: name: Markdown Links (modified files) runs-on: ubuntu-latest diff --git a/.golangci.yml b/.golangci.yml index e9ff6574..53eb27a7 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,23 @@ linters-settings: - unnamedResult gocyclo: min-complexity: 15 + goheader: + template: |- + SPDX-License-Identifier: Apache-2.0 + + Copyright Contributors to the Submariner project. + + 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. govet: enable: - fieldalignment @@ -38,7 +55,6 @@ linters: - bodyclose - contextcheck # - cyclop # This is equivalent to gocyclo - - deadcode - depguard - dogsled - dupl @@ -65,7 +81,7 @@ linters: # - godox # Let's not forbid inline TODOs, FIXMEs et al - gofmt - gofumpt - # - goheader # We do license header linting another way + - goheader - goimports # - golint # Deprecated since v1.41.0 # - gomnd # It doesn't seem useful in general to enforce constants for all numeric values @@ -101,7 +117,6 @@ linters: # - scopelint # Deprecated since v1.39.0 # - sqlclosecheck # We don't use SQL - staticcheck - - structcheck - stylecheck # - tagliatelle # Inconsistent with stylecheck and not as good # - tenv # Not relevant for our Ginkgo UTs @@ -112,7 +127,6 @@ linters: - unconvert - unparam - unused - - varcheck # - varnamelen # It doesn't seem necessary to enforce a minimum variable name length - wastedassign - whitespace diff --git a/.licenserc.json b/.licenserc.json deleted file mode 100644 index 6a5d7f65..00000000 --- a/.licenserc.json +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "**/*.{go,proto}": [ - "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." - ], - "ignore": [ - "vendor/" - ] - }, - { - "**/*.{go,proto}": [ - "SPDX-License-Identifier: Apache-2.0", - "Copyright Contributors to the Submariner project." - ], - "ignore": [ - "vendor/" - ] - }, - { - "LICENSE": "Apache License" - } -] diff --git a/pkg/api/api.go b/pkg/api/api.go index 684f7d7d..7a5642e1 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/aws.go b/pkg/aws/aws.go index 7a290cbf..d7c6547f 100644 --- a/pkg/aws/aws.go +++ b/pkg/aws/aws.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/aws_cloud_test.go b/pkg/aws/aws_cloud_test.go index 9ecbaba4..70b90ae0 100644 --- a/pkg/aws/aws_cloud_test.go +++ b/pkg/aws/aws_cloud_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/aws_suite_test.go b/pkg/aws/aws_suite_test.go index ffa83f31..f1ea7e84 100644 --- a/pkg/aws/aws_suite_test.go +++ b/pkg/aws/aws_suite_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/client/client.go b/pkg/aws/client/client.go index d883135a..7b39fcbf 100644 --- a/pkg/aws/client/client.go +++ b/pkg/aws/client/client.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/client/fake/client.go b/pkg/aws/client/fake/client.go index 0bd36675..08f1ff28 100644 --- a/pkg/aws/client/fake/client.go +++ b/pkg/aws/client/fake/client.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/ec2helpers.go b/pkg/aws/ec2helpers.go index 48c9370d..7624b5c1 100644 --- a/pkg/aws/ec2helpers.go +++ b/pkg/aws/ec2helpers.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/errors.go b/pkg/aws/errors.go index 83ad8685..73c60f59 100644 --- a/pkg/aws/errors.go +++ b/pkg/aws/errors.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/gw-machineset.go b/pkg/aws/gw-machineset.go index a9e9ec81..7b626878 100644 --- a/pkg/aws/gw-machineset.go +++ b/pkg/aws/gw-machineset.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/ocpgwdeployer.go b/pkg/aws/ocpgwdeployer.go index 2c5035cc..d658939b 100644 --- a/pkg/aws/ocpgwdeployer.go +++ b/pkg/aws/ocpgwdeployer.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/ocpgwdeployer_test.go b/pkg/aws/ocpgwdeployer_test.go index d42b9524..7c901a6f 100644 --- a/pkg/aws/ocpgwdeployer_test.go +++ b/pkg/aws/ocpgwdeployer_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/securitygroups.go b/pkg/aws/securitygroups.go index 04127f82..a3707a19 100644 --- a/pkg/aws/securitygroups.go +++ b/pkg/aws/securitygroups.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/subnets.go b/pkg/aws/subnets.go index 4bd84496..bf52dee2 100644 --- a/pkg/aws/subnets.go +++ b/pkg/aws/subnets.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/validations.go b/pkg/aws/validations.go index 9e207396..9ea66b95 100644 --- a/pkg/aws/validations.go +++ b/pkg/aws/validations.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/aws/vpcs.go b/pkg/aws/vpcs.go index 11afef7a..8e1e1847 100644 --- a/pkg/aws/vpcs.go +++ b/pkg/aws/vpcs.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/azure/azure.go b/pkg/azure/azure.go index 4c7c563b..4627a575 100644 --- a/pkg/azure/azure.go +++ b/pkg/azure/azure.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/azure/cloud_info.go b/pkg/azure/cloud_info.go index 9dc234d3..4d1b2e09 100644 --- a/pkg/azure/cloud_info.go +++ b/pkg/azure/cloud_info.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/azure/gw-machineset.go b/pkg/azure/gw-machineset.go index 654fe40f..b89b87f3 100644 --- a/pkg/azure/gw-machineset.go +++ b/pkg/azure/gw-machineset.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/azure/ocpgwdeployer.go b/pkg/azure/ocpgwdeployer.go index e38933b8..59a9daba 100644 --- a/pkg/azure/ocpgwdeployer.go +++ b/pkg/azure/ocpgwdeployer.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/azure/ocpgwdeployer_test.go b/pkg/azure/ocpgwdeployer_test.go index cc45e914..efcee3b7 100644 --- a/pkg/azure/ocpgwdeployer_test.go +++ b/pkg/azure/ocpgwdeployer_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/client/client.go b/pkg/gcp/client/client.go index c1dad575..362eb3da 100644 --- a/pkg/gcp/client/client.go +++ b/pkg/gcp/client/client.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/client/fake/client.go b/pkg/gcp/client/fake/client.go index 35f40100..c5f269b6 100644 --- a/pkg/gcp/client/fake/client.go +++ b/pkg/gcp/client/fake/client.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/cloud_info.go b/pkg/gcp/cloud_info.go index 59a5a42c..81ccaf2e 100644 --- a/pkg/gcp/cloud_info.go +++ b/pkg/gcp/cloud_info.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/firewall_rules.go b/pkg/gcp/firewall_rules.go index 19d3966a..c4dcfcd0 100644 --- a/pkg/gcp/firewall_rules.go +++ b/pkg/gcp/firewall_rules.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/gcp.go b/pkg/gcp/gcp.go index ad5d8f76..4eeb1358 100644 --- a/pkg/gcp/gcp.go +++ b/pkg/gcp/gcp.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/gcp_cloud_test.go b/pkg/gcp/gcp_cloud_test.go index e73b9d0d..c33179ea 100644 --- a/pkg/gcp/gcp_cloud_test.go +++ b/pkg/gcp/gcp_cloud_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/gcp_suite_test.go b/pkg/gcp/gcp_suite_test.go index 5e8a40ab..065664aa 100644 --- a/pkg/gcp/gcp_suite_test.go +++ b/pkg/gcp/gcp_suite_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/gw-machineset.go b/pkg/gcp/gw-machineset.go index 3f843a21..2d16ce9b 100644 --- a/pkg/gcp/gw-machineset.go +++ b/pkg/gcp/gw-machineset.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/ocpgwdeployer.go b/pkg/gcp/ocpgwdeployer.go index 279c7374..5391b488 100644 --- a/pkg/gcp/ocpgwdeployer.go +++ b/pkg/gcp/ocpgwdeployer.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/gcp/ocpgwdeployer_test.go b/pkg/gcp/ocpgwdeployer_test.go index b79bc04c..2cac3d03 100644 --- a/pkg/gcp/ocpgwdeployer_test.go +++ b/pkg/gcp/ocpgwdeployer_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/generic/generic_suite_test.go b/pkg/generic/generic_suite_test.go index a1a51665..28ff2311 100644 --- a/pkg/generic/generic_suite_test.go +++ b/pkg/generic/generic_suite_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/generic/gwdeployer.go b/pkg/generic/gwdeployer.go index b713b8d4..eb505b21 100644 --- a/pkg/generic/gwdeployer.go +++ b/pkg/generic/gwdeployer.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/generic/gwdeployer_test.go b/pkg/generic/gwdeployer_test.go index 4e4b4565..845a6921 100644 --- a/pkg/generic/gwdeployer_test.go +++ b/pkg/generic/gwdeployer_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/k8s/k8s_suite_test.go b/pkg/k8s/k8s_suite_test.go index 93cb942f..59fe9c30 100644 --- a/pkg/k8s/k8s_suite_test.go +++ b/pkg/k8s/k8s_suite_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/k8s/k8siface.go b/pkg/k8s/k8siface.go index e6702abc..041e475b 100644 --- a/pkg/k8s/k8siface.go +++ b/pkg/k8s/k8siface.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/k8s/k8siface_test.go b/pkg/k8s/k8siface_test.go index 4cd11952..4fa0cdbb 100644 --- a/pkg/k8s/k8siface_test.go +++ b/pkg/k8s/k8siface_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/ocp/fake/machineset.go b/pkg/ocp/fake/machineset.go index 61f7ffb9..57dd4f84 100644 --- a/pkg/ocp/fake/machineset.go +++ b/pkg/ocp/fake/machineset.go @@ -5,7 +5,7 @@ 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 +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, diff --git a/pkg/ocp/machinesets.go b/pkg/ocp/machinesets.go index 913b201c..039f67f2 100644 --- a/pkg/ocp/machinesets.go +++ b/pkg/ocp/machinesets.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/ocp/machinesets_test.go b/pkg/ocp/machinesets_test.go index 007c6b85..f5213158 100644 --- a/pkg/ocp/machinesets_test.go +++ b/pkg/ocp/machinesets_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/ocp/ocp_suite_test.go b/pkg/ocp/ocp_suite_test.go index 89d72469..a46c2be1 100644 --- a/pkg/ocp/ocp_suite_test.go +++ b/pkg/ocp/ocp_suite_test.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/rhos/gw-machineset.go b/pkg/rhos/gw-machineset.go index f87bff56..9249e4dc 100644 --- a/pkg/rhos/gw-machineset.go +++ b/pkg/rhos/gw-machineset.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/rhos/ocpgwdeployer.go b/pkg/rhos/ocpgwdeployer.go index 46900f9e..6cd6b844 100644 --- a/pkg/rhos/ocpgwdeployer.go +++ b/pkg/rhos/ocpgwdeployer.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/rhos/rhos.go b/pkg/rhos/rhos.go index 68151e79..81e59d11 100644 --- a/pkg/rhos/rhos.go +++ b/pkg/rhos/rhos.go @@ -7,7 +7,7 @@ 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 +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, diff --git a/pkg/rhos/securitygroups.go b/pkg/rhos/securitygroups.go index 9c024721..baaa29ea 100644 --- a/pkg/rhos/securitygroups.go +++ b/pkg/rhos/securitygroups.go @@ -7,7 +7,7 @@ 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 +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,