Skip to content

kube rebase 4c8e6f47ec23f390978e651232b375f5f9cde3c7 #5143

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
Merged
openshift-bot merged 35 commits into from
Oct 19, 2015
Merged

kube rebase 4c8e6f47ec23f390978e651232b375f5f9cde3c7 #5143

openshift-bot merged 35 commits into from
Oct 19, 2015

Conversation

@deads2k
Copy link
Contributor

@deads2k deads2k commented Oct 15, 2015

Wall of Shame

  1. Allowing ActiveDeadlineSeconds to be updated for a pod kubernetes/kubernetes#8890 Carried since May. @abhgupta
  2. UPSTREAM: 15451 : Add our types to kubectl get error`. Points to issue, not pull. @smarterclayton

Followups

  1. UPSTREAM: <carry>: Disable --validate by default is incorrect. It should only change our wrapped methods, not the originals. [post-rebase] disabling --validate is too broad #5235
  2. make test/cmd/admin.sh "not present in output" tests check only the expected field [post-rebase] make test/cmd/admin.sh "not present in output" tests check only the expected field #5236
  3. UPSTREAM: <drop>: make test pass with old codec is bad. We need to find the client codec priority issue in the test. [post-rebase] remove UPSTREAM: <drop>: make test pass with old codec #5237
  4. UPSTREAM: <drop>: tweak generator to handle conversions in other packages shouldn't be necessary with AssumePrivateConversions. Figure out why it's needed. [post-rebase] conversion generator is broken #5238
  5. Inspect or add policy objects for username and groupname fields. [post-rebase] Inspect or add policy objects for username and groupname fields. #5239
  6. disable kubectl apply annotation - disable apply #5215
  7. improve whitespace-sensitive test in pkg/template/template_test.go

Upstreams

8009272 bump(k8s.io/kubernetes): 4c8e6f4

  • f6339fb UPSTREAM: 14871: Additional service ports config for master service.
  • d08ef63 UPSTREAM: 13978 <drop>: NodePort option: Allowing for apiservers behind load-balanced endpoint.
  • 01d1674 Merge pull request UPSTREAM: <drop>: disable oidc tests #5066 from liggitt/oidc
  • 9d6ca5f UPSTREAM: 15224: Refactor SSH tunneling, fix proxy transport TLS/Dial extraction
  • 11da1ba UPSTREAM: 15224: Allow specifying scheme when proxying
  • 1e9f6d6 UPSTREAM: 14889: Honor InsecureSkipVerify flag
  • 9f4f667 UPSTREAM: 14967: Add util to set transport defaults
  • 7b91814 UPSTREAM:<carry>:hostPid/hostIPC scc support
  • 3c30627 UPSTREAM:14279:IPC followup
  • cad1f33 UPSTREAM:<carry>:v1beta3 hostIPC
  • d897b86 UPSTREAM:12470:Support containers with host ipc in a pod
  • f9a83e8 UPSTREAM:<carry>:v1beta3 hostPID
  • a09f832 UPSTREAM:13447:Allow sharing the host PID namespace
  • 4edc0a8 UPSTREAM: <drop>: disable oidc tests
  • 50cd2b5 UPSTREAM: 15451 <partial>: Add our types to kubectl get error
  • c8e788e UPSTREAM: 14616: Controller framework test flake fix
  • 8d5eaad UPSTREAM:<carry>:introduce scc types for fsgroup and supplemental groups
  • 23c806f UPSTREAM: 15232`: refactor logs to be composeable
  • 7b5c9b4 UPSTREAM: 14700: Add authentication/authorization interfaces to kubelet, always include /metrics with /stats
  • adeee41 UPSTREAM: 14134: sets.String#Intersection
  • 80af0fa UPSTREAM: 15101: Add bearer token support for kubelet client config
  • c7d78ac UPSTREAM: 14710: Add verb to authorizer attributes
  • 27eb127 UPSTREAM: 13885: Cherry pick base64 and websocket patches
  • 993c343 UPSTREAM: 14967: Add util to set transport defaults
  • 7a74027 UPSTREAM: 14246: Fix race in lifecycle admission test
  • 805fdeb UPSTREAM: 13885: Update error message in wsstream for go 1.5
  • 9e5509d UPSTREAM: go-ldap: add String for debugging
  • 3d82530 UPSTREAM: 14451: Fix a race in pod backoff.
  • c42a09b UPSTREAM: Fix typo in e2e pods test
  • e7fcd0a UPSTREAM: 13885: Support websockets on exec and pod logs
  • 8581567 UPSTREAM: 14985: fix patch for anonymous struct fields
  • 71a8282 UPSTREAM: 14831: allow yaml as argument to patch
  • bf07f09 UPSTREAM: 14688: Deflake max in flight
  • 6af361c UPSTREAM: openshift-sdn: 167: plugins: Update Kube client imports
  • 0e3685c UPSTREAM: <carry>: Move to test pkg to avoid linking test flags in binaries
  • fb01469 UPSTREAM: <carry>: Add etcd prefix
  • dc0b3cd UPSTREAM: 14664: fix testclient prepend
  • 002518a UPSTREAM: 14502: don't fatal on missing sorting flag
  • a60a5d0 UPSTREAM: <drop>: hack experimental versions and client creation
  • eb0572b UPSTREAM: 14496: deep-copies: Structs cannot be nil
  • f76ab1b UPSTREAM: <carry>: Back n forth downward/metadata conversions
  • 6b121ab UPSTREAM: 13728: Allow to replace os.Exit() with panic when CLI command fatal
  • 458b142 UPSTREAM: 14291: add patch verb to APIRequestInfo
  • 2faddfd UPSTREAM: 13910: Fix resourcVersion = 0 in cacher
  • e09fc78 UPSTREAM: 13864: Fix kubelet logs --follow bug
  • cb0f03a UPSTREAM: 14063: enable system CAs
  • 52df494 UPSTREAM: 13756: expose: Avoid selector resolution if a selector is not needed
  • da9a0f1 UPSTREAM: 13746: Fix field=metadata.name
  • 16831f0 UPSTREAM: 9870: Allow Volume Plugins to be configurable
  • a4707df UPSTREAM: 11827: allow permissive SA secret ref limitting
  • aca78c7 UPSTREAM: 12221: Allow custom namespace creation in e2e framework
  • d301d12 UPSTREAM: 12498: Re-add timeouts for kubelet which is not in the upstream PR.
  • 7c21c3c UPSTREAM: 9009: Retry service account update when adding token reference
  • a9f620f UPSTREAM: 9844: EmptyDir volume SELinux support
  • 853df0b UPSTREAM: 7893: scc allocation interface methods
  • 2f0e0cb UPSTREAM: 7893: scc CONFLICT
  • b3221ce UPSTREAM: 8890: Allowing ActiveDeadlineSeconds to be updated for a pod
  • b44d6ff UPSTREAM: <drop>: add back flag types to reduce noise during this rebase
  • ccd6cf7 UPSTREAM: <none>: Hack date-time format on *util.Time
  • 7b782e9 UPSTREAM: <none>: Suppress aggressive output of warning
  • 62e7141 UPSTREAM: <carry>: Disable --validate by default
  • b90ca87 UPSTREAM: <carry>: update describer for dockercfg secrets
  • 40ed395 UPSTREAM: <carry>: reallow the ability to post across namespaces in api
  • 5b0e502 UPSTREAM: <carry>: support pointing oc exec to old openshift server
  • 61ed729 UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data CONFLICT
  • 3b5c612 UPSTREAM: <carry>: Allow pod start to be delayed in Kubelet CONFLICT
  • 455e584 UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
  • 1ee0bb8 UPSTREAM: <carry>: v1beta3 CONFLICT

2009660 bump(k8s.io/kubernetes) 86b4e77

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

@pweil- review UPSTREAM: 7893: scc There were several conflicts.

@pweil-
Copy link

pweil- commented Oct 15, 2015

@pweil- review UPSTREAM: 7893: scc There were several conflicts.

Types/conversions/copies lgtm which is where I suspect the conflicts arose since most of the rest was a straight add.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

@soltysh checkout out the conflicts and changes to the carries required to handle the change to api/unversioned.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

@smarterclayton please review CLAYTON REVIEW: webhook change I made it fit what I think the interfaces should be. please confirm.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

@pweil- I want to collapse all scc pulls into a single carry. Is there a reason not to do that?

@liggitt
Copy link
Contributor

liggitt commented Oct 15, 2015

Is there a reason not to do that?

I thought you and @smarterclayton were in a commit race...

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

I thought you and @smarterclayton were in a commit race...

I would gladly trade all my commits to never look at a rebase again!

@pweil-
Copy link

pweil- commented Oct 15, 2015

@pweil- I want to collapse all scc pulls into a single carry. Is there a reason not to do that?

nope, other than the provider pieces not compiling right away due to dependent api changes that are carried

@soltysh soltysh mentioned this pull request Oct 15, 2015
Closed
@smarterclayton
Copy link
Contributor

smarterclayton commented Oct 15, 2015

Those changes are ok, you probably want to cherry pick smarterclayton@99ee790 instead

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

COMPILING! Got the rebase compiling, though I'm short one patch, so I have commit to revert and fix up the last two packages.

