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 mergo dependency #3793

Merged
merged 6 commits into from
Feb 22, 2019
Merged

Update mergo dependency #3793

merged 6 commits into from
Feb 22, 2019

Conversation

alexkursell
Copy link
Contributor

What this PR does / why we need it: The outdated mergo version was preventing the kubectl plugin in #3779 from correctly authenticating with gcp. This PR updates the mergo version from 0.2.4 to 0.3.7

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 21, 2019
@aledbf
Copy link
Member

aledbf commented Feb 21, 2019

@alexkursell this update will break the merge feature in the ingress controller. That's the reason why it is at 0.24. I didn't try to debug the issue.

@alexkursell
Copy link
Contributor Author

@alexkursell this update will break the merge feature in the ingress controller. That's the reason why it is at 0.24. I didn't try to debug the issue.

I'll try to fix the merge feature then.

aledbf
aledbf reviewed Feb 22, 2019
View reviewed changes
internal/ingress/annotations/annotations.go Outdated
InfluxDB influxdb.Config
ModSecurity modsecurity.Config
//TODO: Change this back into an error when https://github.com/imdario/mergo/issues/100 is resolved
Denied string
Copy link
Member

Choose a reason for hiding this comment

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

Why not *string so you can narrow the changes to just the type?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good idea. I'll make the change.

@aledbf
Copy link
Member

aledbf commented Feb 22, 2019

@alexkursell please squash the commits (in two)

@aledbf
Copy link
Member

aledbf commented Feb 22, 2019

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2019
@ElvinEfendi
Copy link
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, alexkursell, ElvinEfendi

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 merged commit debe933 into kubernetes:master Feb 22, 2019
@alexkursell alexkursell deleted the update-mergo branch February 25, 2019 15:03
@alexkursell alexkursell mentioned this pull request Feb 25, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aledbf aledbf aledbf left review comments

@ElvinEfendi ElvinEfendi Awaiting requested review from ElvinEfendi

Assignees

@ElvinEfendi ElvinEfendi

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.
4 participants
@alexkursell @aledbf @ElvinEfendi @k8s-ci-robot