Skip to content

Commit

Permalink
Merge pull request #3080 from RainbowMango/pr_update_k8s
Browse files Browse the repository at this point in the history 
Update Kubenetes dependencies to v1.26.1
  • Loading branch information
@karmada-bot
karmada-bot authored Feb 1, 2023
2 parents fed2f26 + a1e8f16 commit 43c1a8c
Show file tree
Hide file tree
Showing 1,971 changed files with 198,438 additions and 54,709 deletions.
180 changes: 113 additions & 67 deletions api/openapi-spec/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16773,43 +16773,6 @@
}
}
},
"io.k8s.api.core.v1.LoadBalancerIngress": {
"description": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.",
"type": "object",
"properties": {
"hostname": {
"description": "Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)",
"type": "string"
},
"ip": {
"description": "IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)",
"type": "string"
},
"ports": {
"description": "Ports is a list of records of service ports If used, every port defined in the service should have an entry in it",
"type": "array",
"items": {
"default": {},
"$ref": "#/definitions/io.k8s.api.core.v1.PortStatus"
},
"x-kubernetes-list-type": "atomic"
}
}
},
"io.k8s.api.core.v1.LoadBalancerStatus": {
"description": "LoadBalancerStatus represents the status of a load-balancer.",
"type": "object",
"properties": {
"ingress": {
"description": "Ingress is a list containing ingress points for the load-balancer. Traffic intended for the service should be sent to these ingress points.",
"type": "array",
"items": {
"default": {},
"$ref": "#/definitions/io.k8s.api.core.v1.LoadBalancerIngress"
}
}
}
},
"io.k8s.api.core.v1.NodeSelector": {
"description": "A node selector represents the union of the results of one or more label queries over a set of nodes; that is, it represents the OR of the selectors represented by the node selector terms.",
"type": "object",
Expand Down Expand Up @@ -16887,35 +16850,6 @@
},
"x-kubernetes-map-type": "atomic"
},
"io.k8s.api.core.v1.PortStatus": {
"type": "object",
"required": [
"port",
"protocol"
],
"properties": {
"error": {
"description": "Error is to record the problem with the service port The format of the error shall comply with the following rules: - built-in error values shall be specified in this file and those shall use\n CamelCase names\n- cloud provider specific error values must have names that comply with the\n format foo.example.com/CamelCase.",
"type": "string"
},
"port": {
"description": "Port is the port number of the service port of which status is recorded here",
"type": "integer",
"format": "int32",
"default": 0
},
"protocol": {
"description": "Protocol is the protocol of the service port of which status is recorded here The supported values are: \"TCP\", \"UDP\", \"SCTP\"\n\nPossible enum values:\n - `\"SCTP\"` is the SCTP protocol.\n - `\"TCP\"` is the TCP protocol.\n - `\"UDP\"` is the UDP protocol.",
"type": "string",
"default": "",
"enum": [
"SCTP",
"TCP",
"UDP"
]
}
}
},
"io.k8s.api.core.v1.Taint": {
"description": "The node this Taint is attached to has the \"effect\" on any pod that does not tolerate the Taint.",
"type": "object",
Expand Down Expand Up @@ -17065,6 +16999,73 @@
}
}
},
"io.k8s.api.networking.v1.IngressLoadBalancerIngress": {
"description": "IngressLoadBalancerIngress represents the status of a load-balancer ingress point.",
"type": "object",
"properties": {
"hostname": {
"description": "Hostname is set for load-balancer ingress points that are DNS based.",
"type": "string"
},
"ip": {
"description": "IP is set for load-balancer ingress points that are IP based.",
"type": "string"
},
"ports": {
"description": "Ports provides information about the ports exposed by this LoadBalancer.",
"type": "array",
"items": {
"default": {},
"$ref": "#/definitions/io.k8s.api.networking.v1.IngressPortStatus"
},
"x-kubernetes-list-type": "atomic"
}
}
},
"io.k8s.api.networking.v1.IngressLoadBalancerStatus": {
"description": "IngressLoadBalancerStatus represents the status of a load-balancer.",
"type": "object",
"properties": {
"ingress": {
"description": "Ingress is a list containing ingress points for the load-balancer.",
"type": "array",
"items": {
"default": {},
"$ref": "#/definitions/io.k8s.api.networking.v1.IngressLoadBalancerIngress"
}
}
}
},
"io.k8s.api.networking.v1.IngressPortStatus": {
"description": "IngressPortStatus represents the error condition of a service port",
"type": "object",
"required": [
"port",
"protocol"
],
"properties": {
"error": {
"description": "Error is to record the problem with the service port The format of the error shall comply with the following rules: - built-in error values shall be specified in this file and those shall use\n CamelCase names\n- cloud provider specific error values must have names that comply with the\n format foo.example.com/CamelCase.",
"type": "string"
},
"port": {
"description": "Port is the port number of the ingress port.",
"type": "integer",
"format": "int32",
"default": 0
},
"protocol": {
"description": "Protocol is the protocol of the ingress port. The supported values are: \"TCP\", \"UDP\", \"SCTP\"\n\nPossible enum values:\n - `\"SCTP\"` is the SCTP protocol.\n - `\"TCP\"` is the TCP protocol.\n - `\"UDP\"` is the UDP protocol.",
"type": "string",
"default": "",
"enum": [
"SCTP",
"TCP",
"UDP"
]
}
}
},
"io.k8s.api.networking.v1.IngressRule": {
"description": "IngressRule represents the rules mapping the paths under a specified host to the related backend services. Incoming requests are first evaluated for a host match, then routed to the backend associated with the matching IngressRuleValue.",
"type": "object",
Expand Down Expand Up @@ -17136,7 +17137,7 @@
"loadBalancer": {
"description": "LoadBalancer contains the current status of the load-balancer.",
"default": {},
"$ref": "#/definitions/io.k8s.api.core.v1.LoadBalancerStatus"
"$ref": "#/definitions/io.k8s.api.networking.v1.IngressLoadBalancerStatus"
}
}
},
Expand Down Expand Up @@ -17463,6 +17464,11 @@
"kind": "DeleteOptions",
"version": "v1"
},
{
"group": "admissionregistration.k8s.io",
"kind": "DeleteOptions",
"version": "v1alpha1"
},
{
"group": "admissionregistration.k8s.io",
"kind": "DeleteOptions",
Expand All @@ -17488,6 +17494,11 @@
"kind": "DeleteOptions",
"version": "v1"
},
{
"group": "authentication.k8s.io",
"kind": "DeleteOptions",
"version": "v1alpha1"
},
{
"group": "authentication.k8s.io",
"kind": "DeleteOptions",
Expand Down Expand Up @@ -17613,6 +17624,11 @@
"kind": "DeleteOptions",
"version": "v1beta2"
},
{
"group": "flowcontrol.apiserver.k8s.io",
"kind": "DeleteOptions",
"version": "v1beta3"
},
{
"group": "internal.apiserver.k8s.io",
"kind": "DeleteOptions",
Expand Down Expand Up @@ -17688,6 +17704,11 @@
"kind": "DeleteOptions",
"version": "v1beta1"
},
{
"group": "resource.k8s.io",
"kind": "DeleteOptions",
"version": "v1alpha1"
},
{
"group": "scheduling.k8s.io",
"kind": "DeleteOptions",
Expand Down Expand Up @@ -18084,6 +18105,11 @@
"group": "",
"kind": "Status",
"version": "v1"
},
{
"group": "resource.k8s.io",
"kind": "Status",
"version": "v1alpha1"
}
]
},
Expand Down Expand Up @@ -18174,6 +18200,11 @@
"kind": "WatchEvent",
"version": "v1"
},
{
"group": "admissionregistration.k8s.io",
"kind": "WatchEvent",
"version": "v1alpha1"
},
{
"group": "admissionregistration.k8s.io",
"kind": "WatchEvent",
Expand All @@ -18199,6 +18230,11 @@
"kind": "WatchEvent",
"version": "v1"
},
{
"group": "authentication.k8s.io",
"kind": "WatchEvent",
"version": "v1alpha1"
},
{
"group": "authentication.k8s.io",
"kind": "WatchEvent",
Expand Down Expand Up @@ -18324,6 +18360,11 @@
"kind": "WatchEvent",
"version": "v1beta2"
},
{
"group": "flowcontrol.apiserver.k8s.io",
"kind": "WatchEvent",
"version": "v1beta3"
},
{
"group": "internal.apiserver.k8s.io",
"kind": "WatchEvent",
Expand Down Expand Up @@ -18399,6 +18440,11 @@
"kind": "WatchEvent",
"version": "v1beta1"
},
{
"group": "resource.k8s.io",
"kind": "WatchEvent",
"version": "v1alpha1"
},
{
"group": "scheduling.k8s.io",
"kind": "WatchEvent",
Expand Down
28 changes: 13 additions & 15 deletions charts/karmada/_crds/bases/networking.karmada.io_multiclusteringresses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,25 @@ spec:
properties:
ingress:
description: Ingress is a list containing ingress points for the
load-balancer. Traffic intended for the service should be sent
to these ingress points.
load-balancer.
items:
description: 'LoadBalancerIngress represents the status of a
load-balancer ingress point: traffic intended for the service
should be sent to an ingress point.'
description: IngressLoadBalancerIngress represents the status
of a load-balancer ingress point.
properties:
hostname:
description: Hostname is set for load-balancer ingress points
that are DNS based (typically AWS load-balancers)
that are DNS based.
type: string
ip:
description: IP is set for load-balancer ingress points
that are IP based (typically GCE or OpenStack load-balancers)
that are IP based.
type: string
ports:
description: Ports is a list of records of service ports
If used, every port defined in the service should have
an entry in it
description: Ports provides information about the ports
exposed by this LoadBalancer.
items:
description: IngressPortStatus represents the error condition
of a service port
properties:
error:
description: 'Error is to record the problem with
Expand All @@ -336,15 +335,14 @@ spec:
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
port:
description: Port is the port number of the service
port of which status is recorded here
description: Port is the port number of the ingress
port.
format: int32
type: integer
protocol:
default: TCP
description: 'Protocol is the protocol of the service
port of which status is recorded here The supported
values are: "TCP", "UDP", "SCTP"'
description: 'Protocol is the protocol of the ingress
port. The supported values are: "TCP", "UDP", "SCTP"'
type: string
required:
- port
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ cluster and manifests to the Karmada control plane.`,

var controllers = make(controllerscontext.Initializers)

var controllersDisabledByDefault = sets.NewString(
var controllersDisabledByDefault = sets.New(
"certRotation",
)

Expand Down
3 changes: 3 additions & 0 deletions cmd/aggregated-apiserver/app/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ func (o *Options) Config() (*aggregatedapiserver.Config, error) {
return config, nil
}

// disable `deprecation` check until the underlying genericfilters.BasicLongRunningRequestCheck starts using generic Set.
//
//nolint:staticcheck
func customLongRunningRequestCheck(longRunningVerbs, longRunningSubresources sets.String) apirequest.LongRunningRequestCheck {
return func(r *http.Request, requestInfo *apirequest.RequestInfo) bool {
reqClone := r.Clone(context.Background())
Expand Down
4 changes: 2 additions & 2 deletions cmd/controller-manager/app/controllermanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ to create regular Kubernetes resources.`,
// and update the flag usage.
genericFlagSet.AddGoFlagSet(flag.CommandLine)
genericFlagSet.Lookup("kubeconfig").Usage = "Path to karmada control plane kubeconfig file."
opts.AddFlags(genericFlagSet, controllers.ControllerNames(), controllersDisabledByDefault.List())
opts.AddFlags(genericFlagSet, controllers.ControllerNames(), sets.List(controllersDisabledByDefault))

// Set klog flags
logsFlagSet := fss.FlagSet("logs")
Expand Down Expand Up @@ -175,7 +175,7 @@ func Run(ctx context.Context, opts *options.Options) error {
var controllers = make(controllerscontext.Initializers)

// controllersDisabledByDefault is the set of controllers which is disabled by default
var controllersDisabledByDefault = sets.NewString(
var controllersDisabledByDefault = sets.New(
"hpa",
)

Expand Down
3 changes: 3 additions & 0 deletions cmd/karmada-search/app/karmada-search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ func config(o *options.Options, outOfTreeRegistryOptions ...Option) (*search.Con
return config, nil
}

// disable `deprecation` check until the underlying genericfilters.BasicLongRunningRequestCheck starts using generic Set.
//
//nolint:staticcheck
func customLongRunningRequestCheck(longRunningVerbs, longRunningSubresources sets.String) request.LongRunningRequestCheck {
return func(r *http.Request, requestInfo *request.RequestInfo) bool {
if requestInfo.APIGroup == "search.karmada.io" && requestInfo.Resource == "proxying" {
Expand Down
Loading

0 comments on commit 43c1a8c

Please sign in to comment.