@soltysh Can you start getting the kube unit tests passing? I haven't picked all the patches yet, but what we have should pass the tests.

@soltysh
Copy link
Contributor

soltysh commented Oct 15, 2015

@deads2k will start with that in the morning

@deads2k
Copy link
Contributor Author

deads2k commented Oct 15, 2015

@deads2k will start with that in the morning

Thanks. Fixing imports and all for the origin unit tests to compile (they won't run successfully yet) would be helpful too. I'll do the picks myself to keep up with my lists and track how badly all the changes conflict for requesting reviews.

@soltysh
Copy link
Contributor

soltysh commented Oct 16, 2015

@deads2k here are my efforts deads2k#18

@deads2k
Copy link
Contributor Author

deads2k commented Oct 16, 2015

@ironcladlou checkout the "DANMACE REVIEW" commit and let me know.

@smarterclayton
Copy link
Contributor

smarterclayton commented Oct 16, 2015

It's not an obvious fix, so carry it.

On Oct 16, 2015, at 10:10 AM, David Eads notifications@github.com wrote:

Wall of Shame

Followups

  • UPSTREAM: : Disable --validate by default is incorrect. It
    should only change our wrapped methods, not the originals.

Upstreams

8009272
8009272
bump(k8s.io/kubernetes): 4c8e6f4

2009660
2009660

bump(k8s.io/kubernetes) 86b4e77

You can view, comment on, or merge this pull request online at:

#5143
Commit Summary

  • cleanup files that should be dead
  • removed godeps
  • bump(github.com/prometheus/client_golang):
    3b78d7a77f51ccbc364d4bc170920153022cfd08
  • bump(github.com/coreos/go-etcd):
    de3514f25635bbfb024fdaf2a8d5f67378492675
  • bump(github.com/fsouza/go-dockerclient):
    1399676f53e6ccf46e0bf00751b21bed329bc60e
  • bump(github.com/ghodss/yaml): 73d445a93680fa1a78ae23a5839bad48f32ba1ee
  • fix godep.json parsing
  • bump(k8s.io/kubernetes): 4c8e6f4
  • UPSTREAM: : v1beta3
  • UPSTREAM: : Disable UIs for Kubernetes and etcd
  • UPSTREAM: : Allow pod start to be delayed in Kubelet
  • UPSTREAM: 7893: scc
  • UPSTREAM: : Add deprecated fields to migrate 1.0.0 k8s v1 data
  • UPSTREAM: 7893: scc allocation interface methods
  • UPSTREAM::hostPid/hostIPC scc support
  • UPSTREAM: 11827: allow permissive SA secret ref limitting
  • UPSTREAM: : add back flag types to reduce noise during this
    rebase
  • UPSTREAM: openshift-sdn(TODO): handle refactor api/unversioned
  • UPSTREAM: openshift-sdn(TODO): update for iptables.New call
  • UPSTREAM: openshift-sdn(todo): handle list changes
  • UPSTREAM: TODO: expose ResyncPeriod function
  • UPSTREAM: : helper methods paralleling old latest fields
  • UPSTREAM: logs-pull
  • IMPORTANT RESTMAPPER CHANGE
  • INTERESTING DO THESE HURT BACKWARDS COMPATIBILITY
  • handle refactors to api/unversioned
  • CLAYTON REVIEW: webhook change
  • generic etcd changes
  • remove fake factory
  • UNSURE: proxy update
  • DANMACE REVIEW: dc scaler refactor
  • PWEIL SCC: review
  • IMPORTANT Codec change
  • adding controller resync periods
  • codec stuff
  • storage update
  • help unit tests compile

File Changes

Patch Links:

—
Reply to this email directly or view it on GitHub
#5143.

@ironcladlou
Copy link
Contributor

ironcladlou commented Oct 16, 2015

deads2k@00ffd6b LGTM

@deads2k
Copy link
Contributor Author

deads2k commented Oct 16, 2015

I hit a serious snag: kubernetes/kubernetes#15781 . I'm going to see if I can work around it without reverting, but we make extensive use of shortnames.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 16, 2015

test-cmd.sh passes.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 16, 2015

test-integration.sh passes

@deads2k
Copy link
Contributor Author

deads2k commented Oct 16, 2015

test-go.sh runs for origin (haven't tested KUBE yet)

@deads2k deads2k force-pushed the rebase branch 3 times, most recently from f574d4f to b0e703e Compare October 16, 2015 20:13
@deads2k deads2k changed the title [WIP] [NOT READY FOR REVIEW] kube rebase 4c8e6f47ec23f390978e651232b375f5f9cde3c7 [WIP] kube rebase 4c8e6f47ec23f390978e651232b375f5f9cde3c7 Oct 16, 2015
@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

existsDedicatedConversionFunction hasn't changed since our last rebase... should we be using AssumePrivateConversions?

We already set it: https://github.com/openshift/origin/blob/master/cmd/genconversion/conversion.go#L46. I'll add a followup to figure out why we needed to do it.

@liggitt
Copy link
Contributor

liggitt commented Oct 19, 2015

we're getting generated conversions when we already registered our own in subpackages. For example:
autoconvert_api_ClusterPolicy_To_v1_ClusterPolicy (in pkg/api/v1/conversion_generated.go)
convert_api_ClusterPolicy_To_v1_ClusterPolicy (in pkg/authorization/api/v1/conversion.go)

Hopefully fuzzing and hand-written tests are ensuring we're using our non-generated conversions

edit: this is scary... it means an autogenerated conversion chain can prevent a custom conversion function from being called... there are now lots of latent autoconvert_* functions, which, if called, would be incorrect. Yay fuzz tests?

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

we're getting generated conversions when we already registered our own in subpackages. For example:
autoconvert_api_ClusterPolicy_To_v1_ClusterPolicy (in pkg/api/v1/conversion_generated.go)
convert_api_ClusterPolicy_To_v1_ClusterPolicy (in pkg/authorization/api/v1/conversion.go)

Hopefully fuzzing and hand-written tests are ensuring we're using our non-generated conversions

With the introduction of Subjects the critical fields will roundtrip server side. If the conversions fail, we'll break old clients, but not break policy. Added a followup.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

re[test]

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 19, 2015

Evaluated for origin test up to 1eb472b

@liggitt
Copy link
Contributor

liggitt commented Oct 19, 2015

LGTM, add follow up to remove apply annotation

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

one second... I wanted to track down why our objects had the apply annotation on them

Knowledge only makes you sad

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

green.

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

[vipmerge]!

@deads2k
Copy link
Contributor Author

deads2k commented Oct 19, 2015

https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5939

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 19, 2015

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5939/) (Image: devenv-fedora_2496)

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 19, 2015

Evaluated for origin vipmerge up to 1eb472b

openshift-bot pushed a commit that referenced this pull request Oct 19, 2015
Merge pull request #5143 from deads2k/rebase
bccc1d3 
Merged by openshift-bot
@openshift-bot openshift-bot merged commit bccc1d3 into openshift:master Oct 19, 2015
@ironcladlou ironcladlou mentioned this pull request Oct 19, 2015
Closed
@liggitt liggitt mentioned this pull request Oct 19, 2015
Closed
@smarterclayton
Copy link
Contributor

smarterclayton commented Oct 20, 2015

After this I'm unable to generate v1beta3 conversions

E1019 22:32:00.198986   48797 conversion.go:54] error while generating conversion functions for v1beta3.OAuthClientAuthorization: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199007   48797 conversion.go:54] error while generating conversion functions for v1beta3.IsPersonalSubjectAccessReview: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199021   48797 conversion.go:54] error while generating conversion functions for v1beta3.OAuthClientList: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199031   48797 conversion.go:54] error while generating conversion functions for v1beta3.BuildConfigList: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199057   48797 conversion.go:54] error while generating conversion functions for v1beta3.Identity: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199067   48797 conversion.go:54] error while generating conversion functions for v1beta3.Group: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199076   48797 conversion.go:54] error while generating conversion functions for v1beta3.ClusterRole: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta
E1019 22:32:00.199187   48797 conversion.go:54] error while generating conversion functions for v1beta3.OAuthAuthorizeTokenList: errors: multiple possible convertibles for unversioned.TypeMeta, multiple possible convertibles for unversioned.TypeMeta

@smarterclayton
Copy link
Contributor

smarterclayton commented Oct 20, 2015

Generate creates an incorrect mapping.

@smarterclayton
Copy link
Contributor

smarterclayton commented Oct 20, 2015

Nevermind, this happens if you have kapi.TypeMeta instead of unversioned.TypeMeta. Remember that though...

@0xmichalis
Copy link
Contributor

0xmichalis commented Oct 20, 2015

@deads2k did you remove the fake factory? I was using it in a couple of tests that still haven't merged...

@deads2k
Copy link
Contributor Author

deads2k commented Oct 20, 2015

@deads2k did you remove the fake factory? I was using it in a couple of tests that still haven't merged...

Yeah, it was dead and had several conflicts that weren't worth fixing for code dead code. Sorry.

@deads2k deads2k mentioned this pull request Oct 20, 2015
Closed
@deads2k deads2k deleted the rebase branch October 21, 2015 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@deads2k @pweil- @liggitt @smarterclayton @soltysh @ironcladlou @openshift-bot @0xmichalis @mfojtik