Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 16:54:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

add args: startup_timeout for kubernetes plugin (#7068)

Browse Source 
Signed-off-by: mangoyhuang <mangoyhuang@tencent.com>
Co-authored-by: mangoyhuang <mangoyhuang@tencent.com>
This commit is contained in:
Dave Brown
2025-06-12 02:22:07 +08:00
committed by GitHub
parent cbb318f4d0
commit ab74d3acf2
4 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
plugin/kubernetes/setup_test.go
View File

@@ -4,6 +4,7 @@ import (
"slices"
"strings"
"testing"
"time"
"github.com/coredns/caddy"
"github.com/coredns/coredns/plugin/pkg/fall"
@@ -11,6 +12,8 @@ import (
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
)
var defaultStartupTimeout = time.Second * 5
func TestKubernetesParse(t *testing.T) {
tests := []struct {
input string // Corefile data as string
@@ -22,6 +25,7 @@ func TestKubernetesParse(t *testing.T) {
expectedNamespaceLabelSelector string // expected namespace label selector value
expectedPodMode string
expectedFallthrough fall.F
expectedStartupTimeout time.Duration
}{
// positive
{
@@ -34,6 +38,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local test.local`,
@@ -45,6 +50,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -57,6 +63,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -70,6 +77,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -83,6 +91,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -96,6 +105,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -109,6 +119,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -122,6 +133,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -135,6 +147,7 @@ func TestKubernetesParse(t *testing.T) {
"istio-injection=enabled",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -149,6 +162,7 @@ func TestKubernetesParse(t *testing.T) {
"istio-injection=enabled",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local test.local {
@@ -165,6 +179,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Root,
defaultStartupTimeout,
},
// negative
{
@@ -179,6 +194,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -192,6 +208,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -205,6 +222,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -218,6 +236,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
// pods disabled
{
@@ -232,6 +251,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
// pods insecure
{
@@ -246,6 +266,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeInsecure,
fall.Zero,
defaultStartupTimeout,
},
// pods verified
{
@@ -260,6 +281,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeVerified,
fall.Zero,
defaultStartupTimeout,
},
// pods invalid
{
@@ -274,6 +296,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeVerified,
fall.Zero,
defaultStartupTimeout,
},
// fallthrough with zones
{
@@ -288,6 +311,7 @@ func TestKubernetesParse(t *testing.T) {
"",
podModeDisabled,
fall.F{Zones: []string{"ip6.arpa.", "inaddr.arpa.", "foo.com."}},
defaultStartupTimeout,
},
// More than one Kubernetes not allowed
{
@@ -301,6 +325,7 @@ kubernetes cluster.local`,
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -314,6 +339,7 @@ kubernetes cluster.local`,
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -327,6 +353,7 @@ kubernetes cluster.local`,
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -340,6 +367,7 @@ kubernetes cluster.local`,
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
@@ -353,6 +381,22 @@ kubernetes cluster.local`,
"",
podModeDisabled,
fall.Zero,
defaultStartupTimeout,
},
{
`kubernetes coredns.local {
kubeconfig file context
startup_timeout 1s
}`,
false,
"",
1,
0,
"",
"",
podModeDisabled,
fall.Zero,
time.Second * 1,
},
}
@@ -414,6 +458,11 @@ kubernetes cluster.local`,
if !k8sController.Fall.Equal(test.expectedFallthrough) {
t.Errorf("Test %d: Expected kubernetes controller to be initialized with fallthrough '%v'. Instead found fallthrough '%v' for input '%s'", i, test.expectedFallthrough, k8sController.Fall, test.input)
}
// startupTimeout
if k8sController.startupTimeout.String() != test.expectedStartupTimeout.String() {
t.Errorf("Test %d: Expected kubernetes controller to be initialized with startupTimeout '%v'. Instead found startupTimeout '%v' for input '%s'", i, test.expectedStartupTimeout, k8sController.startupTimeout, test.input)
}
}
}