Skip to content

Commit

Permalink
Merge pull request #5807 from RainbowMango/pr_bump_k8s_v1312
Browse files Browse the repository at this point in the history
Bump Kubernetes dependencies from v1.30.2 to v1.31.2
  • Loading branch information
karmada-bot authored Nov 15, 2024
2 parents e08cea1 + fc1df77 commit 0d7d2f9
Show file tree
Hide file tree
Showing 2,773 changed files with 132,759 additions and 85,698 deletions.
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ linters-settings:
- name: unexported-return
- name: time-naming
- name: empty-block
staticcheck:
# TODO(@RainbowMango): Disable deprecation check temporary for Kubernetes dependency update.
# This is tracked by https://github.com/karmada-io/karmada/issues/5796.
checks: ["all", "-SA1019"]

issues:
# The list of ids of default excludes to include or disable. By default it's empty.
Expand Down
101 changes: 93 additions & 8 deletions api/openapi-spec/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -16623,6 +16623,32 @@
"$ref": "#/parameters/watch-XNNPZGbK"
}
]
},
"/version/": {
"get": {
"description": "get the code version",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"schemes": [
"https"
],
"tags": [
"version"
],
"operationId": "getCodeVersion",
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.apimachinery.pkg.version.Info"
}
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -21439,7 +21465,8 @@
"type": "integer",
"format": "int32"
}
}
},
"x-kubernetes-map-type": "atomic"
},
"io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON": {
"description": "JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil."
Expand Down Expand Up @@ -21861,6 +21888,11 @@
"kind": "DeleteOptions",
"version": "v1"
},
{
"group": "coordination.k8s.io",
"kind": "DeleteOptions",
"version": "v1alpha1"
},
{
"group": "coordination.k8s.io",
"kind": "DeleteOptions",
Expand Down Expand Up @@ -21994,7 +22026,7 @@
{
"group": "resource.k8s.io",
"kind": "DeleteOptions",
"version": "v1alpha2"
"version": "v1alpha3"
},
{
"group": "scheduling.k8s.io",
Expand Down Expand Up @@ -22403,11 +22435,6 @@
"group": "",
"kind": "Status",
"version": "v1"
},
{
"group": "resource.k8s.io",
"kind": "Status",
"version": "v1alpha2"
}
]
},
Expand Down Expand Up @@ -22623,6 +22650,11 @@
"kind": "WatchEvent",
"version": "v1"
},
{
"group": "coordination.k8s.io",
"kind": "WatchEvent",
"version": "v1alpha1"
},
{
"group": "coordination.k8s.io",
"kind": "WatchEvent",
Expand Down Expand Up @@ -22756,7 +22788,7 @@
{
"group": "resource.k8s.io",
"kind": "WatchEvent",
"version": "v1alpha2"
"version": "v1alpha3"
},
{
"group": "scheduling.k8s.io",
Expand Down Expand Up @@ -22813,6 +22845,59 @@
"io.k8s.apimachinery.pkg.runtime.RawExtension": {
"description": "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
"type": "object"
},
"io.k8s.apimachinery.pkg.version.Info": {
"description": "Info contains versioning information. how we'll want to distribute that information.",
"type": "object",
"required": [
"major",
"minor",
"gitVersion",
"gitCommit",
"gitTreeState",
"buildDate",
"goVersion",
"compiler",
"platform"
],
"properties": {
"buildDate": {
"type": "string",
"default": ""
},
"compiler": {
"type": "string",
"default": ""
},
"gitCommit": {
"type": "string",
"default": ""
},
"gitTreeState": {
"type": "string",
"default": ""
},
"gitVersion": {
"type": "string",
"default": ""
},
"goVersion": {
"type": "string",
"default": ""
},
"major": {
"type": "string",
"default": ""
},
"minor": {
"type": "string",
"default": ""
},
"platform": {
"type": "string",
"default": ""
}
}
}
},
"parameters": {
Expand Down
Loading

0 comments on commit 0d7d2f9

Please sign in to comment.