mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Move shared variables and fakeGCECloud method to top
This commit is contained in:
parent
e250074b38
commit
d62200bb6c
@ -34,6 +34,65 @@ import (
|
|||||||
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
|
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
projectID = "test-project"
|
||||||
|
region = "us-central1"
|
||||||
|
zoneName = "us-central1-b"
|
||||||
|
nodeName = "test-node-1"
|
||||||
|
clusterName = "Test Cluster Name"
|
||||||
|
clusterID = "test-cluster-id"
|
||||||
|
serviceName = ""
|
||||||
|
)
|
||||||
|
|
||||||
|
var apiService = &v1.Service{
|
||||||
|
Spec: v1.ServiceSpec{
|
||||||
|
SessionAffinity: v1.ServiceAffinityClientIP,
|
||||||
|
Type: v1.ServiceTypeClusterIP,
|
||||||
|
Ports: []v1.ServicePort{{Protocol: v1.ProtocolTCP, Port: int32(123)}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func fakeGCECloud() (*GCECloud, error) {
|
||||||
|
client, err := newOauthClient(nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
service, err := compute.New(client)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used in disk unit tests
|
||||||
|
fakeManager := newFakeManager(projectID, region)
|
||||||
|
zonesWithNodes := createNodeZones([]string{zoneName})
|
||||||
|
|
||||||
|
alphaFeatureGate, err := NewAlphaFeatureGate([]string{})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
gce := &GCECloud{
|
||||||
|
region: region,
|
||||||
|
service: service,
|
||||||
|
manager: fakeManager,
|
||||||
|
managedZones: []string{zoneName},
|
||||||
|
projectID: projectID,
|
||||||
|
networkProjectID: projectID,
|
||||||
|
AlphaFeatureGate: alphaFeatureGate,
|
||||||
|
nodeZones: zonesWithNodes,
|
||||||
|
nodeInformerSynced: func() bool { return true },
|
||||||
|
}
|
||||||
|
|
||||||
|
cloud := cloud.NewMockGCE(&gceProjectRouter{gce})
|
||||||
|
cloud.MockTargetPools.AddInstanceHook = mock.AddInstanceHook
|
||||||
|
cloud.MockTargetPools.RemoveInstanceHook = mock.RemoveInstanceHook
|
||||||
|
|
||||||
|
gce.c = cloud
|
||||||
|
|
||||||
|
return gce, nil
|
||||||
|
}
|
||||||
|
|
||||||
func TestEnsureStaticIP(t *testing.T) {
|
func TestEnsureStaticIP(t *testing.T) {
|
||||||
fcas := NewFakeCloudAddressService()
|
fcas := NewFakeCloudAddressService()
|
||||||
ipName := "some-static-ip"
|
ipName := "some-static-ip"
|
||||||
@ -245,65 +304,6 @@ func TestDeleteAddressWithWrongTier(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
|
||||||
gceProjectId = "test-project"
|
|
||||||
gceRegion = "us-central1"
|
|
||||||
zoneName = "us-central1-b"
|
|
||||||
nodeName = "test-node-1"
|
|
||||||
clusterName = "Test Cluster Name"
|
|
||||||
clusterID = "test-cluster-id"
|
|
||||||
)
|
|
||||||
|
|
||||||
var apiService = &v1.Service{
|
|
||||||
Spec: v1.ServiceSpec{
|
|
||||||
SessionAffinity: v1.ServiceAffinityClientIP,
|
|
||||||
Type: v1.ServiceTypeClusterIP,
|
|
||||||
Ports: []v1.ServicePort{{Protocol: v1.ProtocolTCP, Port: int32(123)}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func fakeGCECloud() (*GCECloud, error) {
|
|
||||||
client, err := newOauthClient(nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
service, err := compute.New(client)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Used in disk unit tests
|
|
||||||
fakeManager := newFakeManager(gceProjectId, gceRegion)
|
|
||||||
zonesWithNodes := createNodeZones([]string{zoneName})
|
|
||||||
|
|
||||||
alphaFeatureGate, err := NewAlphaFeatureGate([]string{})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
gce := &GCECloud{
|
|
||||||
region: gceRegion,
|
|
||||||
service: service,
|
|
||||||
manager: fakeManager,
|
|
||||||
managedZones: []string{zoneName},
|
|
||||||
projectID: gceProjectId,
|
|
||||||
networkProjectID: gceProjectId,
|
|
||||||
AlphaFeatureGate: alphaFeatureGate,
|
|
||||||
nodeZones: zonesWithNodes,
|
|
||||||
nodeInformerSynced: func() bool { return true },
|
|
||||||
}
|
|
||||||
|
|
||||||
cloud := cloud.NewMockGCE(&gceProjectRouter{gce})
|
|
||||||
cloud.MockTargetPools.AddInstanceHook = mock.AddInstanceHook
|
|
||||||
cloud.MockTargetPools.RemoveInstanceHook = mock.RemoveInstanceHook
|
|
||||||
cloud.MockAlphaForwardingRules.GetHook = mock.GetAlphaFwdRuleHook
|
|
||||||
|
|
||||||
gce.c = cloud
|
|
||||||
|
|
||||||
return gce, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func createAndInsertNodes(gce *GCECloud, nodeNames []string) ([]*v1.Node, error) {
|
func createAndInsertNodes(gce *GCECloud, nodeNames []string) ([]*v1.Node, error) {
|
||||||
nodes := []*v1.Node{}
|
nodes := []*v1.Node{}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user