Skip to content

K
k3s
Unverified Commit 2d2fa023 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #57638 from mtaufen/kc-e2e-node-file

Automatic merge from submit-queue. 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>. e2e node framework can generate a base kubelet config file Fixes #57980 This allows the e2e node test framework to generate a Kubelet config file containing the defaults it would typically pass to a test via flags, rather than passing these defaults as flags. ```release-note NONE ```
parents 291b56d0 90814b3a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 9 deletions
test/e2e_node/jenkins/jenkins-ci-ubuntu.properties
View file @ 2d2fa023
...@@ -6,7 +6,8 @@ GCE_ZONE=us-central1-f ...@@ -6,7 +6,8 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ubuntu-node GCE_PROJECT=k8s-jkns-ubuntu-node
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' TEST_ARGS='--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS=''
TIMEOUT=1h TIMEOUT=1h
# Use the system spec defined in test/e2e_node/system/specs/gke.yaml. # Use the system spec defined in test/e2e_node/system/specs/gke.yaml.
SYSTEM_SPEC_NAME=gke SYSTEM_SPEC_NAME=gke
test/e2e_node/jenkins/jenkins-ci.properties
View file @ 2d2fa023
...@@ -4,5 +4,6 @@ GCE_ZONE=us-central1-f ...@@ -4,5 +4,6 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' TEST_ARGS='--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS=''
TIMEOUT=1h TIMEOUT=1h
test/e2e_node/jenkins/jenkins-flaky.properties
View file @ 2d2fa023
...@@ -4,8 +4,8 @@ GCE_ZONE=us-central1-f ...@@ -4,8 +4,8 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--focus="\[Flaky\]"' GINKGO_FLAGS='--focus="\[Flaky\]"'
TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true,PodPriority=true' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true,PodPriority=true,KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' KUBELET_ARGS=''
PARALLELISM=1 PARALLELISM=1
TIMEOUT=3h TIMEOUT=3h
test/e2e_node/jenkins/jenkins-pull.properties
View file @ 2d2fa023
...@@ -4,5 +4,6 @@ GCE_ZONE=us-central1-f ...@@ -4,5 +4,6 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-pr-node-e2e GCE_PROJECT=k8s-jkns-pr-node-e2e
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2' GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' TEST_ARGS='--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS=''
test/e2e_node/jenkins/jenkins-serial-ubuntu.properties
View file @ 2d2fa023
...@@ -6,8 +6,8 @@ GCE_ZONE=us-central1-f ...@@ -6,8 +6,8 @@ GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ubuntu-node-serial GCE_PROJECT=k8s-jkns-ubuntu-node-serial
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"' GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' KUBELET_ARGS=''
PARALLELISM=1 PARALLELISM=1
TIMEOUT=3h TIMEOUT=3h
# Use the system spec defined at test/e2e_node/system/specs/gke.yaml. # Use the system spec defined at test/e2e_node/system/specs/gke.yaml.
......
test/e2e_node/jenkins/jenkins-serial.properties
View file @ 2d2fa023
...@@ -4,7 +4,7 @@ GCE_ZONE=us-west1-b ...@@ -4,7 +4,7 @@ GCE_ZONE=us-west1-b
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true CLEANUP=true
GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"' GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' KUBELET_ARGS=''
PARALLELISM=1 PARALLELISM=1
TIMEOUT=3h TIMEOUT=3h
test/e2e_node/services/BUILD
View file @ 2d2fa023
...@@ -22,9 +22,13 @@ go_library( ...@@ -22,9 +22,13 @@ go_library(
deps = [ deps = [
"//cmd/kube-apiserver/app:go_default_library", "//cmd/kube-apiserver/app:go_default_library",
"//cmd/kube-apiserver/app/options:go_default_library", "//cmd/kube-apiserver/app/options:go_default_library",
"//cmd/kubelet/app/options:go_default_library",
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/controller/namespace:go_default_library", "//pkg/controller/namespace:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library",
"//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e_node/builder:go_default_library", "//test/e2e_node/builder:go_default_library",
"//vendor/github.com/coreos/etcd/etcdserver:go_default_library", "//vendor/github.com/coreos/etcd/etcdserver:go_default_library",
...@@ -33,8 +37,12 @@ go_library( ...@@ -33,8 +37,12 @@ go_library(
"//vendor/github.com/coreos/etcd/pkg/types:go_default_library", "//vendor/github.com/coreos/etcd/pkg/types:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/kardianos/osext:go_default_library", "//vendor/github.com/kardianos/osext:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
"//vendor/k8s.io/client-go/dynamic:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library",
"//vendor/k8s.io/client-go/informers:go_default_library", "//vendor/k8s.io/client-go/informers:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment