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.

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

DO NOT MERGE - For review only #11

Closed
wants to merge 30 commits into from
Closed

DO NOT MERGE - For review only #11

wants to merge 30 commits into from

Conversation

liggitt
Copy link

@liggitt liggitt commented Mar 10, 2016

Contains the carries and unmerged upstream picks from https://github.com/openshift/kubernetes/commits/stable-20160309

in addition to commits already merged upstream, I dropped:

  • 1101efb UPSTREAM: <carry>: allow specific, skewed group/versions - replaced by 21909 upstream
  • 2cc150c UPSTREAM: <carry>: Keep default generator for run 'run-pod/v1' - will replace with oc-specific overrides
  • 055d8ec UPSTREAM: 12221: Allow custom namespace creation in e2e framework - replaced by 20808 upstream, @soltysh, can you confirm that does what we need?
  • 4267088 UPSTREAM: 20157: Test specific generators for kubectl - not needed if kubectl run behaves like upstream
  • b03a73a UPSTREAM: <carry>: enable daemonsets by default - replaced by 21130 upstream
  • b59c3ea remove most of the latest package; it should go away completely - @deads2k looks like this was vestigial debug bits
  • da636b2 UPSTREAM: <drop>: update generated code, swagger, and api docs after rebase - replaced with 83a3410097c982e4bae02429de00ab88aafdd0b0
  • e4d9fb6 UPSTREAM: 20706: register internal types with scheme for reference unit test - @deads2k this was causing a panic in unit tests, I'll revisit when I get into origin

@deads2k, please verify these three commits were satisfied by merges upstream:

  • ad2626dda3353613bea33878c5b61df0e52f4811 UPSTREAM: 20968: make partial resource detection work for singular matches
  • cec8803fc79f942613aaf444bdbae811f0167bb3 UPSTREAM: 20829: Union rest mapper - superceded by 21272 upstream
  • ef2037ac27a7fd2da8a4a9d805bbf3679360d482 UPSTREAM: 20814: type RESTMapper errors to better handle MultiRESTMapper errors

to review:

  • d49dd0c fixes up the SCC generated client and deep copies, so the generation scripts can be used again - @pweil- PTAL
  • aad3a21 moves the hand-written conversion out of the generated file and updates generated conversions/copies

liggitt and others added 3 commits March 9, 2016 20:33
@liggitt
UPSTREAM: <carry>: remove types.generated.go
42a491f
@deads2k @liggitt
UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
57d405a 
:100644 100644 b0173c3... dd5ab81... M	pkg/master/master.go
@deads2k @liggitt
UPSTREAM: <carry>: SCC
05d78d5 
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
@liggitt liggitt mentioned this pull request Mar 10, 2016
Closed
liggitt and others added 26 commits March 9, 2016 23:26
@liggitt
fixup UPSTREAM: <carry>: SCC - generated client, fixup test
d49dd0c
@liggitt
UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data
5ee68b7 
: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
@liggitt
fixup UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v…
aad3a21 
…1 data - move conversion to non-generated function
@pweil- @liggitt
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
7dc2d9b 
:100644 100644 a9b6b37... 2328ffc... M	pkg/apiserver/api_installer.go
@deads2k @liggitt
UPSTREAM: <carry>: update describer for dockercfg secrets
afd8ae8 
:100644 100644 af19945... 0617165... M	pkg/kubectl/describe.go
@deads2k @liggitt
UPSTREAM: <carry>: Back n forth downward/metadata conversions
d78e1af 
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
@deads2k @liggitt
UPSTREAM: <carry>: support pointing oc exec to old openshift server
d98b4cd 
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
@deads2k @liggitt
UPSTREAM: <carry>: v1beta3
42a0e95 
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
@soltysh @liggitt
UPSTREAM: <carry>: add kubelet timeouts
fa07068 
:100644 100644 c561ddb... 17ef5df... M	pkg/kubelet/server.go
@smarterclayton @liggitt
UPSTREAM: <carry>: OpenShift 3.0.2 nodes report v1.1.0-alpha
dbcf483 
:100644 100644 e2c1032... ec56d39... M	pkg/controller/node/nodecontroller.go
@DirectXMan12 @liggitt
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
8f5ef87 
…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
@soltysh @liggitt
UPSTREAM: <carry>: allow hostDNS to be included along with ClusterDNS…
3f8d764 
… 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
@smarterclayton @liggitt
UPSTREAM: <carry>: Add our types to kubectl get error
4a0dd3c 
:100644 100644 09efd08... bff6f6f... M	pkg/kubectl/cmd/cmd.go
@liggitt
UPSTREAM: 16964: Preserve int64 data when patching
75516cf
@fabianofranz @liggitt
UPSTREAM: 17590: correct homedir on windows
ee3f06d 
:100644 100644 42f1210... a3cebc7... M	pkg/client/unversioned/clientcmd/loader.go
@feihujiang @liggitt
UPSTREAM: 16146: Fix validate event for non-namespaced kinds
eedf4e9
@deads2k @liggitt
UPSTREAM: <drop>: patch for 16146: Fix validate event for non-namespa…
88ff8ba 
…ced kinds

:100644 100644 21a3c2f... ffd2e2d... M	pkg/api/validation/events.go
@deads2k @liggitt
UPSTREAM: <drop>: patch for 16146: Fix validate event for non-namespa…
d778ed9 
…ced kinds

:100644 100644 ffd2e2d... eadaf07... M	pkg/api/validation/events.go
:100644 100644 0c4870b... 277ed47... M	pkg/api/validation/events_test.go
@deads2k @liggitt
UPSTREAM: <drop>: merge multiple registrations for the same group
623932e 
:100644 100644 ac7025a... dce57e1... M	pkg/apimachinery/registered/registered.go
@deads2k @liggitt
UPSTREAM: <carry>: horrible hack for intstr types
9f02484 
:100644 100644 6d70224... 9d90773... M	pkg/runtime/conversion_generator.go
@deads2k @liggitt
UPSTREAM: <drop>: disable kubelet image GC unit test
9dc1961 
:100644 100644 02f9f2d... 06dc1c0... M	pkg/kubelet/image_manager_test.go
@deads2k @liggitt
UPSTREAM: <drop>: make etcd error determination support old client un…
af0c781 
…til we drop it

:100644 100644 b15ec5b... 879905c... M	pkg/storage/etcd/util/etcd_util.go
@smarterclayton @liggitt
UPSTREAM: 20847: Force a dependency order between extensions and api
526dda8 
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
@pweil- @liggitt
UPSTREAM: <drop>: change BeforeEach to JustBeforeEach to ensure SA is…
1990fbe 
… granted to anyuid SCC

Drop once we get custom namespace creation in place

:100644 100644 3daeeac... 569e551... M	test/e2e/kubectl.go
@smarterclayton @liggitt
UPSTREAM: 21624: improve terminal reuse and attach
b2a195e 
:100644 100644 22f1ddb... f97badd... M	pkg/kubectl/cmd/attach.go
:100644 100644 7fc4b7f... c94c4c4... M	pkg/kubectl/cmd/attach_test.go
:100644 100644 369d41d... f29935b... M	pkg/kubectl/cmd/logs.go
:100644 100644 caa8670... a4216e8... M	pkg/kubectl/cmd/logs_test.go
:100644 100644 f77f8e1... 1c58d84... M	pkg/kubectl/cmd/util/editor/editor.go
:100644 000000 9db85fe... 00000000.. D	pkg/kubectl/cmd/util/editor/term.go
:100644 000000 4c0b788... 00000000.. D	pkg/kubectl/cmd/util/editor/term_unsupported.go
:000000 100644 00000000.. f156530... A	pkg/util/interrupt/child.go
:000000 100644 00000000.. 35de11a... A	pkg/util/interrupt/child_linux.go
:000000 100644 00000000.. 72e3e32... A	pkg/util/interrupt/interrupt.go
:000000 100644 00000000.. bd41391... A	pkg/util/term/term.go
@smarterclayton @liggitt
UPSTREAM: <carry>: Increase test etcd request timeout to 30s
a29d982 
EBS on AWS can pause for 5-25s unless every block on disk has been
written to. The IO latency causes fsync to take > default etcd http
timeout, which causes operations on startup to fail. Since tests cannot
tolerate real world conditions, increase the testing timeout.

:100644 100644 7dc65b6... e0cf8a0... M	pkg/storage/etcd/testing/utils.go
@deads2k
Copy link

deads2k commented Mar 10, 2016

b59c3ea remove most of the latest package; it should go away completely - @deads2k looks like this was vestigial debug bits

agreed

@deads2k
Copy link

deads2k commented Mar 10, 2016

e4d9fb6 UPSTREAM: 20706: register internal types with scheme for reference unit test - @deads2k this was causing a panic in unit tests, I'll revisit when I get into origin

You'll need this or something in origin.

@deads2k
Copy link

deads2k commented Mar 10, 2016

@deads2k, please verify these three commits were satisfied by merges upstream:

fine to remove.

@soltysh
Copy link
Member

soltysh commented Mar 10, 2016

055d8ec UPSTREAM: 12221: Allow custom namespace creation in e2e framework - replaced by 20808 upstream, @soltysh, can you confirm that does what we need?

Confirmed.

@liggitt
Copy link
Author

liggitt commented Mar 10, 2016

Pushed as https://github.com/openshift/kubernetes/commits/release-1.2-stable-20160309
Based on https://github.com/openshift/kubernetes/commits/release-1.2

@liggitt liggitt closed this Mar 10, 2016
@liggitt liggitt deleted the rebase-20160309 branch August 22, 2016 01:01
deads2k pushed a commit that referenced this pull request Dec 1, 2017
@rite2nikhil
code-review- add logs and comments (#11)
408f739 
add logs and comments & fix getMasterNode
jupierce added a commit that referenced this pull request Apr 4, 2024
@jupierce
Merge pull request #11 from kyrtapz/cve_4.15
c1f5b34 
[release-4.15] Address CVE
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.

None yet
8 participants
@liggitt @deads2k @soltysh @pweil- @smarterclayton @DirectXMan12 @fabianofranz @feihujiang