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.

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

Renames tlsutils.go to tlsutil.go to match upstream #12

Merged
merged 1 commit into from Oct 29, 2019

Conversation

dougbtv
Copy link
Member

@dougbtv dougbtv commented Oct 28, 2019

Unfortunately #11 is failing because tlsutils.go exists in the downstream, but tlsutil.go exists in the upstream. When the merge for #11 happens, both file exist.

This causes the container image build to fail with:

# github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/pkg/webhook
gopath/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/pkg/webhook/tlsutils.go:27:6: tlsKeypairReloader redeclared in this block
	previous declaration at gopath/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/pkg/webhook/tlsutil.go:27:6
gopath/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/pkg/webhook/tlsutils.go:34:6: (*tlsKeypairReloader).maybeReload redeclared in this block
	previous declaration at gopath/src/github.com/k8snetworkplumbingwg/net-attach-def-admission-controller/pkg/webhook/tlsutil.go:34:6

This should be able to be renamed without causing any other failures, as only the "webhook" package name is referred to elsewhere.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 28, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 28, 2019
@s1061123
Copy link
Contributor

/lgtm Thanks, Doug!

@s1061123
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 29, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougbtv, s1061123

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

@openshift-merge-robot openshift-merge-robot merged commit f9e6156 into openshift:master Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants