Skip to content

Commit 692d380

Browse files
committed
Bump k8s 1.23.1
Add a guideline to update k8s dependencies Signed-off-by: fossedihelm <[email protected]>
1 parent 90227f2 commit 692d380

File tree

2,240 files changed

+190583
-38830
lines changed

Some content is hidden

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

2,240 files changed

+190583
-38830
lines changed

api/api-rule-violations-known.list

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommo
2626
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Command
2727
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Env
2828
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,EnvFrom
29-
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Ports
3029
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeDevices
3130
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeMounts
32-
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainers,EphemeralContainers
3331
API rule violation: list_type_missing,k8s.io/api/core/v1,EventList,Items
3432
API rule violation: list_type_missing,k8s.io/api/core/v1,ExecAction,Command
3533
API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,TargetWWNs
@@ -111,7 +109,6 @@ API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceAccountList,Item
111109
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceList,Items
112110
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,ExternalIPs
113111
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,LoadBalancerSourceRanges
114-
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,TopologyKeys
115112
API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorLabelRequirement,Values
116113
API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorTerm,MatchLabelExpressions
117114
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
@@ -122,6 +119,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIRe
122119
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
123120
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
124121
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
122+
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
125123
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
126124
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
127125
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw

api/api-rule-violations.list

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommo
2626
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Command
2727
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Env
2828
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,EnvFrom
29-
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Ports
3029
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeDevices
3130
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeMounts
32-
API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainers,EphemeralContainers
3331
API rule violation: list_type_missing,k8s.io/api/core/v1,EventList,Items
3432
API rule violation: list_type_missing,k8s.io/api/core/v1,ExecAction,Command
3533
API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,TargetWWNs
@@ -111,7 +109,6 @@ API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceAccountList,Item
111109
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceList,Items
112110
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,ExternalIPs
113111
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,LoadBalancerSourceRanges
114-
API rule violation: list_type_missing,k8s.io/api/core/v1,ServiceSpec,TopologyKeys
115112
API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorLabelRequirement,Values
116113
API rule violation: list_type_missing,k8s.io/api/core/v1,TopologySelectorTerm,MatchLabelExpressions
117114
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
@@ -122,6 +119,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIRe
122119
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
123120
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
124121
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
122+
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
125123
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
126124
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
127125
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw

api/openapi-spec/swagger.json

+17-5
Original file line numberDiff line numberDiff line change
@@ -11350,11 +11350,15 @@
1135011350
}
1135111351
},
1135211352
"dataSource": {
11353-
"description": "This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) * An existing custom resource that implements data population (Alpha) In order to use custom resource types that implement data population, the AnyVolumeDataSource feature gate must be enabled. If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source.",
11353+
"description": "This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. If the AnyVolumeDataSource feature gate is enabled, this field will always have the same contents as the DataSourceRef field.",
11354+
"$ref": "#/definitions/k8s.io.api.core.v1.TypedLocalObjectReference"
11355+
},
11356+
"dataSourceRef": {
11357+
"description": "Specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any local object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the DataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, both fields (DataSource and DataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, DataSourceRef\n allows any non-core object, as well as PersistentVolumeClaim objects.\n* While DataSource ignores disallowed values (dropping them), DataSourceRef\n preserves all values, and generates an error if a disallowed value is\n specified.\n(Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.",
1135411358
"$ref": "#/definitions/k8s.io.api.core.v1.TypedLocalObjectReference"
1135511359
},
1135611360
"resources": {
11357-
"description": "Resources represents the minimum resources the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources",
11361+
"description": "Resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources",
1135811362
"$ref": "#/definitions/k8s.io.api.core.v1.ResourceRequirements"
1135911363
},
1136011364
"selector": {
@@ -11423,8 +11427,12 @@
1142311427
"description": "A label query over a set of resources, in this case pods.",
1142411428
"$ref": "#/definitions/k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector"
1142511429
},
11430+
"namespaceSelector": {
11431+
"description": "A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means \"this pod's namespace\". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.",
11432+
"$ref": "#/definitions/k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector"
11433+
},
1142611434
"namespaces": {
11427-
"description": "namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means \"this pod's namespace\"",
11435+
"description": "namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means \"this pod's namespace\"",
1142811436
"type": "array",
1142911437
"items": {
1143011438
"type": "string"
@@ -11541,14 +11549,14 @@
1154111549
"type": "object",
1154211550
"properties": {
1154311551
"limits": {
11544-
"description": "Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/",
11552+
"description": "Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/",
1154511553
"type": "object",
1154611554
"additionalProperties": {
1154711555
"$ref": "#/definitions/k8s.io.apimachinery.pkg.api.resource.Quantity"
1154811556
}
1154911557
},
1155011558
"requests": {
11551-
"description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/",
11559+
"description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/",
1155211560
"type": "object",
1155311561
"additionalProperties": {
1155411562
"$ref": "#/definitions/k8s.io.apimachinery.pkg.api.resource.Quantity"
@@ -11961,6 +11969,10 @@
1196111969
"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'.",
1196211970
"type": "string"
1196311971
},
11972+
"subresource": {
11973+
"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.",
11974+
"type": "string"
11975+
},
1196411976
"time": {
1196511977
"description": "Time is timestamp of when these fields were set. It should always be empty if Operation is 'Apply'",
1196611978
"$ref": "#/definitions/k8s.io.apimachinery.pkg.apis.meta.v1.Time"

docs/update-k8s-dependencies.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Updating Dependencies
2+
3+
## Updating k8s dependencies
4+
5+
To correctly update k8s dependencies we have to first bump all replace directives of `k8s.io/*` in
6+
* [go.mod](../go.mod)
7+
* [staging/client-go/go.mod](../staging/src/kubevirt.io/client-go/go.mod)
8+
* [staging/src/kubevirt.io/api/go.mod](../staging/src/kubevirt.io/api/go.mod)
9+
10+
Then (if necessary) delete generated code that potentially references deprecated or eliminated stuff (like the mock client) and, on cascade, fix the files[1] that include these (remember which files are affected because at the end you will have to revert the changes you made to restore them).
11+
Delete generated code is not a problem because it will be regenerated.
12+
Run `make deps-update` to update dependencies.
13+
Run `make && make generate` to regenerate the code.
14+
Don't forget to restore the files edited in [1].

docs/updating-dependencies.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ states. If specific changes are needed, first manipulate our main
88
[staging/client-go](../staging/src/kubevirt.io/client-go) are located in a
99
separate [go.mod](../staging/src/kubevirt.io/client-go/go.mod). Changing in the
1010
staging area will be inherited by the main go.mod when running `make
11-
deps-update`.
11+
deps-update`.
12+
To update k8s dependencies please follow [update-k8s-dependencies](update-k8s-dependencies.md)
1213

1314
## Updating RPM test dependencies
1415

0 commit comments

Comments
 (0)