mirror of https://github.com/k3s-io/k3s
Merge pull request #50006 from huangjiuyuan/fix-cm-option-test
Automatic merge from submit-queue (batch tested with PRs 50378, 51463, 50006, 51962, 51673). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. adding kube-controller-manager starting option tests **What this PR does / why we need it**: The unit test for kube-controller-manager is missing in `cmd/kube-controller-manager/app/options`. I have added a unit test for checking kube-controller-manager starting options, which is similar to the unit test in `cmd/kube-apiserver/app/options/options_test.go`. This PR https://github.com/kubernetes/kubernetes/pull/49092 can be seen as a reference. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: `NONE`pull/6/head
Kubernetes Submit Queue
GitHub
commit
12a74f5c7f
|
|
@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
load(
|
load(
|
||||||
"@io_bazel_rules_go//go:def.bzl",
|
"@io_bazel_rules_go//go:def.bzl",
|
||||||
"go_library",
|
"go_library",
|
||||||
|
"go_test",
|
||||||
)
|
)
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
|
|
@ -35,3 +36,16 @@ filegroup(
|
||||||
srcs = [":package-srcs"],
|
srcs = [":package-srcs"],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
go_test(
|
||||||
|
name = "go_default_test",
|
||||||
|
srcs = ["options_test.go"],
|
||||||
|
library = ":go_default_library",
|
||||||
|
tags = ["automanaged"],
|
||||||
|
deps = [
|
||||||
|
"//pkg/apis/componentconfig:go_default_library",
|
||||||
|
"//vendor/github.com/spf13/pflag:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,235 @@
|
||||||
|
/*
|
||||||
|
Copyright 2017 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package options
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"sort"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/spf13/pflag"
|
||||||
|
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/util/diff"
|
||||||
|
"k8s.io/kubernetes/pkg/apis/componentconfig"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestAddFlags(t *testing.T) {
|
||||||
|
f := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError)
|
||||||
|
s := NewCMServer()
|
||||||
|
s.AddFlags(f, []string{""}, []string{""})
|
||||||
|
|
||||||
|
args := []string{
|
||||||
|
"--address=192.168.4.10",
|
||||||
|
"--allocate-node-cidrs=true",
|
||||||
|
"--attach-detach-reconcile-sync-period=30s",
|
||||||
|
"--cidr-allocator-type=CloudAllocator",
|
||||||
|
"--cloud-config=/cloud-config",
|
||||||
|
"--cloud-provider=gce",
|
||||||
|
"--cluster-cidr=1.2.3.4/24",
|
||||||
|
"--cluster-name=k8s",
|
||||||
|
"--cluster-signing-cert-file=/cluster-signing-cert",
|
||||||
|
"--cluster-signing-key-file=/cluster-signing-key",
|
||||||
|
"--concurrent-deployment-syncs=10",
|
||||||
|
"--concurrent-endpoint-syncs=10",
|
||||||
|
"--concurrent-gc-syncs=30",
|
||||||
|
"--concurrent-namespace-syncs=20",
|
||||||
|
"--concurrent-replicaset-syncs=10",
|
||||||
|
"--concurrent-resource-quota-syncs=10",
|
||||||
|
"--concurrent-service-syncs=2",
|
||||||
|
"--concurrent-serviceaccount-token-syncs=10",
|
||||||
|
"--concurrent_rc_syncs=10",
|
||||||
|
"--configure-cloud-routes=false",
|
||||||
|
"--contention-profiling=true",
|
||||||
|
"--controller-start-interval=2m",
|
||||||
|
"--controllers=foo,bar",
|
||||||
|
"--deployment-controller-sync-period=45s",
|
||||||
|
"--disable-attach-detach-reconcile-sync=true",
|
||||||
|
"--enable-dynamic-provisioning=false",
|
||||||
|
"--enable-garbage-collector=false",
|
||||||
|
"--enable-hostpath-provisioner=true",
|
||||||
|
"--enable-taint-manager=false",
|
||||||
|
"--experimental-cluster-signing-duration=10h",
|
||||||
|
"--flex-volume-plugin-dir=/flex-volume-plugin",
|
||||||
|
"--horizontal-pod-autoscaler-downscale-delay=2m",
|
||||||
|
"--horizontal-pod-autoscaler-sync-period=45s",
|
||||||
|
"--horizontal-pod-autoscaler-upscale-delay=1m",
|
||||||
|
"--kube-api-burst=100",
|
||||||
|
"--kube-api-content-type=application/json",
|
||||||
|
"--kube-api-qps=50.0",
|
||||||
|
"--kubeconfig=/kubeconfig",
|
||||||
|
"--large-cluster-size-threshold=100",
|
||||||
|
"--leader-elect=false",
|
||||||
|
"--leader-elect-lease-duration=30s",
|
||||||
|
"--leader-elect-renew-deadline=15s",
|
||||||
|
"--leader-elect-resource-lock=configmap",
|
||||||
|
"--leader-elect-retry-period=5s",
|
||||||
|
"--master=192.168.4.20",
|
||||||
|
"--min-resync-period=8h",
|
||||||
|
"--namespace-sync-period=10m",
|
||||||
|
"--node-cidr-mask-size=48",
|
||||||
|
"--node-eviction-rate=0.2",
|
||||||
|
"--node-monitor-grace-period=30s",
|
||||||
|
"--node-monitor-period=10s",
|
||||||
|
"--node-startup-grace-period=30s",
|
||||||
|
"--pod-eviction-timeout=2m",
|
||||||
|
"--port=10000",
|
||||||
|
"--profiling=false",
|
||||||
|
"--pv-recycler-increment-timeout-nfs=45",
|
||||||
|
"--pv-recycler-minimum-timeout-hostpath=45",
|
||||||
|
"--pv-recycler-minimum-timeout-nfs=200",
|
||||||
|
"--pv-recycler-timeout-increment-hostpath=45",
|
||||||
|
"--pvclaimbinder-sync-period=30s",
|
||||||
|
"--resource-quota-sync-period=10m",
|
||||||
|
"--route-reconciliation-period=30s",
|
||||||
|
"--secondary-node-eviction-rate=0.05",
|
||||||
|
"--service-account-private-key-file=/service-account-private-key",
|
||||||
|
"--service-sync-period=2m",
|
||||||
|
"--terminated-pod-gc-threshold=12000",
|
||||||
|
"--unhealthy-zone-threshold=0.6",
|
||||||
|
"--use-service-account-credentials=true",
|
||||||
|
}
|
||||||
|
f.Parse(args)
|
||||||
|
// Sort GCIgnoredResources because it's built from a map, which means the
|
||||||
|
// insertion order is random.
|
||||||
|
sort.Sort(sortedGCIgnoredResources(s.GCIgnoredResources))
|
||||||
|
|
||||||
|
expected := &CMServer{
|
||||||
|
KubeControllerManagerConfiguration: componentconfig.KubeControllerManagerConfiguration{
|
||||||
|
Port: 10000,
|
||||||
|
Address: "192.168.4.10",
|
||||||
|
AllocateNodeCIDRs: true,
|
||||||
|
CloudConfigFile: "/cloud-config",
|
||||||
|
CloudProvider: "gce",
|
||||||
|
ClusterCIDR: "1.2.3.4/24",
|
||||||
|
ClusterName: "k8s",
|
||||||
|
ConcurrentDeploymentSyncs: 10,
|
||||||
|
ConcurrentEndpointSyncs: 10,
|
||||||
|
ConcurrentGCSyncs: 30,
|
||||||
|
ConcurrentNamespaceSyncs: 20,
|
||||||
|
ConcurrentRSSyncs: 10,
|
||||||
|
ConcurrentResourceQuotaSyncs: 10,
|
||||||
|
ConcurrentServiceSyncs: 2,
|
||||||
|
ConcurrentSATokenSyncs: 10,
|
||||||
|
ConcurrentRCSyncs: 10,
|
||||||
|
ConfigureCloudRoutes: false,
|
||||||
|
EnableContentionProfiling: true,
|
||||||
|
ControllerStartInterval: metav1.Duration{Duration: 2 * time.Minute},
|
||||||
|
ConcurrentDaemonSetSyncs: 2,
|
||||||
|
ConcurrentJobSyncs: 5,
|
||||||
|
DeletingPodsQps: 0.1,
|
||||||
|
EnableProfiling: false,
|
||||||
|
CIDRAllocatorType: "CloudAllocator",
|
||||||
|
NodeCIDRMaskSize: 48,
|
||||||
|
ServiceSyncPeriod: metav1.Duration{Duration: 2 * time.Minute},
|
||||||
|
ResourceQuotaSyncPeriod: metav1.Duration{Duration: 10 * time.Minute},
|
||||||
|
NamespaceSyncPeriod: metav1.Duration{Duration: 10 * time.Minute},
|
||||||
|
PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
HorizontalPodAutoscalerSyncPeriod: metav1.Duration{Duration: 45 * time.Second},
|
||||||
|
DeploymentControllerSyncPeriod: metav1.Duration{Duration: 45 * time.Second},
|
||||||
|
MinResyncPeriod: metav1.Duration{Duration: 8 * time.Hour},
|
||||||
|
RegisterRetryCount: 10,
|
||||||
|
RouteReconciliationPeriod: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
PodEvictionTimeout: metav1.Duration{Duration: 2 * time.Minute},
|
||||||
|
NodeMonitorGracePeriod: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
NodeStartupGracePeriod: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
NodeMonitorPeriod: metav1.Duration{Duration: 10 * time.Second},
|
||||||
|
HorizontalPodAutoscalerUpscaleForbiddenWindow: metav1.Duration{Duration: 1 * time.Minute},
|
||||||
|
HorizontalPodAutoscalerDownscaleForbiddenWindow: metav1.Duration{Duration: 2 * time.Minute},
|
||||||
|
TerminatedPodGCThreshold: 12000,
|
||||||
|
VolumeConfiguration: componentconfig.VolumeConfiguration{
|
||||||
|
EnableDynamicProvisioning: false,
|
||||||
|
EnableHostPathProvisioning: true,
|
||||||
|
FlexVolumePluginDir: "/flex-volume-plugin",
|
||||||
|
PersistentVolumeRecyclerConfiguration: componentconfig.PersistentVolumeRecyclerConfiguration{
|
||||||
|
MaximumRetry: 3,
|
||||||
|
MinimumTimeoutNFS: 200,
|
||||||
|
IncrementTimeoutNFS: 45,
|
||||||
|
MinimumTimeoutHostPath: 45,
|
||||||
|
IncrementTimeoutHostPath: 45,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ContentType: "application/json",
|
||||||
|
KubeAPIQPS: 50.0,
|
||||||
|
KubeAPIBurst: 100,
|
||||||
|
LeaderElection: componentconfig.LeaderElectionConfiguration{
|
||||||
|
ResourceLock: "configmap",
|
||||||
|
LeaderElect: false,
|
||||||
|
LeaseDuration: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
RenewDeadline: metav1.Duration{Duration: 15 * time.Second},
|
||||||
|
RetryPeriod: metav1.Duration{Duration: 5 * time.Second},
|
||||||
|
},
|
||||||
|
ClusterSigningCertFile: "/cluster-signing-cert",
|
||||||
|
ClusterSigningKeyFile: "/cluster-signing-key",
|
||||||
|
ServiceAccountKeyFile: "/service-account-private-key",
|
||||||
|
ClusterSigningDuration: metav1.Duration{Duration: 10 * time.Hour},
|
||||||
|
EnableGarbageCollector: false,
|
||||||
|
GCIgnoredResources: []componentconfig.GroupResource{
|
||||||
|
{Group: "extensions", Resource: "replicationcontrollers"},
|
||||||
|
{Group: "", Resource: "bindings"},
|
||||||
|
{Group: "", Resource: "componentstatuses"},
|
||||||
|
{Group: "", Resource: "events"},
|
||||||
|
{Group: "authentication.k8s.io", Resource: "tokenreviews"},
|
||||||
|
{Group: "authorization.k8s.io", Resource: "subjectaccessreviews"},
|
||||||
|
{Group: "authorization.k8s.io", Resource: "selfsubjectaccessreviews"},
|
||||||
|
{Group: "authorization.k8s.io", Resource: "localsubjectaccessreviews"},
|
||||||
|
{Group: "authorization.k8s.io", Resource: "selfsubjectrulesreviews"},
|
||||||
|
{Group: "apiregistration.k8s.io", Resource: "apiservices"},
|
||||||
|
{Group: "apiextensions.k8s.io", Resource: "customresourcedefinitions"},
|
||||||
|
},
|
||||||
|
NodeEvictionRate: 0.2,
|
||||||
|
SecondaryNodeEvictionRate: 0.05,
|
||||||
|
LargeClusterSizeThreshold: 100,
|
||||||
|
UnhealthyZoneThreshold: 0.6,
|
||||||
|
DisableAttachDetachReconcilerSync: true,
|
||||||
|
ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 30 * time.Second},
|
||||||
|
Controllers: []string{"foo", "bar"},
|
||||||
|
EnableTaintManager: false,
|
||||||
|
UseServiceAccountCredentials: true,
|
||||||
|
},
|
||||||
|
Kubeconfig: "/kubeconfig",
|
||||||
|
Master: "192.168.4.20",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort GCIgnoredResources because it's built from a map, which means the
|
||||||
|
// insertion order is random.
|
||||||
|
sort.Sort(sortedGCIgnoredResources(expected.GCIgnoredResources))
|
||||||
|
|
||||||
|
if !reflect.DeepEqual(expected, s) {
|
||||||
|
t.Errorf("Got different run options than expected.\nDifference detected on:\n%s", diff.ObjectReflectDiff(expected, s))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type sortedGCIgnoredResources []componentconfig.GroupResource
|
||||||
|
|
||||||
|
func (r sortedGCIgnoredResources) Len() int {
|
||||||
|
return len(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r sortedGCIgnoredResources) Less(i, j int) bool {
|
||||||
|
if r[i].Group < r[j].Group {
|
||||||
|
return true
|
||||||
|
} else if r[i].Group > r[j].Group {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return r[i].Resource < r[j].Resource
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r sortedGCIgnoredResources) Swap(i, j int) {
|
||||||
|
r[i], r[j] = r[j], r[i]
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue