Skip to content
This repository has been archived by the owner on Jan 28, 2020. It is now read-only.

Vendor latest Cluster-API and testify #244

Merged
merged 2 commits into from
May 30, 2018
Merged

Vendor latest Cluster-API and testify #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1526f0d
Vendor latest cluster-api and testify.
dgoodwin May 30, 2018
52edb14
Fixes for cluster-api interface changes.
dgoodwin May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/cmd/aws-actuator-test/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ func deleteClusterMachine(instanceId string) error {
}

func clusterMachineExists(instanceId string) error {
_, machine := testClusterAPIResources("any")
cluster, machine := testClusterAPIResources("any")
machine.Annotations = map[string]string{
instanceIDAnnotation: instanceId,
}
actuator := aws.NewActuator(nil, nil, log.WithField("example", "delete-machine"), "us-east-1c")
exists, err := actuator.Exists(machine)
exists, err := actuator.Exists(cluster, machine)
if err != nil {
return err
}
Expand Down
19 changes: 11 additions & 8 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ import:
- package: github.com/kubernetes-incubator/apiserver-builder
version: ^1.9.0-alpha.3
- package: sigs.k8s.io/cluster-api
- package: github.com/stretchr/testify
Copy link
Contributor

@staebler staebler May 30, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the follow-on to the comment about not needing to explicitly specify the master version is that we shouldn't need this line at in the glide.yaml. Glide should pick up this dependency automatically by inspecting the imports.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure this doesn't happen once and then lock it? I'm not sure what's going on but we were stuck on a very old testify, sometime last year, and I'm sure we've run glide up since then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I run glide up -v on master without these changes, testify jumps from Sep 2016 to Mar 2018. I have no idea how it's stayed at 2016 so long amidst our past updates. I'm inclined to list it explicitly as a result though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should keep the explicit list, it sounds like glide gets really weird with your local ~/.glide/cache if you don't explicitly set what you want. Also sounds like even glide itself recommends switching to dep. Masterminds/glide#592

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has stayed at Sep 2016 because at one point our glide.yaml was tied to v1.1.4. Running glide cc clears that up. It still does not use the HEAD of the master branch without explicitly specifying the repo in the glide.yaml because kube-openapi has a dependency on testify. I can live with explicitly including testify in the glide.yaml if there are truly things that we need from testify that are not there in the f6abca593680b2315d2075e0f5e2a9751e3f431a commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes the commits I'm after are from earlier this year, f6abca593680b2315d2075e0f5e2a9751e3f431a appears to be from July 2017.

Where did that commit ID originate from though? We were pinned to 69483b4bd14f5845b5a1e55bca19e954e827f1d0 previously.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cluster-operator/glide.yaml

Line 27 in 6e29700

version: v1.1.4

4 changes: 2 additions & 2 deletions pkg/clusterapi/aws/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func (a *Actuator) CreateMachine(cluster *clusterv1.Cluster, machine *clusterv1.
}

// Delete deletes a machine and updates its finalizer
func (a *Actuator) Delete(machine *clusterv1.Machine) error {
func (a *Actuator) Delete(cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
mLog := clustoplog.WithMachine(a.logger, machine)
mLog.Debugf("Delete %s/%s", machine.Namespace, machine.Name)
if err := a.DeleteMachine(machine); err != nil {
Expand Down Expand Up @@ -396,7 +396,7 @@ func (a *Actuator) Update(c *clusterv1.Cluster, machine *clusterv1.Machine) erro
}

// Exists determines if the given machine currently exists.
func (a *Actuator) Exists(machine *clusterv1.Machine) (bool, error) {
func (a *Actuator) Exists(cluster *clusterv1.Cluster, machine *clusterv1.Machine) (bool, error) {
mLog := clustoplog.WithMachine(a.logger, machine)
mLog.Debugf("checking if machine exists")

Expand Down
24 changes: 17 additions & 7 deletions vendor/github.com/gorilla/context/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/gorilla/context/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/gorilla/context/context_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/gorilla/context/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 21 additions & 5 deletions vendor/github.com/gorilla/mux/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions vendor/github.com/gorilla/mux/ISSUE_TEMPLATE.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading