Skip to content

Commit

Permalink
Merge pull request #4884 from RainbowMango/pr_bump_k8s_1294
Browse files Browse the repository at this point in the history 
Bump Kubernetes dependencies to v1.29.4
  • Loading branch information
@karmada-bot
karmada-bot authored May 6, 2024
2 parents c7c8f49 + 64f2cc6 commit ae0d3fa
Show file tree
Hide file tree
Showing 1,214 changed files with 77,060 additions and 31,417 deletions.
246 changes: 116 additions & 130 deletions api/openapi-spec/swagger.json
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion artifacts/deploy/karmada-aggregated-apiserver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ spec:
- --tls-cert-file=/etc/karmada/pki/karmada.crt
- --tls-private-key-file=/etc/karmada/pki/karmada.key
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
- --tls-min-version=VersionTLS13
Expand Down
1 change: 0 additions & 1 deletion artifacts/deploy/karmada-search.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ spec:
- --tls-cert-file=/etc/karmada/pki/karmada.crt
- --tls-private-key-file=/etc/karmada/pki/karmada.key
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
- --tls-min-version=VersionTLS13
Expand Down
43 changes: 15 additions & 28 deletions charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,34 +394,6 @@ spec:
status field of the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
properties:
claims:
description: |-
Claims lists the names of resources, defined in spec.resourceClaims,
that are used by this container.
This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate.
This field is immutable. It can only be set for containers.
items:
description: ResourceClaim references
one entry in PodSpec.ResourceClaims.
properties:
name:
description: |-
Name must match the name of one entry in pod.spec.resourceClaims of
the Pod where this field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -498,6 +470,21 @@ spec:
storageClassName is the name of the StorageClass required by the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
type: string
volumeAttributesClassName:
description: |-
volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
If specified, the CSI driver will create or update the volume with the attributes defined
in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
will be set by the persistentvolume controller if it exists.
If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
exists.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass
(Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.
type: string
volumeMode:
description: |-
volumeMode defines what type of volume is required by the claim.
Expand Down
9 changes: 9 additions & 0 deletions charts/karmada/_crds/bases/networking/networking.karmada.io_multiclusterservices.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,15 @@ spec:
IP is set for load-balancer ingress points that are IP based
(typically GCE or OpenStack load-balancers)
type: string
ipMode:
description: |-
IPMode specifies how the load-balancer IP behaves, and may only be specified when the ip field is specified.
Setting this to "VIP" indicates that traffic is delivered to the node with
the destination set to the load-balancer's IP and port.
Setting this to "Proxy" indicates that traffic is delivered to the node or pod with
the destination set to the node's IP and node port or the pod's IP and port.
Service implementations may use this information to adjust traffic routing.
type: string
ports:
description: |-
Ports is a list of records of service ports
Expand Down
1 change: 0 additions & 1 deletion charts/karmada/templates/karmada-aggregated-apiserver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ spec:
- --tls-cert-file=/etc/kubernetes/pki/karmada.crt
- --tls-private-key-file=/etc/kubernetes/pki/karmada.key
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
- --tls-min-version=VersionTLS13
Expand Down
1 change: 0 additions & 1 deletion charts/karmada/templates/karmada-search.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ spec:
- --tls-cert-file=/etc/kubernetes/pki/karmada.crt
- --tls-private-key-file=/etc/kubernetes/pki/karmada.key
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
- --tls-min-version=VersionTLS13
Expand Down
3 changes: 0 additions & 3 deletions cmd/aggregated-apiserver/app/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/endpoints/openapi"
apirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/features"
genericapiserver "k8s.io/apiserver/pkg/server"
genericfilters "k8s.io/apiserver/pkg/server/filters"
genericoptions "k8s.io/apiserver/pkg/server/options"
Expand Down Expand Up @@ -129,8 +128,6 @@ func (o *Options) Config() (*aggregatedapiserver.Config, error) {
return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
}

o.RecommendedOptions.Etcd.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)

o.RecommendedOptions.ExtraAdmissionInitializers = func(c *genericapiserver.RecommendedConfig) ([]admission.PluginInitializer, error) {
client, err := clientset.NewForConfig(c.LoopbackClientConfig)
if err != nil {
Expand Down
2 changes: 0 additions & 2 deletions cmd/karmada-search/app/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/features"
genericoptions "k8s.io/apiserver/pkg/server/options"
utilfeature "k8s.io/apiserver/pkg/util/feature"

Expand Down Expand Up @@ -55,7 +54,6 @@ func NewOptions() *Options {
}
o.RecommendedOptions.Etcd.StorageConfig.EncodeVersioner = runtime.NewMultiGroupVersioner(searchv1alpha1.SchemeGroupVersion,
schema.GroupKind{Group: searchv1alpha1.GroupName})
o.RecommendedOptions.Etcd.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)
return o
}

Expand Down
7 changes: 7 additions & 0 deletions cmd/metrics-adapter/app/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ func (o *Options) Config() (*metricsadapter.MetricsServer, error) {
metricsAdapter.OpenAPIConfig.Info.Title = "karmada-metrics-adapter"
metricsAdapter.OpenAPIConfig.Info.Version = "1.0.0"

// Explicitly specify the remote kubeconfig file here to solve the issue that metrics adapter requires to build
// informer against karmada-apiserver started from [email protected].
// See https://github.com/karmada-io/karmada/pull/4884#issuecomment-2095109485 for more details.
//
// For karmada-metrics-adapter, the kubeconfig file of karmada-apiserver is "remote", not the in-cluster one.
metricsAdapter.RemoteKubeConfigFile = o.KubeConfig

server, err := metricsAdapter.Server()
if err != nil {
klog.Errorf("Unable to construct metrics adapter: %v", err)
Expand Down
Loading

0 comments on commit ae0d3fa

Please sign in to comment.