Revendor godep #994

freehan · 2017-07-19T00:00:24Z

Revendor Godep and fix gce controller

This includes a lot of changes. Need careful review.

@nicksardo @nikhiljindal @bowei @madhusudancs

k8s-reviewable · 2017-07-19T00:00:30Z

This change is

freehan · 2017-07-19T21:40:09Z

controllers/gce/controller/util_test.go

 		expNodes := sets.NewString(nodeNames...)
+		//expNodes := sets.NewString()


will clean this up in next push

freehan · 2017-07-20T17:40:10Z

/assign nicksardo

nicksardo · 2017-07-20T18:01:12Z

controllers/gce/controller/util_test.go

+	if cm.fakeIGs.Ports[0] != testPort {
+		t.Errorf("Expected the same node port on all igs, got ports %+v", cm.fakeIGs.Ports)
+	}
+


The original test and this change look funky. We should be testing each instance group for the testPort, but this only checks the first port and happens outside the instance group loop.

See my other comment

nicksardo · 2017-07-20T21:39:42Z

controllers/gce/firewalls/fakes.go

-	namer *utils.Namer
+	fw         map[string]*compute.Firewall
+	namer      *utils.Namer
+	networkUrl string


I think namer has to be removed from the fakeFirewallsProvider. Cloudprovider should no longer be generating the name given a suffix - it should just be given the name.

nicksardo · 2017-07-20T21:40:01Z

controllers/gce/firewalls/fakes.go

-func (f *fakeFirewallsProvider) GetFirewall(prefixedName string) (*compute.Firewall, error) {
-	rule, exists := f.fw[prefixedName]
+func (ff *fakeFirewallsProvider) GetFirewall(prefixedName string) (*compute.Firewall, error) {
+	rule, exists := ff.fw[prefixedName]


Please rename to just name

nicksardo · 2017-07-20T21:41:16Z

controllers/gce/firewalls/fakes.go

-	prefixedName := f.namer.FrName(name)
-	_, exists := f.fw[prefixedName]
+	prefixedName := ff.namer.FrName(name)
+	_, exists := ff.fw[prefixedName]


We shouldn't need namer here, right?

nicksardo · 2017-07-20T21:46:42Z

controllers/gce/firewalls/firewalls.go

+		firewall, err := fr.createFirewallObject(suffix, "GCE L7 firewall rule", nodePorts, nodeNames)
+		if err != nil {
+			return err
+		}


Should we just call this createFirewallObject once earlier in the function and re-use it here and below?

nicksardo · 2017-07-20T21:50:35Z

controllers/gce/instances/fakes.go

+		url := instanceRefs[ix].Instance
+		parts := strings.Split(url, "/")
+		instanceNames[ix] = parts[len(parts)-1]
+	}


We could instead change to storing URLs instead of names. Up to you.

nicksardo · 2017-07-20T21:51:47Z

controllers/gce/instances/fakes.go

+	for _, port := range namedPorts {
+		f.Ports = append(f.Ports, port.Port)
+	}
+	return nil


Either add it now or add a TODO. We should assert existence of the instance group and return an error if missing.

nicksardo · 2017-07-20T21:52:30Z

controllers/gce/instances/instances.go

@@ -63,13 +63,14 @@ func (i *Instances) Init(zl zoneLister) {
 // all of which have the exact same named port.
 func (i *Instances) AddInstanceGroup(name string, port int64) ([]*compute.InstanceGroup, *compute.NamedPort, error) {
 	igs := []*compute.InstanceGroup{}
-	namedPort := &compute.NamedPort{}
+	namedPort := &compute.NamedPort{Name: fmt.Sprintf("port%v", port), Port: port}


Either now or in a TODO, the port name should be moved to namer.

nicksardo · 2017-07-20T21:54:13Z

controllers/gce/loadbalancers/fakes.go

+func (f *FakeLoadBalancers) ReserveGlobalAddress(addr *compute.Address) error {
+	f.calls = append(f.calls, "ReserveGlobalAddress")
+	f.IP = append(f.IP, addr)
+	return nil


In the future, we should just refactor this to use a map. Nothing to do now.

nicksardo · 2017-07-20T21:58:20Z

I didn't see any show stoppers, but would appreciate some minor changes in areas.

freehan · 2017-07-21T21:49:45Z

controllers/gce/instances/fakes.go

+		return fmt.Errorf("Failed to find instance group %q in zone %q", igName, zone)
+	}
+
+	f.Ports = f.Ports[:0]


@nicksardo The interface and fakeInstanceGroup changed. Only store the namedports, not append. So there is only one port.

This seems odd to me. Can we change the FakeInstanceGroup.Ports []int64 to FakeInstanceGroup.Port int64?

Nope. There can be multiple named port passing in.

I see. I ignored the code below :)

coveralls · 2017-07-25T00:39:17Z

Coverage increased (+0.1%) to 43.982% when pulling 92efa39 on freehan:revendor-godep into a58b800 on kubernetes:master.

aledbf · 2017-07-25T01:37:26Z

@nicksardo @freehan this is ready to be merged?

nikhiljindal · 2017-07-25T01:48:58Z

lgtm at a quick glance :)

bowei · 2017-07-25T05:23:57Z

I'm kind of confused looking at the commits, why are there commits from someone else in the list?

aledbf · 2017-07-25T12:12:08Z

@bowei I started the update until I found the gce controller require changes because of the firewall api changes.

nicksardo · 2017-07-25T20:39:32Z

controllers/gce/firewalls/firewalls.go

@@ -60,9 +60,15 @@ func (fr *FirewallRules) Sync(nodePorts []int64, nodeNames []string) error {
 	// instead of the whole name.
 	name := fr.namer.FrName(suffix)
 	rule, _ := fr.cloud.GetFirewall(name)
+
+	firewall, err := fr.createFirewallObject(suffix, "GCE L7 firewall rule", nodePorts, nodeNames)


We pass in suffix though we just computed the name above. Could we either delete line 61 and change uses to "firewall.Name" or pass in the name?

nicksardo · 2017-07-25T20:41:16Z

controllers/gce/firewalls/firewalls.go

-	err := fr.cloud.DeleteFirewall(fr.namer.FrSuffix())
+	name := fr.namer.FrName(fr.namer.FrSuffix())
+	glog.Infof("Deleting firewall %v", name)
+	err := fr.cloud.DeleteFirewall(name)
 	if err != nil && utils.IsHTTPErrorCode(err, 404) {
 		glog.Infof("Firewall with suffix %v didn't exist at Shutdown", fr.namer.FrSuffix())


Can change this line to print the firewall name computed above.

nicksardo · 2017-07-25T20:44:22Z

controllers/gce/firewalls/firewalls.go

+	ports := make([]string, len(nodePorts))
+	for ix := range nodePorts {
+		ports[ix] = strconv.Itoa(int(nodePorts[ix]))
+	}


Are we de-duping ports anywhere? Checking

Yes, upstream. https://github.com/kubernetes/ingress/blob/a58b80017170eecbe8b2d6573b66192cafe0d32a/controllers/gce/controller/cluster_manager.go#L131-L138

nicksardo · 2017-07-25T20:54:59Z

controllers/gce/loadbalancers/fakes.go

-func (f *FakeLoadBalancers) DeleteGlobalStaticIP(name string) error {
-	f.calls = append(f.calls, "DeleteGlobalStaticIP")
+// DeleteGlobalAddress fakes out static IP deletion.
+func (f *FakeLoadBalancers) DeleteGlobalAddress(name string) error {


Note for future, we should return fake 404 if address wasn't found.

nicksardo · 2017-07-25T20:59:44Z

My last two comments can be done in another PR. I think it's good to go, but will ping @bowei for last check.

madhusudancs

@freehan I lack the depth that @nicksardo has in this code base. I have left a few minor comments. LGTM otherwise.

madhusudancs · 2017-07-25T21:10:03Z

controllers/gce/backends/backends.go

@@ -26,10 +26,10 @@ import (
 	"github.com/golang/glog"

 	compute "google.golang.org/api/compute/v1"
+	api_v1 "k8s.io/api/core/v1"


Is there a reason to merge these two blocks? I really like the separation between the k8s API imports and other imports

madhusudancs · 2017-07-25T21:43:40Z

controllers/gce/instances/fakes.go

+		return fmt.Errorf("Failed to find instance group %q in zone %q", igName, zone)
+	}
+
+	f.Ports = f.Ports[:0]


This seems odd to me. Can we change the FakeInstanceGroup.Ports []int64 to FakeInstanceGroup.Port int64?

madhusudancs · 2017-07-25T21:52:52Z

core/pkg/ingress/status/status.go

 	"sort"
 	"sync"
 	"time"

 	"github.com/golang/glog"

+	api "k8s.io/api/core/v1"


call this v1 or corev1. It gets pretty confusing when reading the code in these packages. For example, see https://github.com/kubernetes/ingress/pull/994/files#diff-636822cdb1e125937cd0afa244e18161R33.

freehan · 2017-07-26T00:10:28Z

Addressed the comments.

coveralls · 2017-07-26T00:22:06Z

Coverage increased (+0.1%) to 43.982% when pulling ee3054d on freehan:revendor-godep into a58b800 on kubernetes:master.

coveralls · 2017-07-26T00:32:47Z

Coverage increased (+0.07%) to 43.955% when pulling ee3054d on freehan:revendor-godep into a58b800 on kubernetes:master.

bowei · 2017-07-27T00:32:03Z

looks ok to me
/lgtm

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 19, 2017

aledbf mentioned this pull request Jul 19, 2017

WIP: Add function to allow custom values in Ingress status #985

Closed

freehan force-pushed the revendor-godep branch from 29566bd to 109ae19 Compare July 19, 2017 21:24

freehan commented Jul 19, 2017

View reviewed changes

freehan force-pushed the revendor-godep branch from 109ae19 to 1fc4d36 Compare July 20, 2017 17:39

k8s-ci-robot assigned nicksardo Jul 20, 2017

aledbf added 5 commits July 20, 2017 10:41

Update nginx controller

294ecb4

Update generic controller

7f2b68b

Update examples

53dd434

Update gce controller

060e449

Update go dependencies

4fb61c7

freehan force-pushed the revendor-godep branch from 1fc4d36 to 16b623c Compare July 20, 2017 17:43

nicksardo suggested changes Jul 20, 2017

View reviewed changes

freehan force-pushed the revendor-godep branch from 16b623c to da167d5 Compare July 21, 2017 21:47

freehan commented Jul 21, 2017

View reviewed changes

freehan force-pushed the revendor-godep branch from da167d5 to f7131f0 Compare July 22, 2017 00:07

aledbf mentioned this pull request Jul 24, 2017

Ingress Repo: Update vendored dependencies #983

Closed

freehan force-pushed the revendor-godep branch from f7131f0 to 2f63680 Compare July 24, 2017 20:23

nicksardo approved these changes Jul 24, 2017

View reviewed changes

freehan force-pushed the revendor-godep branch 3 times, most recently from 7d5605b to 92efa39 Compare July 25, 2017 00:17

aledbf referenced this pull request Jul 25, 2017

Update gce controller

c7c2a56

nicksardo reviewed Jul 25, 2017

View reviewed changes

madhusudancs reviewed Jul 25, 2017

View reviewed changes

freehan force-pushed the revendor-godep branch from 92efa39 to 5241602 Compare July 26, 2017 00:01

adapt gce controller to godep updates

ee3054d

freehan force-pushed the revendor-godep branch from 5241602 to ee3054d Compare July 26, 2017 00:09

madhusudancs approved these changes Jul 26, 2017

View reviewed changes

k8s-ci-robot assigned bowei Jul 27, 2017

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 27, 2017

nicksardo merged commit 16a213c into kubernetes:master Jul 27, 2017

nicksardo mentioned this pull request Aug 3, 2017

[GLBC] Bump GLBC version to 0.9.6 #1064

Merged

		expNodes := sets.NewString(nodeNames...)
		//expNodes := sets.NewString()

Revendor godep #994

Revendor godep #994

Conversation

freehan commented Jul 19, 2017 • edited by nicksardo Loading

k8s-reviewable commented Jul 19, 2017

Choose a reason for hiding this comment

freehan commented Jul 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicksardo commented Jul 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Jul 25, 2017

aledbf commented Jul 25, 2017

nikhiljindal commented Jul 25, 2017

bowei commented Jul 25, 2017

aledbf commented Jul 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicksardo Jul 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicksardo commented Jul 25, 2017

madhusudancs left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

freehan commented Jul 26, 2017

coveralls commented Jul 26, 2017

coveralls commented Jul 26, 2017

bowei commented Jul 27, 2017

freehan commented Jul 19, 2017 •

edited by nicksardo

Loading

nicksardo Jul 25, 2017 •

edited

Loading