Skip to content

Commit

Permalink
update go version to 1.20 and update k8s and yaml dependencies (#82)
Browse files Browse the repository at this point in the history
* update k8s and yaml dependencies

* update go version to 1.20

* update notice file
  • Loading branch information
simitt authored Aug 8, 2023
1 parent 313cf31 commit 170162e
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 274 deletions.
97 changes: 30 additions & 67 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Third party libraries used by the Elastic APM Kubernetes Webhook receiver.

--------------------------------------------------------------------------------
Module : github.com/go-logr/logr
Version : v1.2.0
Time : 2021-10-20T18:15:37Z
Version : v1.2.3
Time : 2022-03-17T09:17:06Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/github.com/go-logr/[email protected].0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-logr/[email protected].3/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -273,43 +273,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



--------------------------------------------------------------------------------
Module : github.com/google/go-cmp
Version : v0.5.5
Time : 2021-03-03T20:48:37Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/github.com/google/[email protected]/LICENSE:

Copyright (c) 2017 The Go Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------------------
Module : github.com/google/gofuzz
Version : v1.1.0
Expand Down Expand Up @@ -977,11 +940,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/[email protected]

--------------------------------------------------------------------------------
Module : golang.org/x/net
Version : v0.0.0-20211209124913-491a49abca63
Time : 2021-12-09T12:49:13Z
Version : v0.8.0
Time : 2023-03-05T02:51:52Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20211209124913-491a49abca63/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.8.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -1014,11 +977,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : golang.org/x/text
Version : v0.3.7
Time : 2021-08-10T18:28:16Z
Version : v0.8.0
Time : 2023-02-27T23:15:59Z
Licence : BSD-3-Clause

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.3.7/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.8.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -1300,11 +1263,11 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/[email protected]/LICENSE:

--------------------------------------------------------------------------------
Module : gopkg.in/yaml.v3
Version : v3.0.0-20210107192922-496545a6307b
Time : 2021-01-07T19:29:22Z
Version : v3.0.1
Time : 2022-05-27T08:35:30Z
Licence : MIT

Contents of probable licence file $GOMODCACHE/gopkg.in/[email protected].0-20210107192922-496545a6307b/LICENSE:
Contents of probable licence file $GOMODCACHE/gopkg.in/[email protected].1/LICENSE:


This project is covered by two different licenses: MIT and Apache.
Expand Down Expand Up @@ -1360,11 +1323,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Module : k8s.io/api
Version : v0.23.5
Time : 2022-03-17T02:22:09Z
Version : v0.27.4
Time : 2023-07-19T22:25:29Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.23.5/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.27.4/LICENSE:


Apache License
Expand Down Expand Up @@ -1572,11 +1535,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]/LICENSE:

--------------------------------------------------------------------------------
Module : k8s.io/apimachinery
Version : v0.23.5
Time : 2022-01-24T17:21:04Z
Version : v0.27.4
Time : 2023-07-16T20:19:07Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.23.5/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.27.4/LICENSE:


Apache License
Expand Down Expand Up @@ -1784,11 +1747,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]/LICENS

--------------------------------------------------------------------------------
Module : k8s.io/klog/v2
Version : v2.30.0
Time : 2021-10-22T07:54:37Z
Version : v2.90.1
Time : 2023-03-01T14:21:18Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/klog/v2@v2.30.0/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/klog/v2@v2.90.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -1985,11 +1948,11 @@ third-party archives.

--------------------------------------------------------------------------------
Module : k8s.io/utils
Version : v0.0.0-20211116205334-6203023598ed
Time : 2021-11-16T20:53:34Z
Version : v0.0.0-20230209194617-a36077c30491
Time : 2023-02-09T19:46:17Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]20211116205334-6203023598ed/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]20230209194617-a36077c30491/LICENSE:


Apache License
Expand Down Expand Up @@ -2197,11 +2160,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]

--------------------------------------------------------------------------------
Module : sigs.k8s.io/json
Version : v0.0.0-20211020170558-c049b76a60c6
Time : 2021-10-20T17:05:58Z
Version : v0.0.0-20221116044647-bc3834ca7abd
Time : 2022-11-16T04:46:47Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/sigs.k8s.io/[email protected]20211020170558-c049b76a60c6/LICENSE:
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/[email protected]20221116044647-bc3834ca7abd/LICENSE:

Files other than internal/golang/* licensed under:

Expand Down Expand Up @@ -2445,11 +2408,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Module : sigs.k8s.io/structured-merge-diff/v4
Version : v4.2.1
Time : 2021-12-04T18:42:31Z
Version : v4.2.3
Time : 2022-08-02T16:37:45Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/[email protected].1/LICENSE:
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/[email protected].3/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
21 changes: 10 additions & 11 deletions dependencies.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,23 @@ This page lists the third-party dependencies used to build {n}.
|===
| Name | Version | Licence

| link:https://github.com/go-logr/logr[$$github.com/go-logr/logr$$] | v1.2.0 | Apache-2.0
| link:https://github.com/go-logr/logr[$$github.com/go-logr/logr$$] | v1.2.3 | Apache-2.0
| link:https://github.com/gogo/protobuf[$$github.com/gogo/protobuf$$] | v1.3.2 | BSD-3-Clause
| link:https://github.com/google/go-cmp[$$github.com/google/go-cmp$$] | v0.5.5 | BSD-3-Clause
| link:https://github.com/google/gofuzz[$$github.com/google/gofuzz$$] | v1.1.0 | Apache-2.0
| link:https://github.com/json-iterator/go[$$github.com/json-iterator/go$$] | v1.1.12 | MIT
| link:https://github.com/modern-go/concurrent[$$github.com/modern-go/concurrent$$] | v0.0.0-20180306012644-bacd9c7ef1dd | Apache-2.0
| link:https://github.com/modern-go/reflect2[$$github.com/modern-go/reflect2$$] | v1.0.2 | Apache-2.0
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.0.0-20211209124913-491a49abca63 | BSD-3-Clause
| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.3.7 | BSD-3-Clause
| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.8.0 | BSD-3-Clause
| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.8.0 | BSD-3-Clause
| link:https://gopkg.in/inf.v0[$$gopkg.in/inf.v0$$] | v0.9.1 | BSD-3-Clause
| link:https://gopkg.in/yaml.v2[$$gopkg.in/yaml.v2$$] | v2.4.0 | Apache-2.0
| link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.0-20210107192922-496545a6307b | MIT
| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.23.5 | Apache-2.0
| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.23.5 | Apache-2.0
| link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.30.0 | Apache-2.0
| link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20211116205334-6203023598ed | Apache-2.0
| link:https://sigs.k8s.io/json[$$sigs.k8s.io/json$$] | v0.0.0-20211020170558-c049b76a60c6 | Apache-2.0
| link:https://sigs.k8s.io/structured-merge-diff/v4[$$sigs.k8s.io/structured-merge-diff/v4$$] | v4.2.1 | Apache-2.0
| link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.1 | MIT
| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.27.4 | Apache-2.0
| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.27.4 | Apache-2.0
| link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.90.1 | Apache-2.0
| link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20230209194617-a36077c30491 | Apache-2.0
| link:https://sigs.k8s.io/json[$$sigs.k8s.io/json$$] | v0.0.0-20221116044647-bc3834ca7abd | Apache-2.0
| link:https://sigs.k8s.io/structured-merge-diff/v4[$$sigs.k8s.io/structured-merge-diff/v4$$] | v4.2.3 | Apache-2.0
|===


25 changes: 12 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
module github.com/elastic/apm-mutating-webhook

go 1.17
go 1.20

require (
github.com/stretchr/testify v1.7.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
github.com/stretchr/testify v1.8.1
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/text v0.8.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit 170162e

Please sign in to comment.