Stable 20160411 #17
Merged
Stable 20160411 #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
:100644 100644 b0173c3... dd5ab81... M pkg/master/master.go
Contains: 228fdbafb823998761ca4e66bc83e3097363c9a6 UPSTREAM: <carry>: Back n forth downward/metadata conversions af27d7a2cdacab952ea3898aecbfa99474a5ca76 UPSTREAM: <carry>: Back n forth downward/metadata conversions :100644 100644 c8d0d0a... e3a0abc... M pkg/api/v1/conversion.go :100644 100644 59bdda0... 9414806... M pkg/api/v1/conversion_generated.go :000000 100644 0000000... a833f0e... A pkg/api/v1/conversion_volumesource_test.go :100644 100644 c11aab0... 36fe129... M pkg/api/v1/deep_copy_generated.go :100644 100644 72983b9... f29ad72... M pkg/api/v1/types.go :100644 100644 1d7da2a... 0b8ff92... M pkg/apis/extensions/v1beta1/conversion.go :100644 100644 82ebd87... fdb34f1... M pkg/apis/extensions/v1beta1/conversion_generated.go :100644 100644 171bde8... 7ee820f... M pkg/apis/extensions/v1beta1/deep_copy_generated.go
UPSTREAM: <carry>: scc integration for PSC UPSTREAM: <carry>: default fsgroup/supgroup strategies to RunAsAny UPSTREAM: <carry>: scc priority field UPSTREAM: <carry>: scc capability defaulting UPSTREAM: <carry>: Fixup SCC capabilities validation :100644 100644 604a2e1... bc43631... M pkg/api/deep_copy_generated.go :100644 100644 43e78f3... a1fc556... M pkg/api/install/install.go :100644 100644 ed3e38c... dc504c7... M pkg/api/meta/restmapper.go :100644 100644 a949be2... af68f42... M pkg/api/register.go :100644 100644 8fa1065... bc3fbbe... M pkg/api/testing/fuzzer.go :100644 100644 292458f... 3fcf0c6... M pkg/api/types.go :100644 100644 71e4b1f... 7d4cb07... M pkg/api/v1/conversion_generated.go :100644 100644 4d44fa9... 23ca6a1... M pkg/api/v1/deep_copy_generated.go :100644 100644 dd27a91... 5065067... M pkg/api/v1/defaults.go :100644 100644 a84381a... 4ab23e0... M pkg/api/v1/defaults_test.go :100644 100644 db45926... f06eefa... M pkg/api/v1/register.go :100644 100644 eceb268... 70114cf... M pkg/api/v1/types.go :100644 100644 1d69055... 1df1e2e... M pkg/api/validation/validation.go :100644 100644 03d5f8f... bde252b... M pkg/api/validation/validation_test.go :100644 100644 e4b2d4c... b347639... M pkg/client/unversioned/client.go :000000 100644 0000000... f60740d... A pkg/client/unversioned/securitycontextconstraints.go :000000 100644 0000000... 378d727... A pkg/client/unversioned/securitycontextconstraints_test.go :000000 100644 0000000... e199f1c... A pkg/client/unversioned/testclient/fake_securitycontextconstraints.go :100644 100644 ebbc600... f365e0f... M pkg/client/unversioned/testclient/testclient.go :100644 100644 6ecb4d2... f01d1f8... M pkg/kubectl/kubectl.go :100644 100644 4b2d819... bf0fc5c... M pkg/kubectl/resource_printer.go :100644 100644 dd5ab81... 78f3ba0... M pkg/master/master.go :000000 100644 0000000... 1b5bf6a... A pkg/registry/securitycontextconstraints/doc.go :000000 100644 0000000... fa66a52... A pkg/registry/securitycontextconstraints/etcd/etcd.go :000000 100644 0000000... 9bb7173... A pkg/registry/securitycontextconstraints/etcd/etcd_test.go :000000 100644 0000000... 8069e18... A pkg/registry/securitycontextconstraints/registry.go :000000 100644 0000000... 593f4ad... A pkg/registry/securitycontextconstraints/strategy.go :100644 100644 e90f396... 03e0116... M pkg/registry/service/allocator/bitmap.go :000000 100644 0000000... 51152c1... A pkg/securitycontextconstraints/capabilities/mustrunas.go :000000 100644 0000000... 9898f45... A pkg/securitycontextconstraints/capabilities/mustrunas_test.go :000000 100644 0000000... 2bcd66a... A pkg/securitycontextconstraints/capabilities/types.go :000000 100644 0000000... 13ffbd0... A pkg/securitycontextconstraints/group/mustrunas.go :000000 100644 0000000... f84e612... A pkg/securitycontextconstraints/group/mustrunas_test.go :000000 100644 0000000... 1d3b625... A pkg/securitycontextconstraints/group/runasany.go :000000 100644 0000000... 6e924e7... A pkg/securitycontextconstraints/group/runasany_test.go :000000 100644 0000000... cf84149... A pkg/securitycontextconstraints/group/types.go :000000 100644 0000000... 813c0aa... A pkg/securitycontextconstraints/provider.go :000000 100644 0000000... 145e76b... A pkg/securitycontextconstraints/provider_test.go :000000 100644 0000000... 63be576... A pkg/securitycontextconstraints/selinux/doc.go :000000 100644 0000000... 51ee4e2... A pkg/securitycontextconstraints/selinux/mustrunas.go :000000 100644 0000000... 085cf6e... A pkg/securitycontextconstraints/selinux/mustrunas_test.go :000000 100644 0000000... 37fbed0... A pkg/securitycontextconstraints/selinux/runasany.go :000000 100644 0000000... 56b8694... A pkg/securitycontextconstraints/selinux/runasany_test.go :000000 100644 0000000... 61a56c5... A pkg/securitycontextconstraints/selinux/types.go :000000 100644 0000000... 4fe4ee2... A pkg/securitycontextconstraints/types.go :000000 100644 0000000... a3ce474... A pkg/securitycontextconstraints/user/doc.go :000000 100644 0000000... 7b84115... A pkg/securitycontextconstraints/user/mustrunas.go :000000 100644 0000000... 26f53b7... A pkg/securitycontextconstraints/user/mustrunas_test.go :000000 100644 0000000... e4977f7... A pkg/securitycontextconstraints/user/mustrunasrange.go :000000 100644 0000000... 870710e... A pkg/securitycontextconstraints/user/nonroot.go :000000 100644 0000000... 4ca637d... A pkg/securitycontextconstraints/user/nonroot_test.go :000000 100644 0000000... 6c60232... A pkg/securitycontextconstraints/user/runasany.go :000000 100644 0000000... b13ae29... A pkg/securitycontextconstraints/user/runasany_test.go :000000 100644 0000000... d99fd3e... A pkg/securitycontextconstraints/user/types.go :000000 100644 0000000... e723b9d... A pkg/securitycontextconstraints/user/util.go UPSTREAM: <carry>: update generated client code for SCC :100644 100644 c811903... e28e4fa... M pkg/client/typed/generated/core/unversioned/core_client.go :100644 100644 afc6cf6... 08323b0... M pkg/client/typed/generated/core/unversioned/fake/fake_core_client.go :000000 100644 00000000.. 5c37e34... A pkg/client/typed/generated/core/unversioned/fake/fake_securitycontextconstraints.go :000000 100644 00000000.. 6549ede... A pkg/client/typed/generated/core/unversioned/securitycontextconstraints.go UPSTREAM: <carry>: add scc describer :100644 100644 db10d8c... 8e048a5... M pkg/kubectl/describe.go :100644 100644 43420fa... 0df1342... M pkg/kubectl/describe_test.go UPSTREAM: revert: 7d1b481: <carry>: scc This reverts commit 7d1b481afcfa4aecd7669f345c491893fdd286dd. Drop an additional allowEmptyDirVolumes SCC reference in swagger docs. :100644 100644 dcc61b9... 50084eb... M pkg/api/deep_copy_generated.go :100644 100644 b111650... 5c7133f... M pkg/api/types.go :100644 100644 21c35ea... 72339e6... M pkg/api/v1/conversion_generated.go :100644 100644 6175784... 10ea09a... M pkg/api/v1/deep_copy_generated.go :100644 100644 578df2d... a8bc652... M pkg/api/v1/defaults.go :100644 100644 8c09605... 6e97409... M pkg/api/v1/defaults_test.go :100644 100644 5560e59... e724b70... M pkg/api/v1/types.go :100644 100644 4d8dc95... ba03f7e... M pkg/api/v1/types_swagger_doc_generated.go :100644 100644 8e6ae95... 8af62ac... M pkg/kubectl/resource_printer.go :100644 100644 aafeae5... 813c0aa... M pkg/securitycontextconstraints/provider.go :100644 100644 75793dd... 145e76b... M pkg/securitycontextconstraints/provider_test.go UPSTREAM: <carry>: SCC - fix casting errors in case of obj nil :100644 100644 e199f1c... 0d50d7e... M pkg/client/unversioned/testclient/fake_securitycontextconstraints.go fixup UPSTREAM: <carry>: SCC - generated client, fixup test
:100644 100644 411f770... c8d0d0a... M pkg/api/v1/conversion.go :100644 100644 7d4cb07... 59bdda0... M pkg/api/v1/conversion_generated.go :100644 100644 23ca6a1... c11aab0... M pkg/api/v1/deep_copy_generated.go :100644 100644 5065067... dfa3578... M pkg/api/v1/defaults.go :100644 100644 70114cf... 72983b9... M pkg/api/v1/types.go :100644 100644 e92b0a2... 171bde8... M pkg/apis/extensions/v1beta1/deep_copy_generated.go fixup UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data - move conversion to non-generated function
:100644 100644 a9b6b37... 2328ffc... M pkg/apiserver/api_installer.go
:100644 100644 af19945... 0617165... M pkg/kubectl/describe.go
Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go :100644 100644 eef0235... bf46a2d... M pkg/kubectl/cmd/exec.go :100644 100644 942a1c5... 52570ac... M pkg/kubectl/cmd/portforward.go
Contains previous commits: - UPSTREAM: <carry>: Update v1beta3 - UPSTREAM: 15053<carry>: Conversions for v1beta3 - UPSTREAM: <carry>: v1beta3 scc integration for PSC - UPSTREAM: <carry>: respect fuzzing defaults for v1beta3 SecurityContext - UPSTREAM: <carry>: Update v1beta3 PodLogOptions - UPSTREAM: <carry>: v1beta3 scc priority field - UPSTREAM: <carry>: v1beta3 default fsgroup/supgroup strategies to RunAsAny - UPSTREAM: <carry>: scc v1beta3 capability defaulting :100644 100644 a1fc556... 74fde3c... M pkg/api/install/install.go :100644 100644 6040c54... e00a441... M pkg/api/registered/registered.go :100644 100644 bc3fbbe... f7f0265... M pkg/api/testing/fuzzer.go :000000 100644 0000000... f8f22b4... A pkg/api/v1beta3/conversion.go :000000 100644 0000000... 7b2c004... A pkg/api/v1beta3/conversion_generated.go :000000 100644 0000000... a4c3aab... A pkg/api/v1beta3/conversion_test.go :000000 100644 0000000... 02393ad... A pkg/api/v1beta3/conversion_volumesource_test.go :000000 100644 0000000... ea050d5... A pkg/api/v1beta3/deep_copy_generated.go :000000 100644 0000000... 1689b35... A pkg/api/v1beta3/defaults.go :000000 100644 0000000... 6396549... A pkg/api/v1beta3/defaults_test.go :000000 100644 0000000... f7620a8... A pkg/api/v1beta3/register.go :000000 100644 0000000... 784ee45... A pkg/api/v1beta3/types.go :100644 100644 ac0121d... 182f2e4... M pkg/client/unversioned/request.go :100644 100644 e74e238... fcb9232... M pkg/kubectl/cmd/rollingupdate.go CHANGES v1beta3 typemeta usage UPSTREAM: revert: 902e416: <carry>: v1beta3 scc This reverts commit 902e4168787f2734cf4324881eb5f89e0d5c1e75. :100644 100644 e34476f... 486c7c4... M pkg/api/v1beta3/conversion_generated.go :100644 100644 3bd7323... cc0d540... M pkg/api/v1beta3/deep_copy_generated.go :100644 100644 d81bace... cf8cf86... M pkg/api/v1beta3/defaults.go :100644 100644 15fb596... 9c5f998... M pkg/api/v1beta3/defaults_test.go :100644 100644 839ee1f... d018994... M pkg/api/v1beta3/types.go
:100644 100644 c561ddb... 17ef5df... M pkg/kubelet/server.go
:100644 100644 e2c1032... ec56d39... M pkg/controller/node/nodecontroller.go
…vider Previously, if the kubelet tried to register itself with the API server, and was rejected due to the external ID changing, it would delete the node object and recreate it. This commit causes it to tolerate a change in ExternalID when the ExternalID is not being provided by a cloud provider, assuming the new ExternalID is either the node's (metadata) name, or one of node's addresses. :100644 100644 0c4fdc1... 8deaa82... M pkg/kubelet/kubelet.go
… setting Reverts behavior change made in k8s PR 18089 Carry until k8s issue 20090 is resolved and provides a way to opt out of clusterDNS-only behavior This was changed in k8s PR 18089 :100644 100644 4bf134f... d5a3e7a... M pkg/kubelet/kubelet.go :100644 100644 9a353a0... 01e82f0... M pkg/kubelet/kubelet_test.go
:100644 100644 09efd08... bff6f6f... M pkg/kubectl/cmd/cmd.go
:100644 100644 6d70224... 9d90773... M pkg/runtime/conversion_generator.go
:100644 100644 0c9a10b... c95889a... M pkg/client/restclient/request.go
…egacy API group :100644 100644 c2be65f... 6db1406... M pkg/genericapiserver/genericapiserver.go
:100644 100644 ac7025a... dce57e1... M pkg/apimachinery/registered/registered.go
:100644 100644 02f9f2d... 06dc1c0... M pkg/kubelet/image_manager_test.go
…til we drop it :100644 100644 b15ec5b... 879905c... M pkg/storage/etcd/util/etcd_util.go
In order to get stable generation, we need extensions to be registered after api (otherwise Go 1.4 and Go 1.5 load them in different order). :100644 100644 4e1477d... 623c7b4... M pkg/apis/extensions/install/install.go
…ntainer setting for readonlyrootfs :100644 100644 9bd5b16... de6a16d... M pkg/securitycontext/provider.go
|
origin pull merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now against the correct branch