Skip to content

Commit d43d0ff

Browse files
authored
Fix Dependabot issues (#1047)
* fix dependabot issues, requires a bump in k8s versions Signed-off-by: Kim Tsao <[email protected]> * re-generated devworkspace files Signed-off-by: Kim Tsao <[email protected]> * Vendor updates Signed-off-by: Kim Tsao <[email protected]> --------- Signed-off-by: Kim Tsao <[email protected]>
1 parent 4964dd9 commit d43d0ff

File tree

359 files changed

+45009
-10659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+45009
-10659
lines changed

go.mod

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,40 @@ go 1.18
44

55
require (
66
github.com/ghodss/yaml v1.0.0
7-
github.com/google/go-cmp v0.5.5
7+
github.com/google/go-cmp v0.5.9
88
github.com/google/gofuzz v1.2.0
99
github.com/hashicorp/go-multierror v1.1.0
1010
github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb
1111
github.com/mitchellh/reflectwalk v1.0.1
1212
github.com/santhosh-tekuri/jsonschema v1.2.4
13-
github.com/stretchr/testify v1.7.0
14-
k8s.io/api v0.21.3
15-
k8s.io/apiextensions-apiserver v0.21.3
16-
k8s.io/apimachinery v0.21.3
17-
sigs.k8s.io/controller-runtime v0.9.5
18-
sigs.k8s.io/yaml v1.2.0
13+
github.com/stretchr/testify v1.8.0
14+
k8s.io/api v0.26.1
15+
k8s.io/apiextensions-apiserver v0.26.1
16+
k8s.io/apimachinery v0.26.1
17+
sigs.k8s.io/controller-runtime v0.14.4
18+
sigs.k8s.io/yaml v1.3.0
1919
)
2020

2121
require (
2222
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/go-logr/logr v0.4.0 // indirect
23+
github.com/go-logr/logr v1.2.3 // indirect
2424
github.com/gogo/protobuf v1.3.2 // indirect
2525
github.com/golang/protobuf v1.5.2 // indirect
26-
github.com/googleapis/gnostic v0.5.5 // indirect
26+
github.com/google/gnostic v0.5.7-v3refs // indirect
2727
github.com/hashicorp/errwrap v1.0.0 // indirect
28-
github.com/json-iterator/go v1.1.11 // indirect
28+
github.com/json-iterator/go v1.1.12 // indirect
2929
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
30-
github.com/modern-go/reflect2 v1.0.1 // indirect
30+
github.com/modern-go/reflect2 v1.0.2 // indirect
3131
github.com/pmezard/go-difflib v1.0.0 // indirect
32-
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
33-
golang.org/x/text v0.3.6 // indirect
34-
google.golang.org/protobuf v1.26.0 // indirect
32+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
33+
golang.org/x/text v0.5.0 // indirect
34+
google.golang.org/protobuf v1.28.1 // indirect
3535
gopkg.in/inf.v0 v0.9.1 // indirect
3636
gopkg.in/yaml.v2 v2.4.0 // indirect
37-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
38-
k8s.io/klog/v2 v2.8.0 // indirect
39-
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
40-
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471 // indirect
41-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
37+
gopkg.in/yaml.v3 v3.0.1 // indirect
38+
k8s.io/klog/v2 v2.80.1 // indirect
39+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
40+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
41+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
42+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
4243
)

go.sum

Lines changed: 46 additions & 581 deletions
Large diffs are not rendered by default.

schemas/latest/dev-workspace-template.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"type": "string"
2323
}
2424
},
25-
"clusterName": {
26-
"description": "The name of the cluster which the object belongs to. This is used to distinguish resources with same name and namespace in different clusters. This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request.",
27-
"type": "string"
28-
},
2925
"creationTimestamp": {
3026
"description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
3127
"type": "string",
@@ -49,7 +45,7 @@
4945
}
5046
},
5147
"generateName": {
52-
"description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
48+
"description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
5349
"type": "string"
5450
},
5551
"generation": {
@@ -92,8 +88,12 @@
9288
"description": "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'.",
9389
"type": "string"
9490
},
91+
"subresource": {
92+
"description": "Subresource is the name of the subresource used to update that object, or empty string if the object was updated through the main resource. The value of this field is used to distinguish between managers, even if they share the same name. For example, a status update will be distinct from a regular update using the same manager name. Note that the APIVersion field is not related to the Subresource field and it always corresponds to the version of the main resource.",
93+
"type": "string"
94+
},
9595
"time": {
96-
"description": "Time is timestamp of when these fields were set. It should always be empty if Operation is 'Apply'",
96+
"description": "Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.",
9797
"type": "string",
9898
"format": "date-time"
9999
}
@@ -127,7 +127,7 @@
127127
"type": "string"
128128
},
129129
"blockOwnerDeletion": {
130-
"description": "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
130+
"description": "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion for how the garbage collector interacts with this field and enforces the foreground deletion. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
131131
"type": "boolean"
132132
},
133133
"controller": {
@@ -155,7 +155,7 @@
155155
"type": "string"
156156
},
157157
"selfLink": {
158-
"description": "SelfLink is a URL representing this object. Populated by the system. Read-only.\n\nDEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.",
158+
"description": "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
159159
"type": "string"
160160
},
161161
"uid": {

schemas/latest/dev-workspace.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"type": "string"
2323
}
2424
},
25-
"clusterName": {
26-
"description": "The name of the cluster which the object belongs to. This is used to distinguish resources with same name and namespace in different clusters. This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request.",
27-
"type": "string"
28-
},
2925
"creationTimestamp": {
3026
"description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
3127
"type": "string",
@@ -49,7 +45,7 @@
4945
}
5046
},
5147
"generateName": {
52-
"description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
48+
"description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
5349
"type": "string"
5450
},
5551
"generation": {
@@ -92,8 +88,12 @@
9288
"description": "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'.",
9389
"type": "string"
9490
},
91+
"subresource": {
92+
"description": "Subresource is the name of the subresource used to update that object, or empty string if the object was updated through the main resource. The value of this field is used to distinguish between managers, even if they share the same name. For example, a status update will be distinct from a regular update using the same manager name. Note that the APIVersion field is not related to the Subresource field and it always corresponds to the version of the main resource.",
93+
"type": "string"
94+
},
9595
"time": {
96-
"description": "Time is timestamp of when these fields were set. It should always be empty if Operation is 'Apply'",
96+
"description": "Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.",
9797
"type": "string",
9898
"format": "date-time"
9999
}
@@ -127,7 +127,7 @@
127127
"type": "string"
128128
},
129129
"blockOwnerDeletion": {
130-
"description": "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
130+
"description": "If true, AND if the owner has the \"foregroundDeletion\" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion for how the garbage collector interacts with this field and enforces the foreground deletion. Defaults to false. To set this field, a user needs \"delete\" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.",
131131
"type": "boolean"
132132
},
133133
"controller": {
@@ -155,7 +155,7 @@
155155
"type": "string"
156156
},
157157
"selfLink": {
158-
"description": "SelfLink is a URL representing this object. Populated by the system. Read-only.\n\nDEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.",
158+
"description": "Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.",
159159
"type": "string"
160160
},
161161
"uid": {

0 commit comments

Comments
 (0)