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

Remove deprecatedPublicIPs field #44519

Merged

Conversation

thockin
Copy link
Member

@thockin thockin commented Apr 14, 2017

No description provided.

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Apr 14, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 14, 2017
@thockin thockin added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 14, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@xiangpengzhao
Copy link
Contributor

@thockin Did you generate pkg/api/v1/types.generated.go correctly? It's an empty file in your PR and it leads to the tests failure.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 15, 2017
@@ -1,2469 +0,0 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

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

Please check this generated file:)

@@ -141,7 +141,7 @@ cat << EOF > fe-s.json
"ports": [{
"port": 3000
}],
"deprecatedPublicIPs":["$PUBLIC_IP","10.1.4.89"],
"externalIPs":["$PUBLIC_IP","10.1.4.89"],
Copy link
Contributor

Choose a reason for hiding this comment

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

Also change the name of $PUBLIC_IP to EXTERNAL_IP appears in this script?

@thockin thockin force-pushed the remove-deprecated-public-ips branch from bcc58c2 to 54447d1 Compare April 15, 2017 19:25
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 15, 2017
@thockin thockin force-pushed the remove-deprecated-public-ips branch from 54447d1 to adfb2ca Compare April 15, 2017 20:04
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 15, 2017
@thockin thockin force-pushed the remove-deprecated-public-ips branch from adfb2ca to 9153bfa Compare April 15, 2017 20:16
@thockin
Copy link
Member Author

thockin commented Apr 16, 2017

@caesarxuchao I don't know what to do wrt staging updates. I ran update-staging-client (update-all) and it made a bunch of changes like the following, which seem wrong.

@@ -15,11 +15,24 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
+        "//pkg/apis/certificates:go_default_library",
+        "//pkg/apis/certificates/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/certificates:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/certificates/v1beta1:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
     ],
 )

@caesarxuchao
Copy link
Member

The Jenkins verification passed anyway because we ignore the BUILD file diffs: https://github.com/kubernetes/kubernetes/blob/master/staging/copy.sh#L220-L221. @thockin if you run hack/update-bazel.sh again, are those changes cancelled?

I don't know which script is managing the BUILD files in the staging folder, @mikedanese do you know?

@thockin
Copy link
Member Author

thockin commented Apr 17, 2017 via email

@bowei
Copy link
Member

bowei commented Apr 17, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 17, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bowei, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@mikedanese
Copy link
Member

Gahh, that's a bug in how ./staging/copy.sh handles BUILD files, ./hack/update-bazel.sh is canonical. I'll take a look.

@caesarxuchao
Copy link
Member

@mikedanese it seems the problem is exposed by #40777

@thockin
Copy link
Member Author

thockin commented Apr 17, 2017 via email

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit ca8f1bc into kubernetes:master Apr 17, 2017
@caesarxuchao
Copy link
Member

@thockin the update-staging-client-go.sh verifies the working dir is clean before proceeding. Or do you mean other things by "clean GOPATH"?

It really needs to make a temporary space, change GOPATH, restore into that, then process

We had considered this, but it will take too long to run.

@thockin
Copy link
Member Author

thockin commented Apr 17, 2017 via email

@caesarxuchao
Copy link
Member

If you have github.com/foobar in your own GOPATH, and then you do a
godep restore which includes that same package at a different rev it
can fail in a dozen different ways.

godep restore fails in such an environment regardless of the staging folder. Currently hack/update-staging-client.sh and hack/update-staging-godeps.sh requires running godep restore. I target to eliminate the need for update-staging-client.sh this quarter. For update-staging-godeps.sh, I think @sttts once had a version of that script that operates in a temporary space, we can add it back as another alternative to running hack/godep-restore.sh, if it's easy.

In general, i think we should focus on eliminating the staging folder, instead of building more tools around it.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants