Skip to content

Commit

Permalink
upgrade k8s
Browse files Browse the repository at this point in the history
  • Loading branch information
@tjons
tjons committed Sep 9, 2024
1 parent f4b2316 commit 29ed163
Show file tree
Hide file tree
Showing 11 changed files with 210 additions and 485 deletions.
18 changes: 10 additions & 8 deletions ci/oss_compliance/osa_provided.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ Name|Version|License
---|---|---
[perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License
[xxhash/v2](https://github.com/cespare/xxhash)|v2.3.0|MIT License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.1|ISC License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.2-0.20180830191138-d8f796af33cc|ISC License
[v3/log](https://github.com/emicklei/go-restful)|v3.11.0|MIT License
[internal/json](https://github.com/evanphx/json-patch)|v5.9.0|BSD 3-clause "New" or "Revised" License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
[cbor/v2](https://github.com/fxamacker/cbor)|v2.7.0|MIT License
[go-logr/logr](https://github.com/go-logr/logr)|v1.4.2|Apache License 2.0
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.20.2|Apache License 2.0
[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.2|Apache License 2.0
Expand All @@ -31,9 +32,10 @@ Name|Version|License
[prometheus/common](https://github.com/prometheus/common)|v0.55.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.15.1|Apache License 2.0
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License
[x448/float16](https://github.com/x448/float16)|v0.8.4|MIT License
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.26.0|MIT License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20230515195305-f3d0a9c9a5cc|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.26.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.21.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.23.0|BSD 3-clause "New" or "Revised" License
Expand All @@ -44,13 +46,13 @@ Name|Version|License
[gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
[gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License
[k8s.io/api](https://k8s.io/api)|v0.30.0|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.30.0|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.30.0|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.120.1|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.31.0|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.31.0|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.31.0|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.130.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20240228011516-70dd3763d340|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20230726121419-3b25d923346b|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.18.2|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.19.0|Apache License 2.0
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20221116044647-bc3834ca7abd|Apache License 2.0
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.4.1|Apache License 2.0
[yaml/goyaml.v2](https://sigs.k8s.io/yaml/goyaml.v2)|v1.4.0|Apache License 2.0
Expand Down
85 changes: 63 additions & 22 deletions codegen/test/chart/values.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@
"properties": {
"name": {
"type": "string"
},
"request": {
"type": "string"
}
},
"type": "object"
Expand Down Expand Up @@ -615,6 +618,9 @@
"properties": {
"name": {
"type": "string"
},
"request": {
"type": "string"
}
},
"type": "object"
Expand Down Expand Up @@ -955,6 +961,16 @@
}
]
},
"supplementalGroupsPolicy": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"fsGroup": {
"anyOf": [
{
Expand Down Expand Up @@ -3245,6 +3261,17 @@
}
},
"type": "object"
},
"image": {
"properties": {
"reference": {
"type": "string"
},
"pullPolicy": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
Expand Down Expand Up @@ -3582,6 +3609,9 @@
"properties": {
"name": {
"type": "string"
},
"request": {
"type": "string"
}
},
"type": "object"
Expand Down Expand Up @@ -4893,6 +4923,9 @@
"properties": {
"name": {
"type": "string"
},
"request": {
"type": "string"
}
},
"type": "object"
Expand Down Expand Up @@ -6204,6 +6237,9 @@
"properties": {
"name": {
"type": "string"
},
"request": {
"type": "string"
}
},
"type": "object"
Expand Down Expand Up @@ -7359,6 +7395,16 @@
}
]
},
"supplementalGroupsPolicy": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"fsGroup": {
"anyOf": [
{
Expand Down Expand Up @@ -8857,30 +8903,25 @@
"name": {
"type": "string"
},
"source": {
"properties": {
"resourceClaimName": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
"resourceClaimName": {
"anyOf": [
{
"type": "string"
},
"resourceClaimTemplateName": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
{
"type": "null"
}
},
"type": "object"
]
},
"resourceClaimTemplateName": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
}
},
"type": "object"
Expand Down
52 changes: 27 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ module github.com/solo-io/skv2

go 1.23.1

toolchain go1.23.1

require (
github.com/BurntSushi/toml v0.3.1
github.com/BurntSushi/toml v1.3.2
github.com/Masterminds/semver v1.4.2
github.com/Masterminds/sprig/v3 v3.1.0
github.com/Masterminds/sprig/v3 v3.2.3
github.com/avast/retry-go/v4 v4.3.3
github.com/envoyproxy/protoc-gen-validate v0.9.1
github.com/gertd/go-pluralize v0.1.1
Expand All @@ -22,7 +20,7 @@ require (
github.com/google/gnostic-models v0.6.8
github.com/google/go-cmp v0.6.0
github.com/grafana/pyroscope-go/godeltaprof v0.1.6
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-multierror v1.1.1
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0
github.com/iancoleman/strcase v0.2.0
github.com/invopop/jsonschema v0.7.0
Expand All @@ -42,42 +40,43 @@ require (
github.com/solo-io/cue v0.4.7
github.com/solo-io/go-list-licenses v0.0.4
github.com/solo-io/go-utils v0.26.0
github.com/solo-io/k8s-utils v0.0.1
github.com/solo-io/k8s-utils v0.8.0
github.com/solo-io/protoc-gen-ext v0.0.20
github.com/solo-io/protoc-gen-openapi v0.2.5
github.com/spf13/pflag v1.0.5
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20220921164117-439092de6870
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc
golang.org/x/tools v0.22.0
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.30.0
k8s.io/apiextensions-apiserver v0.30.0
k8s.io/apimachinery v0.30.0
k8s.io/client-go v0.30.0
k8s.io/code-generator v0.30.0
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.18.2
k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
k8s.io/code-generator v0.31.0
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig v2.15.0+incompatible // indirect
github.com/aokoli/goutils v1.0.1 // indirect
github.com/avast/retry-go v2.2.0+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fgrosse/zaptest v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.8 // indirect
Expand All @@ -90,9 +89,9 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/huandu/xstrings v1.3.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/joho/godotenv v1.3.0 // indirect
Expand All @@ -105,8 +104,8 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-zglob v0.0.3 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
Expand All @@ -118,9 +117,11 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
Expand All @@ -135,6 +136,7 @@ require (
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
Expand Down
Loading

0 comments on commit 29ed163

Please sign in to comment.