karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt Kubernetes #121390: remove etcd page 

Adopt Kubernetes #118653, introduce VolumeResourceRequirements
Remove APIPriorityAndFairness feature gates from
karmada-aggregated-apiserver.

Signed-off-by: RainbowMango <qdurenhongcai@gmail.com>

Signed-off-by: RainbowMango <qdurenhongcai@gmail.com>
This commit is contained in:
RainbowMango 2024-04-28 20:38:28 +08:00
parent e5d05149ae
commit 8cf31bfc37
14 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artifacts/deploy/karmada-aggregated-apiserver.yaml
View File

@ -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

1
artifacts/deploy/karmada-search.yaml
View File

@ -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

1
charts/karmada/templates/karmada-aggregated-apiserver.yaml
View File

@ -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

1
charts/karmada/templates/karmada-search.yaml
View File

@ -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

3
cmd/aggregated-apiserver/app/options/options.go
View File

@ -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"
@ -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 {

2
cmd/karmada-search/app/options/options.go
View File

@ -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"
@ -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
}

1
operator/pkg/controlplane/apiserver/mainfests.go
View File

@ -187,7 +187,6 @@ spec:
- --tls-private-key-file=/etc/karmada/pki/karmada.key
- --tls-min-version=VersionTLS13
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
volumeMounts:

1
operator/pkg/controlplane/search/mainfests.go
View File

@ -65,7 +65,6 @@ spec:
- --tls-private-key-file=/etc/karmada/pki/karmada.key
- --tls-min-version=VersionTLS13
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0
livenessProbe:

1
pkg/karmadactl/addons/search/manifests.go
View File

@ -63,7 +63,6 @@ spec:
- --tls-private-key-file=/etc/karmada/pki/karmada.key
- --tls-min-version=VersionTLS13
- --audit-log-path=-
- --feature-gates=APIPriorityAndFairness=false
- --audit-log-maxage=0
- --audit-log-maxbackup=0{{- if .KeyPrefix }}
- --etcd-prefix={{ .KeyPrefix }}{{- end }}

1
pkg/karmadactl/cmdinit/kubernetes/deployments.go
View File

@ -820,7 +820,6 @@ func (i *CommandInitOption) makeKarmadaAggregatedAPIServerDeployment() *appsv1.D
fmt.Sprintf("--tls-private-key-file=%s/%s.key", karmadaCertsVolumeMountPath, options.KarmadaCertAndKeyName),
"--tls-min-version=VersionTLS13",
"--audit-log-path=-",
"--feature-gates=APIPriorityAndFairness=false",
"--audit-log-maxage=0",
"--audit-log-maxbackup=0",
}

2
pkg/karmadactl/cmdinit/kubernetes/statefulset.go
View File

@ -93,7 +93,7 @@ func (i *CommandInitOption) etcdVolume() (*[]corev1.Volume, *corev1.PersistentVo
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
StorageClassName: &i.StorageClassesName,
VolumeMode: &mode,
Resources: corev1.ResourceRequirements{
Resources: corev1.VolumeResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse(i.EtcdPersistentVolumeSize),
},

5
pkg/search/proxy/store/resource_cache.go
View File

@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/generic"
genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
"k8s.io/apiserver/pkg/registry/rest"
@ -34,7 +33,6 @@ import (
cacherstorage "k8s.io/apiserver/pkg/storage/cacher"
"k8s.io/apiserver/pkg/storage/storagebackend"
"k8s.io/apiserver/pkg/storage/storagebackend/factory"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
@ -83,8 +81,7 @@ func newResourceCache(clusterName string, gvr schema.GroupVersionResource, gvk s
RESTOptions: &generic.RESTOptions{
StorageConfig: &storagebackend.ConfigForResource{
Config: storagebackend.Config{
Paging: utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking),
Codec: unstructured.UnstructuredJSONScheme,
Codec: unstructured.UnstructuredJSONScheme,
},
GroupResource: gvr.GroupResource(),
},

2
test/e2e/dependenciesdistributor_test.go
View File

@ -225,7 +225,7 @@ var _ = ginkgo.Describe("[DependenciesDistributor] automatically propagate relev
ginkgo.BeforeEach(func() {
pvcName = pvcNamePrefix + rand.String(RandomStrLength)
pvc = testhelper.NewPVC(testNamespace, pvcName, corev1.ResourceRequirements{
pvc = testhelper.NewPVC(testNamespace, pvcName, corev1.VolumeResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("1Gi"),
},

2
test/helper/resource.go
View File

@ -825,7 +825,7 @@ func NewConfigMap(namespace string, name string, data map[string]string) *corev1
}
// NewPVC will build a new PersistentVolumeClaim.
func NewPVC(namespace, name string, resources corev1.ResourceRequirements, accessModes ...corev1.PersistentVolumeAccessMode) *corev1.PersistentVolumeClaim {
func NewPVC(namespace, name string, resources corev1.VolumeResourceRequirements, accessModes ...corev1.PersistentVolumeAccessMode) *corev1.PersistentVolumeClaim {
return &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
Spec: corev1.PersistentVolumeClaimSpec{