Upgrading the vendor packages to support k8s 1.20 (F5Networks#1771)

Upgrading the vendor packages to support k8s 1.20

all_attributions.txt

@@ -67,6 +67,37 @@ LICENSE:
       "You" (or "Your") shall mean an individual or Legal Entity
       exercising permissions granted by this License.
 
+github.com/cespare/xxhash
+License:        MIT
+Matched files:  LICENSE.txt
+LICENSE.txt:
+  Content hash:  4c2c763d64bbc7ef2e58b0ec6d06d90cee9755c9
+  Attribution:   Copyright (c) 2016 Caleb Spare
+  Confidence:    100.00%
+  Matcher:       Licensee::Matchers::Exact
+  License:       MIT
+Copyright (c) 2016 Caleb Spare
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 github.com/davecgh/go-spew
 License:        ISC
 Matched files:  LICENSE
@@ -106,7 +137,7 @@ github.com/evanphx/json-patch
 License:        BSD-3-Clause
 Matched files:  LICENSE
 LICENSE:
-  Content hash:  0efe94390eb408b88574fd22716b5161bda903a5
+  Content hash:  485d69e4c5dd2183836a4ee4ae439a0c06c30aa9
   Attribution:   Copyright (c) 2014, Evan Phoenix
   Confidence:    99.17%
   Matcher:       Licensee::Matchers::Dice
@@ -814,6 +845,50 @@ LICENSE:
       "You" (or "Your") shall mean an individual or Legal Entity
       exercising permissions granted by this License.
 
+github.com/pkg/errors
+License:        BSD-2-Clause
+Matched files:  LICENSE, README.md
+LICENSE:
+  Content hash:  a307ca750c21f262c95d2bce55e69c05e6c3dee9
+  Attribution:   Copyright (c) 2015, Dave Cheney <[email protected]>
+  Confidence:    100.00%
+  Matcher:       Licensee::Matchers::Exact
+  License:       BSD-2-Clause
+README.md:
+  Content hash:  da39a3ee5e6b4b0d3255bfef95601890afd80709
+  Confidence:    90.00%
+  Matcher:       Licensee::Matchers::Reference
+  License:       BSD-2-Clause
+  Closest non-matching licenses:
+    Zlib similarity:   0.00%
+    WTFPL similarity:  0.00%
+    Vim similarity:    0.00%
+
+                                 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.
+
 github.com/prometheus/client_golang
 License:        Apache-2.0
 Matched files:  LICENSE
@@ -998,7 +1073,31 @@ LICENSE-APACHE-2.0.txt:
   Confidence:    100.00%
   Matcher:       Licensee::Matchers::Exact
   License:       Apache-2.0
-Unable to detect the license file path
+
+                                 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.
 github.com/xeipuuv/gojsonreference
 License:        Apache-2.0
 Matched files:  LICENSE-APACHE-2.0.txt
@@ -1007,7 +1106,31 @@ LICENSE-APACHE-2.0.txt:
   Confidence:    100.00%
   Matcher:       Licensee::Matchers::Exact
   License:       Apache-2.0
-Unable to detect the license file path
+
+                                 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.
 github.com/xeipuuv/gojsonschema
 License:        Apache-2.0
 Matched files:  LICENSE-APACHE-2.0.txt
@@ -1016,7 +1139,31 @@ LICENSE-APACHE-2.0.txt:
   Confidence:    100.00%
   Matcher:       Licensee::Matchers::Exact
   License:       Apache-2.0
-Unable to detect the license file path
+
+                                 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.
 golang.org/x/crypto
 License:        NOASSERTION
 Matched files:  LICENSE, PATENTS
@@ -1594,6 +1741,40 @@ LICENSE:
       exercising permissions granted by this License.
 
 Cannot handle this repo: modules.txt
+sigs.k8s.io/structured-merge-diff
+License:        Apache-2.0
+Matched files:  LICENSE
+LICENSE:
+  Content hash:  bec905d850e7f5dc2e2db78a950d4a9db560a0b8
+  Confidence:    100.00%
+  Matcher:       Licensee::Matchers::Exact
+  License:       Apache-2.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.
+
 sigs.k8s.io/yaml
 License:        NOASSERTION
 Matched files:  LICENSE

build-tools/attributions-generator.sh

@@ -44,15 +44,30 @@ LICENSE-APACHE-2.0.txt:
   Matcher:       Licensee::Matchers::Exact
   License:       Apache-2.0"
             echo "$license_text"
-            echo "Unable to detect the license file path"
+            head -25 $vendor/$repo/$projects/$package/LICENSE-APACHE-2.0.txt
             continue
             fi
+            if [ $projects == "cespare" ]  && [ $package == "xxhash" ]
+            then
+              package=$package/v2
+              licensee detect $vendor/$repo/$projects/$package
+              head -25 $vendor/$repo/$projects/$package/LICENSE.txt
+              continue
+            fi
             licensee detect $vendor/$repo/$projects/$package
             licensee license-path $vendor/$repo/$projects/$package | xargs head -25
             echo
         done ; 
         else 
         echo $repo/$projects ;
+        if [ $repo == "k8s.io" ]  && [ $projects == "klog" ]
+        then
+          projects=$projects/v2
+        fi
+        if [ $repo == "sigs.k8s.io" ]  && [ $projects == "structured-merge-diff" ]
+        then
+          projects=$projects/v4
+        fi
         licensee detect $vendor/$repo/$projects;
         licensee license-path $vendor/$repo/$projects | xargs head -25
         echo

cmd/k8s-bigip-ctlr/main.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -1126,7 +1127,7 @@ func getBIGIPTrustedCerts() string {
 }
 
 func getConfigMapUsingNamespaceAndName(cfgMapNamespace, cfgMapName string) (*v1.ConfigMap, error) {
-	cfgMap, err := kubeClient.CoreV1().ConfigMaps(cfgMapNamespace).Get(cfgMapName, metav1.GetOptions{})
+	cfgMap, err := kubeClient.CoreV1().ConfigMaps(cfgMapNamespace).Get(context.TODO(), cfgMapName, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -1181,11 +1182,11 @@ func getUserAgentInfo() string {
 	var vInfo []byte
 	rc := kubeClient.Discovery().RESTClient()
 	// support for ocp < 3.11
-	if vInfo, err = rc.Get().AbsPath(versionPathOpenshiftv3).DoRaw(); err == nil {
+	if vInfo, err = rc.Get().AbsPath(versionPathOpenshiftv3).DoRaw(context.TODO()); err == nil {
 		if err = json.Unmarshal(vInfo, &versionInfo); err == nil {
 			return fmt.Sprintf("CIS/v%v OCP/%v", version, versionInfo["gitVersion"])
 		}
-	} else if vInfo, err = rc.Get().AbsPath(versionPathOpenshiftv4).DoRaw(); err == nil {
+	} else if vInfo, err = rc.Get().AbsPath(versionPathOpenshiftv4).DoRaw(context.TODO()); err == nil {
 		// support ocp > 4.0
 		var ocp4 Ocp4Version
 		if er := json.Unmarshal(vInfo, &ocp4); er == nil {
@@ -1194,7 +1195,7 @@ func getUserAgentInfo() string {
 			}
 			return fmt.Sprintf("CIS/v%v OCP/v4.0.0", version)
 		}
-	} else if vInfo, err = rc.Get().AbsPath(versionPathk8s).DoRaw(); err == nil {
+	} else if vInfo, err = rc.Get().AbsPath(versionPathk8s).DoRaw(context.TODO()); err == nil {
 		// support k8s
 		if er := json.Unmarshal(vInfo, &versionInfo); er == nil {
 			return fmt.Sprintf("CIS/v%v K8S/%v", version, versionInfo["gitVersion"])