github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 05:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Rename 'portal IP' to 'cluster IP' most everywhere

Browse Source 
This covers obvious transforms, but not --portal_net, $PORTAL_NET and
similar.
This commit is contained in:
Tim Hockin
2015-05-23 13:41:11 -07:00
parent 46686616d4
commit 4318ca5a8b
43 changed files with 389 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/dns/kube2sky/kube2sky.go
View File

@@ -213,7 +213,7 @@ func (ks *kube2sky) handleEndpointAdd(obj interface{}) {
func (ks *kube2sky) generateRecordsForPortalService(subdomain string, service *kapi.Service) error {
for i := range service.Spec.Ports {
b, err := json.Marshal(getSkyMsg(service.Spec.PortalIP, service.Spec.Ports[i].Port))
b, err := json.Marshal(getSkyMsg(service.Spec.ClusterIP, service.Spec.Ports[i].Port))
if err != nil {
return err
}
@@ -229,7 +229,7 @@ func (ks *kube2sky) addDNS(subdomain string, service *kapi.Service) error {
if len(service.Spec.Ports) == 0 {
glog.Fatalf("unexpected service with no ports: %v", service)
}
// if PortalIP is not set, a DNS entry should not be created
// if ClusterIP is not set, a DNS entry should not be created
if !kapi.IsServiceIPSet(service) {
return ks.newHeadlessService(subdomain, service)
}

16
cluster/addons/dns/kube2sky/kube2sky_test.go
View File

@@ -94,7 +94,7 @@ type hostPort struct {
func getHostPort(service *kapi.Service) *hostPort {
return &hostPort{
Host: service.Spec.PortalIP,
Host: service.Spec.ClusterIP,
Port: service.Spec.Ports[0].Port,
}
}
@@ -134,7 +134,7 @@ func TestHeadlessService(t *testing.T) {
Namespace: testNamespace,
},
Spec: kapi.ServiceSpec{
PortalIP: "None",
ClusterIP: "None",
Ports: []kapi.ServicePort{
{Port: 80},
},
@@ -187,7 +187,7 @@ func TestHeadlessServiceEndpointsUpdate(t *testing.T) {
Namespace: testNamespace,
},
Spec: kapi.ServiceSpec{
PortalIP: "None",
ClusterIP: "None",
Ports: []kapi.ServicePort{
{Port: 80},
},
@@ -244,7 +244,7 @@ func TestHeadlessServiceWithDelayedEndpointsAddition(t *testing.T) {
Namespace: testNamespace,
},
Spec: kapi.ServiceSpec{
PortalIP: "None",
ClusterIP: "None",
Ports: []kapi.ServicePort{
{Port: 80},
},
@@ -308,7 +308,7 @@ func TestAddSinglePortService(t *testing.T) {
Port: 80,
},
},
PortalIP: "1.2.3.4",
ClusterIP: "1.2.3.4",
},
}
k2s.newService(&service)
@@ -334,12 +334,12 @@ func TestUpdateSinglePortService(t *testing.T) {
Port: 80,
},
},
PortalIP: "1.2.3.4",
ClusterIP: "1.2.3.4",
},
}
k2s.newService(&service)
assert.Len(t, ec.writes, 2)
service.Spec.PortalIP = "0.0.0.0"
service.Spec.ClusterIP = "0.0.0.0"
k2s.newService(&service)
expectedValue := getHostPort(&service)
assertDnsServiceEntryInEtcd(t, ec, testService, testNamespace, expectedValue)
@@ -363,7 +363,7 @@ func TestDeleteSinglePortService(t *testing.T) {
Port: 80,
},
},
PortalIP: "1.2.3.4",
ClusterIP: "1.2.3.4",
},
}
// Add the service