github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

staticcheck:test/integration/master/

Browse Source
This commit is contained in:
tanjunchen 2020-01-07 21:56:37 +08:00
parent 8b8f2aa4a5
commit 8d313f333e
7 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -59,7 +59,6 @@ test/integration/etcd
test/integration/examples
test/integration/framework
test/integration/garbagecollector
test/integration/master
test/integration/scheduler_perf
test/integration/ttlcontroller
vendor/k8s.io/apimachinery/pkg/api/meta

3
test/integration/master/audit_dynamic_test.go
View File

@ -274,8 +274,7 @@ func asyncOps(
continue
}
e := expected.Load().([]utils.AuditEvent)
evList := []utils.AuditEvent{}
evList = append(e, exp...)
evList := append(e, exp...)
expected.Store(evList)
}
}

18
test/integration/master/crd_test.go
View File

@ -30,7 +30,6 @@ import (
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/dynamic"
@ -298,20 +297,3 @@ func reverse(s []string) {
s[i], s[j] = s[j], s[i]
}
}
type Foo struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
}
func unstructuredFoo(foo *Foo) (*unstructured.Unstructured, error) {
bs, err := json.Marshal(foo)
if err != nil {
return nil, err
}
ret := &unstructured.Unstructured{}
if err = ret.UnmarshalJSON(bs); err != nil {
return nil, err
}
return ret, nil
}

3
test/integration/master/kms_transformation_test.go
View File

@ -177,6 +177,9 @@ resources:
// Secrets should be un-enveloped on direct reads from Kube API Server.
s, err := test.restClient.CoreV1().Secrets(testNamespace).Get(testSecret, metav1.GetOptions{})
if err != nil {
t.Fatalf("failed to get Secret from %s, err: %v", testNamespace, err)
}
if secretVal != string(s.Data[secretKey]) {
t.Fatalf("expected %s from KubeAPI, but got %s", secretVal, string(s.Data[secretKey]))
}

7
test/integration/master/kube_apiserver_test.go
View File

@ -297,6 +297,9 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) {
t.Fatalf("unexpected error: apiextensions definition doesn't exist")
}
bytes, err := json.Marshal(apiextensionsDefinition)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if exist := strings.Contains(string(bytes), testApiextensionsOverlapProbeString); exist {
t.Fatalf("unexpected error: apiextensions definition gets overlapped")
}
@ -428,6 +431,10 @@ func testReconcilersMasterLease(t *testing.T, leaseCount int, masterCount int) {
// 2. verify master count servers have registered
if err := wait.PollImmediate(3*time.Second, 2*time.Minute, func() (bool, error) {
client, err := kubernetes.NewForConfig(masterCountServers[0].ClientConfig)
if err != nil {
t.Logf("error creating client: %v", err)
return false, nil
}
endpoints, err := client.CoreV1().Endpoints("default").Get("kubernetes", metav1.GetOptions{})
if err != nil {
t.Logf("error fetching endpoints: %v", err)

18
test/integration/master/synthetic_master_test.go
View File

@ -425,20 +425,6 @@ func autoscalingPath(resource, namespace, name string) string {
return path.Join("/apis/autoscaling/v1", namespace, resource, name)
}
func batchPath(resource, namespace, name string) string {
if namespace != "" {
namespace = path.Join("namespaces", namespace)
}
return path.Join("/apis/batch/v1", namespace, resource, name)
}
func extensionsPath(resource, namespace, name string) string {
if namespace != "" {
namespace = path.Join("namespaces", namespace)
}
return path.Join("/apis/extensions/v1beta1", namespace, resource, name)
}
func appsPath(resource, namespace, name string) string {
if namespace != "" {
namespace = path.Join("namespaces", namespace)
@ -471,11 +457,11 @@ func TestAutoscalingGroupBackwardCompatibility(t *testing.T) {
}
func() {
resp, err := transport.RoundTrip(req)
defer resp.Body.Close()
if err != nil {
t.Logf("case %v", r)
t.Fatalf("unexpected error: %v", err)
}
defer resp.Body.Close()
b, _ := ioutil.ReadAll(resp.Body)
body := string(b)
if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok {
@ -519,11 +505,11 @@ func TestAppsGroupBackwardCompatibility(t *testing.T) {
}
func() {
resp, err := transport.RoundTrip(req)
defer resp.Body.Close()
if err != nil {
t.Logf("case %v", r)
t.Fatalf("unexpected error: %v", err)
}
defer resp.Body.Close()
b, _ := ioutil.ReadAll(resp.Body)
body := string(b)
if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok {

3
test/integration/master/transformation_testcase.go
View File

@ -134,6 +134,9 @@ func (e *transformTest) run(unSealSecretFunc unSealSecret, expectedEnvelopePrefi
// Secrets should be un-enveloped on direct reads from Kube API Server.
s, err := e.restClient.CoreV1().Secrets(testNamespace).Get(testSecret, metav1.GetOptions{})
if err != nil {
e.logger.Errorf("failed to get Secret from %s, err: %v", testNamespace, err)
}
if secretVal != string(s.Data[secretKey]) {
e.logger.Errorf("expected %s from KubeAPI, but got %s", secretVal, string(s.Data[secretKey]))
}