kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116656 from HirazawaUi/fik-fd-leaks 

Cleanup fd leaks and file removal cleanup

Kubernetes-commit: 03ebd4b7ef3fc5d2ec5b407b36488c6324a058b6
This commit is contained in:
Kubernetes Publisher 2023-05-24 22:50:50 -07:00
parent 81568ad465 08300912da
commit 4aaf14bd75
17 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -33,7 +33,7 @@ require (
k8s.io/api v0.0.0-20230515170019-2f9553831ec2
k8s.io/apimachinery v0.0.0-20230524221503-b43878988803
k8s.io/cli-runtime v0.0.0-20230524224338-d4575fc3d036
k8s.io/client-go v0.0.0-20230524222011-328d0fb9eea4
k8s.io/client-go v0.0.0-20230525061952-6fbb0bd42d86
k8s.io/component-base v0.0.0-20230524222639-c480b94a7172
k8s.io/component-helpers v0.0.0-20230524222740-aefc24b94ab4
k8s.io/klog/v2 v2.100.1
@ -97,7 +97,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20230515170019-2f9553831ec2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230524221503-b43878988803
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230524224338-d4575fc3d036
k8s.io/client-go => k8s.io/client-go v0.0.0-20230524222011-328d0fb9eea4
k8s.io/client-go => k8s.io/client-go v0.0.0-20230525061952-6fbb0bd42d86
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230524221308-db4dff4b8168
k8s.io/component-base => k8s.io/component-base v0.0.0-20230524222639-c480b94a7172
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230524222740-aefc24b94ab4

4
go.sum
View File

@ -547,8 +547,8 @@ k8s.io/apimachinery v0.0.0-20230524221503-b43878988803 h1:wAlIgZMGNISpw9MERCIWcc
k8s.io/apimachinery v0.0.0-20230524221503-b43878988803/go.mod h1:qCTDst7QeP2n3JDxbpuJSTTaAxalvFKMTN0Lga1+0zU=
k8s.io/cli-runtime v0.0.0-20230524224338-d4575fc3d036 h1:FneR7Dz2R9E8VredT10rQz9tdZSVw2lQxUazmniAsfU=
k8s.io/cli-runtime v0.0.0-20230524224338-d4575fc3d036/go.mod h1:kT5UYIq2D170e2KqNCSVZ4Rg/K2nxKIam/tc5P4XuxU=
k8s.io/client-go v0.0.0-20230524222011-328d0fb9eea4 h1:E6qrS+okSmBV222h9aG9p/QPJ8caywGqaqivFryYXPE=
k8s.io/client-go v0.0.0-20230524222011-328d0fb9eea4/go.mod h1:A1VaztWjKkQDXMRJ6kGPJgKODR3tVatUTWwmqeFHQXg=
k8s.io/client-go v0.0.0-20230525061952-6fbb0bd42d86 h1:1kaIrnUWCRqsBvnJVZxYWcuJOgumcg2FVxlPhaUQ5nM=
k8s.io/client-go v0.0.0-20230525061952-6fbb0bd42d86/go.mod h1:A1VaztWjKkQDXMRJ6kGPJgKODR3tVatUTWwmqeFHQXg=
k8s.io/component-base v0.0.0-20230524222639-c480b94a7172 h1:4TqzA9Z6R5W4wTteg6BrSzMdckd+dxk4H1hDFR6eQDg=
k8s.io/component-base v0.0.0-20230524222639-c480b94a7172/go.mod h1:K7oo2r91qQiX6Snt+id3KDJUPzbV6efO61VX4WFZ2x8=
k8s.io/component-helpers v0.0.0-20230524222740-aefc24b94ab4 h1:d8aUs+YHiuyC5Ril15BwgjLwvx4Wm/nj14Jv2jIEgmU=

15
pkg/cmd/config/config_test.go
View File

@ -29,6 +29,7 @@ import (
"k8s.io/cli-runtime/pkg/genericiooptions"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
utiltesting "k8s.io/client-go/util/testing"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
)
@ -52,7 +53,7 @@ func Example_view() {
expectedConfig: expectedConfig,
}
output := test.run(nil)
output := test.run(&testing.T{})
fmt.Printf("%v", output)
// Output:
// apiVersion: v1
@ -261,7 +262,7 @@ func TestAdditionalAuth(t *testing.T) {
func TestEmbedClientCert(t *testing.T) {
fakeCertFile, _ := os.CreateTemp(os.TempDir(), "")
defer os.Remove(fakeCertFile.Name())
defer utiltesting.CloseAndRemove(t, fakeCertFile)
fakeData := []byte("fake-data")
os.WriteFile(fakeCertFile.Name(), fakeData, 0600)
expectedConfig := newRedFederalCowHammerConfig()
@ -280,7 +281,7 @@ func TestEmbedClientCert(t *testing.T) {
func TestEmbedClientKey(t *testing.T) {
fakeKeyFile, _ := os.CreateTemp(os.TempDir(), "")
defer os.Remove(fakeKeyFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKeyFile)
fakeData := []byte("fake-data")
os.WriteFile(fakeKeyFile.Name(), fakeData, 0600)
expectedConfig := newRedFederalCowHammerConfig()
@ -326,7 +327,7 @@ func TestEmbedNoKeyOrCertDisallowed(t *testing.T) {
func TestEmptyTokenAndCertAllowed(t *testing.T) {
fakeCertFile, _ := os.CreateTemp(os.TempDir(), "cert-file")
defer os.Remove(fakeCertFile.Name())
defer utiltesting.CloseAndRemove(t, fakeCertFile)
expectedConfig := newRedFederalCowHammerConfig()
authInfo := clientcmdapi.NewAuthInfo()
authInfo.ClientCertificate = path.Base(fakeCertFile.Name())
@ -569,7 +570,7 @@ func TestUnsetBytes(t *testing.T) {
func TestCAClearsInsecure(t *testing.T) {
fakeCAFile, _ := os.CreateTemp(os.TempDir(), "ca-file")
defer os.Remove(fakeCAFile.Name())
defer utiltesting.CloseAndRemove(t, fakeCAFile)
clusterInfoWithInsecure := clientcmdapi.NewCluster()
clusterInfoWithInsecure.InsecureSkipTLSVerify = true
@ -638,7 +639,7 @@ func TestInsecureClearsCA(t *testing.T) {
func TestCADataClearsCA(t *testing.T) {
fakeCAFile, _ := os.CreateTemp(os.TempDir(), "")
defer os.Remove(fakeCAFile.Name())
defer utiltesting.CloseAndRemove(t, fakeCAFile)
fakeData := []byte("cadata")
os.WriteFile(fakeCAFile.Name(), fakeData, 0600)
@ -852,7 +853,7 @@ func TestToBool(t *testing.T) {
func testConfigCommand(args []string, startingConfig clientcmdapi.Config, t *testing.T) (string, clientcmdapi.Config) {
fakeKubeFile, _ := os.CreateTemp(os.TempDir(), "")
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err := clientcmd.WriteToFile(startingConfig, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

3
pkg/cmd/config/current_context_test.go
View File

@ -18,6 +18,7 @@ package config
import (
"bytes"
utiltesting "k8s.io/client-go/util/testing"
"os"
"strings"
"testing"
@ -60,7 +61,7 @@ func (test currentContextTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

3
pkg/cmd/config/delete_cluster_test.go
View File

@ -19,6 +19,7 @@ package config
import (
"bytes"
"fmt"
utiltesting "k8s.io/client-go/util/testing"
"os"
"reflect"
"testing"
@ -56,7 +57,7 @@ func (test deleteClusterTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

3
pkg/cmd/config/delete_context_test.go
View File

@ -19,6 +19,7 @@ package config
import (
"bytes"
"fmt"
utiltesting "k8s.io/client-go/util/testing"
"os"
"reflect"
"testing"
@ -56,7 +57,7 @@ func (test deleteContextTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/get_clusters_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -60,7 +62,7 @@ func (test getClustersTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/get_contexts_test.go
View File

@ -20,6 +20,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/cli-runtime/pkg/genericiooptions"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -147,7 +149,7 @@ func (test getContextsTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.startingConfig, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/rename_context_test.go
View File

@ -23,6 +23,8 @@ import (
"strings"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -103,7 +105,7 @@ func TestRenameToAlreadyExistingContext(t *testing.T) {
func (test renameContextTest) run(t *testing.T) {
fakeKubeFile, _ := os.CreateTemp(os.TempDir(), "")
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err := clientcmd.WriteToFile(test.initialConfig, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/set_cluster_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -186,7 +188,7 @@ func (test setClusterTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/set_context_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -110,7 +112,7 @@ func (test setContextTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

3
pkg/cmd/config/set_credentials_test.go
View File

@ -18,6 +18,7 @@ package config
import (
"bytes"
utiltesting "k8s.io/client-go/util/testing"
"os"
"reflect"
"testing"
@ -457,7 +458,7 @@ func (test setCredentialsTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/set_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"reflect"
"k8s.io/client-go/tools/clientcmd"
@ -58,7 +60,7 @@ func (test setConfigTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/unset_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -109,7 +111,7 @@ func (test unsetConfigTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/use_context_test.go
View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)
@ -74,7 +76,7 @@ func (test useContextTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

4
pkg/cmd/config/view_test.go
View File

@ -20,6 +20,8 @@ import (
"os"
"testing"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/cli-runtime/pkg/genericiooptions"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@ -297,7 +299,7 @@ func (test viewClusterTest) run(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
defer os.Remove(fakeKubeFile.Name())
defer utiltesting.CloseAndRemove(t, fakeKubeFile)
err = clientcmd.WriteToFile(test.config, fakeKubeFile.Name())
if err != nil {
t.Fatalf("unexpected error: %v", err)

1
pkg/cmd/testing/fake.go
View File

@ -483,6 +483,7 @@ func (f *TestFactory) Cleanup() {
return
}
f.tempConfigFile.Close()
os.Remove(f.tempConfigFile.Name())
}