Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Contour IngressRoute deps #1569

Merged
merged 1 commit into from
May 16, 2020
Merged

update Contour IngressRoute deps #1569

merged 1 commit into from
May 16, 2020

Conversation

stevesloka
Copy link
Contributor

Updates #1366 by updating the Project Contour deps. This is just an initial pass to unblock anyone from updating dependencies in the project. Contour has open issues to enable Status information in HTTPProxy so that we can expose this information better.

Once we have that we can submit a follow-up PR to clean up this logic as well as add support for HTTPProxy.

Signed-off-by: Steve Sloka slokas@vmware.com

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 11, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @stevesloka!

It looks like this is your first PR to kubernetes-sigs/external-dns 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/external-dns has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 11, 2020
@stevesloka
Copy link
Contributor Author

@tariq1890

tariq1890
tariq1890 reviewed May 11, 2020
View reviewed changes
go.mod
@@ -79,4 +79,5 @@ replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817221809-bf4de9df677c
k8s.io/client-go => k8s.io/client-go v0.0.0-20190817222206-ee6c071a42cf
k8s.io/klog => github.com/mikkeloscar/knolog v0.0.0-20190326191552-80742771eb6b
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.7-0.20190821215049-f062b07a671a
Copy link
Contributor

Choose a reason for hiding this comment

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

can we remove the replace directives for the k8s deps?

Copy link
Contributor

Choose a reason for hiding this comment

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

(Not really required) If not possible, we can leave it as-is. I can address it in my PR

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 added the go-control-plane one since Contour has a later version in it's go.mod than Istio. When compiling there was a diff issue and couldn't get resolved. I'm happy to remove, this was just to make everything build properly.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh got it! Makes sense :)

@stevesloka stevesloka force-pushed the updateContourIngressRoute branch 2 times, most recently from 96a1aeb to 3dded30 Compare May 12, 2020 15:48
tariq1890
tariq1890 reviewed May 12, 2020
View reviewed changes
source/ingressroute.go Outdated Show resolved Hide resolved
tariq1890
tariq1890 reviewed May 12, 2020
View reviewed changes
source/ingressroute.go Outdated Show resolved Hide resolved
@tariq1890
Copy link
Contributor

Thanks a lot @stevesloka :)

cc'ing @njuettner and @Raffo

@tariq1890
Copy link
Contributor

Hi @stevesloka ! Friendly ping to fix the minor goimports issues :)

@stevesloka stevesloka force-pushed the updateContourIngressRoute branch 2 times, most recently from 47227e8 to 1ea22a1 Compare May 14, 2020 18:59
tariq1890
tariq1890 reviewed May 14, 2020
View reviewed changes
source/ingressroute_test.go Outdated
"testing"

contour "github.com/heptio/contour/apis/contour/v1beta1"
fakeContour "github.com/heptio/contour/apis/generated/clientset/versioned/fake"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be grouped with the other third party imports too

tariq1890
tariq1890 reviewed May 14, 2020
View reviewed changes
source/ingressroute.go Outdated
@@ -19,45 +19,50 @@ package source
import (
"bytes"
"fmt"

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change

@stevesloka
update Contour IngressRoute deps
5c565da 
Signed-off-by: Steve Sloka <slokas@vmware.com>
tariq1890
tariq1890 approved these changes May 14, 2020
View reviewed changes
Copy link
Contributor

@tariq1890 tariq1890 left a comment

Choose a reason for hiding this comment

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

LGTM

@tariq1890
Copy link
Contributor

/assign @Raffo

@Raffo
Copy link
Contributor

Raffo commented May 16, 2020

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Raffo, stevesloka

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 16, 2020
@k8s-ci-robot k8s-ci-robot merged commit b0eaca1 into kubernetes-sigs:master May 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tariq1890 tariq1890 tariq1890 approved these changes

@hjacobs hjacobs Awaiting requested review from hjacobs

@linki linki Awaiting requested review from linki

Assignees

@Raffo Raffo

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@stevesloka @k8s-ci-robot @tariq1890 @Raffo