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

refactor services to v1beta3

Browse Source
This commit is contained in:
markturansky
2014-10-30 09:29:11 -04:00
parent 5a649f2b93
commit bd7643c033
26 changed files with 466 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/service/endpoints_controller.go
View File

@@ -57,7 +57,7 @@ func (e *EndpointController) SyncServiceEndpoints() error {
continue
}
glog.Infof("About to update endpoints for service %v", service.Name)
pods, err := e.client.Pods(service.Namespace).List(labels.Set(service.Selector).AsSelector())
pods, err := e.client.Pods(service.Namespace).List(labels.Set(service.Spec.Selector).AsSelector())
if err != nil {
glog.Errorf("Error syncing service: %#v, skipping.", service)
resultErr = err
@@ -65,7 +65,7 @@ func (e *EndpointController) SyncServiceEndpoints() error {
}
endpoints := []string{}
for _, pod := range pods.Items {
port, err := findPort(&pod.DesiredState.Manifest, service.ContainerPort)
port, err := findPort(&pod.DesiredState.Manifest, service.Spec.ContainerPort)
if err != nil {
glog.Errorf("Failed to find port for service: %v, %v", service, err)
continue

24
pkg/service/endpoints_controller_test.go
View File

@@ -182,8 +182,10 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
Items: []api.Service{
{
ObjectMeta: api.ObjectMeta{Name: "foo"},
Selector: map[string]string{
"foo": "bar",
Spec: api.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
},
},
},
@@ -219,8 +221,10 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) {
Items: []api.Service{
{
ObjectMeta: api.ObjectMeta{Name: "foo"},
Selector: map[string]string{
"foo": "bar",
Spec: api.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
},
},
},
@@ -248,8 +252,10 @@ func TestSyncEndpointsItems(t *testing.T) {
Items: []api.Service{
{
ObjectMeta: api.ObjectMeta{Name: "foo"},
Selector: map[string]string{
"foo": "bar",
Spec: api.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
},
},
},
@@ -277,8 +283,10 @@ func TestSyncEndpointsPodError(t *testing.T) {
serviceList := api.ServiceList{
Items: []api.Service{
{
Selector: map[string]string{
"foo": "bar",
Spec: api.ServiceSpec{
Selector: map[string]string{
"foo": "bar",
},
},
},
},