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

A few changes to federated-service e2e test. #27972

Merged
merged 1 commit into from
Jun 24, 2016

Conversation

mml
Copy link
Contributor

@mml mml commented Jun 23, 2016

Most of the changes that get the test to pass have been made already or
elsewhere. Here we restructure a bit fixing a nesting problem, extend the
timeouts, and start creating distinct backend pods that I'll delete in the
non-local test (coming shortly).

Also some extra debugging info in the DNS code. I made some upstream
changes to skydns in skynetservices/skydns#283

For #27739

Includes a commit from @madhusudancs that I will remove once his merges.

@mml mml assigned ghost Jun 23, 2016
@mml mml added this to the v1.3 milestone Jun 23, 2016
@mml mml added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. labels Jun 23, 2016
@nikhiljindal
Copy link
Contributor

The DNS changes here are just code readability changes and no functional change, right @mml ?

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 23, 2016
@mml
Copy link
Contributor Author

mml commented Jun 23, 2016

and debug logs, but no functionality.

Expect(clSvc.Name).To(Equal(service.Name))
// Some fields are expected to be different, so make them the same before checking equality.
clSvc.Spec.ClusterIP = service.Spec.ClusterIP
clSvc.Spec.ExternalIPs = service.Spec.ExternalIPs
clSvc.Spec.DeprecatedPublicIPs = service.Spec.DeprecatedPublicIPs
clSvc.Spec.LoadBalancerIP = service.Spec.LoadBalancerIP
clSvc.Spec.LoadBalancerSourceRanges = service.Spec.LoadBalancerSourceRanges
for i := range clSvc.Spec.Ports {
Copy link

Choose a reason for hiding this comment

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

minor nit: Prefer "for i, port := ....". Then you can just use "port.NodePort below.

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 actually doesn't work, as port is a value type and ends up being a copy of the object and your changes get lost.

I'll add a comment explaining this, as I banged my head against it for quite awhile.

Copy link

Choose a reason for hiding this comment

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

Doh! Of course you're right :-)

@ghost
Copy link

ghost commented Jun 23, 2016

Thanks @mml. Only nits, which can be addressed in a followup PR if you prefer.

@ghost ghost added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 23, 2016
@ghost
Copy link

ghost commented Jun 23, 2016

PS: Feel free to remove the LGTM label to avoid auto-merge if you prefer to address the nits in this PR.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2016
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 23, 2016
@ghost ghost added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 23, 2016
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2016
@mml mml force-pushed the fed-backend2 branch 3 times, most recently from bb0fafa to c33d929 Compare June 23, 2016 23:07
@mml
Copy link
Contributor Author

mml commented Jun 23, 2016

I managed to drop some changes during my git antics, but I think it is in good shape now.

if _, ok := kd.federations[path[2]]; ok {
return true
if len(path) != 4+len(kd.domainPath) {
glog.Infof("len(%q) != 4+len(%q)", path, kd.domainPath)
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be better to move these glog.Infos to glog.V(2).Info.

@mml mml removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 23, 2016
@mml mml added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2016
Most of the changes that get the test to pass have been made already or
elsewhere.  Here we restructure a bit fixing a nesting problem, extend
the timeouts, and start creating distinct backend pods that I'll delete
in the non-local test (coming shortly).

Also some extra debugging info in the DNS code.  I made some upstream
changes to skydns in skynetservices/skydns#283
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2016
@ghost ghost added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2016
@ghost
Copy link

ghost commented Jun 24, 2016

"Jenkins GKE Smoke Test" is something I've not seen before. It seems to be borked. @lavalamp ?

@k8s-bot test this issue: #IGNORE

+ gsutil -mq cp -r gs://cloud-sdk-testing/ci/staging /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke
AccessDeniedException: 403 Forbidden
CommandException: 1 file/object could not be transferred.
+ sleep 1
+ rm -rf /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/.gsutil
+ for n in '$(seq 3)'
+ gsutil -mq cp -r gs://cloud-sdk-testing/ci/staging /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke
AccessDeniedException: 403 Forbidden
CommandException: 1 file/object could not be transferred.
+ sleep 1
+ rm -rf /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/.gsutil
+ for n in '$(seq 3)'
+ gsutil -mq cp -r gs://cloud-sdk-testing/ci/staging /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke
AccessDeniedException: 403 Forbidden
CommandException: 1 file/object could not be transferred.
+ sleep 1
+ rm -rf /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/.gsutil
+ rm -rf /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/repo /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/cloudsdk
++ basename gs://cloud-sdk-testing/ci/staging
+ mv /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/staging /var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/repo
mv: cannot stat `/var/lib/jenkins/workspace/kubernetes-pull-build-test-e2e-gke/staging': No such file or directory
+ rc=1
+ [[ 1 -ne 0 ]]
+ [[ -x cluster/log-dump.sh ]]
+ [[ -d _artifacts ]]
+ [[ 1 -eq 124 ]]
+ [[ 1 -eq 137 ]]
+ [[ 1 -ne 0 ]]
+ echo 'Build failed'
Build failed
+ echo 'Exiting with code: 1'
Exiting with code: 1
+ exit 1

@k8s-bot
Copy link

k8s-bot commented Jun 24, 2016

GCE e2e build/test passed for commit e2021ef.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 24, 2016

GCE e2e build/test passed for commit e2021ef.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit bc1c1c1 into kubernetes:master Jun 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants