-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Rebase 1.6.1 #13653
Merged
Merged
Rebase 1.6.1 #13653
Changes from all commits
Commits
Show all changes
153 commits
Select commit
Hold shift + click to select a range
2e01e1d
hack/godep-*.sh: bump godep to v79
sttts 5e9e4e6
hack/godep-*.sh: symlink staging dirs
sttts f2bc08f
hack/godep-*.sh: workaround godep dependency issues
sttts d03f5c0
hack/godep-save.sh: run godep-save twice to install test dependencies
sttts 058549a
hack/copy-kube-artifacts.sh: add staging/*** for proto files
sttts e8d67d3
bump(*): Kubernetes 1.6.1
sttts 516f993
UPSTREAM: coreos/etcd: <carry>: vendor grpc v1.0.4 locally
4f7e8d9
UPSTREAM: docker/distribution: <carry>: Update dependencies
legionus 824c72c
UPSTREAM: docker/distribution: <carry>: custom routes/auth
da86b54
UPSTREAM: docker/distribution: 1757: Export storage.CreateOptions in …
cbb2835
UPSTREAM: docker/distribution: 1857: Provide stat descriptor for Crea…
liggitt b84d460
UPSTREAM: docker/distribution: 2008: Honor X-Forwarded-Port and Forwa…
37659ce
UPSTREAM: revert: bedff43594597764076a13c17b30a5fa28c4ea76: docker/do…
3f107e2
UPSTREAM: coreos/go-systemd: 190: util: conditionally build CGO funct…
e4a729d
UPSTREAM: opencontainers/runc: 1216: Fix thread safety of SelinuxEnab…
pmorie b48624d
UPSTREAM: docker/distribution: 2140: Add 'ca-central-1' region for re…
mfojtik dea3174
UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions
e60b9b3
UPSTREAM: google/cadvisor: 1639: Reduce cAdvisor log spam with multip…
derekwaynecarr 3adf4d3
UPSTREAM: <drop>: Run make-update – vendor/ changes
sttts 6b12679
UPSTREAM: 44861: NotRegisteredErr for known kinds not registered in t…
sttts e51a861
UPSTREAM: 44859: e2e: handle nil ReplicaSet in checkDeploymentRevision
sttts 62d77ec
UPSTREAM: <carry>: add OpenShift resources to garbage collector ignor…
ncdc 91525e7
UPSTREAM: 44570: Explicit namespace from kubeconfig should override i…
deads2k e5fa689
UPSTREAM: 44221: validateClusterInfo: use clientcmdapi.NewCluster()
deads2k 3c064ff
UPSTREAM: <carry>: openapi test, patch in updated package name
deads2k 566b41b
UPSTREAM: 00000: make AsVersionedObjects default cleanly
deads2k 5cac278
Fix hack scripts on Mac
sttts a71e6f1
Rewrites
f6ee951
adapt: event broadcasters
sttts 862a684
apigroups: remove meta kinds
sttts 64ffa5e
apigroups: adapt to new 1.6 style
sttts dc0f528
apigroups: remove double registration of meta types for internal vers…
sttts 4af7eb5
adapt: upstream store.CompleteWithOptions instead of ApplyOptions
9e134eb
adapt: match upstream discovery type changes
sttts 68565a4
adapt: pkg/api/kubegraph/analysis.FindHPASpecsMissingCPUTargets
sttts 9e869a5
REVIEW TODOs: adapt: pkg/cmd/cli/describe printer updates
17a3408
REVIEW: adapt: pkg/cmd/util/clientcmd
7e7b596
adapt: pass client to admission plugins via WantsInternalKubeClientSet
sttts 32ccb4b
adapt: use InternalListWatch shim to translate ListOptions
sttts 5ac6046
adapt: v1 secrets
sttts 2202525
adapt: shims around auth registries for pointer List/GetOptions
sttts 57d7235
adapt: add GetOptions to non-generated client
sttts cae34ba
adapt: upstream informers/listers for clusterquotamapping controller
fbed6d9
remove: legacy kube informers
d935def
remove: old clientsets
sttts 00ebc04
remove: old api/protobuf-spec files
sttts 723edb2
add: internal kube informers in origin shared informer factory (neede…
febdaf0
adapt: request timeout and image pull progress deadline for docker.Ge…
e9de337
adapt: f.PrinterForCommand instead of versioned printer
d7db2f2
REVIEW: use version that handles internal api objects to determine ef…
3b8f41a
REVIEW: adapt: remove OutputVersion helper calls in pkg/cmd/cli/cmd
34472b5
adapt: stop using a ShortcutExpander in OverwriteBootstrapPolicy
360cb58
adapt: pkg/deploy informers
sttts 672fce3
REVIEW: adapt: wrap controller manager AddFlags with our controller list
a33c2a4
adapt: pkg/dns: replace kendpoints.PodHostnamesAnnotation with proper…
a853490
adapt: use SCC lister from kube in pkg/security
89b4a84
fix-test: misc unit tests
sttts 1033474
fix-test: update HPA test example versions after extensions/v1beta1 i…
sttts cafc092
add-test: legacy apigroup case for hpa test
sttts b722e5e
fix-test: fuzzer panic in pkg/api/serialization_test
sttts dcc288e
fix-test: upstream roundtrip framework in pkg/api/serialization_test
sttts fb3c87b
fix-test: add SchedulerName and TerminationMessage* to container fixt…
sttts c833ff0
update: pkg/cmd/util/clientcmd security related restclient.Config fields
sttts 447b9a2
update: pkg/cmd/util/clientcmd generator list
sttts ff4c9d8
adapt: pkg/cmd/util new upstream batch and hpa apigroups
sttts e9c135e
adapt: match pkg/quota/image upstream refactors
0ab3656
adapt: match pkg/quota to upstream refactors
8911c57
adapt: match pkg/sdn upstream refactors
d2d012c
pkg/sdn/plugin: use upstream ConstructPodPortMapping
ncdc 90f3fa3
adapt: pkg/cmd/cli/cmd/rollout signature fixes
fd94350
REVIEW: adapt: pkg/cmd/cli/cmd/set printer changes
5daa8de
fix: add 'oc auth', fix apply args
c4a0735
REVIEW: update: known kube apigroup versions in pkg/cmd/server/api
sttts 29dc705
move: split pkg/cmd/server/kubernetes into master and node
sttts 47d3923
REVIEW: initial 1.6 port of master setup
sttts cf5b55c
adapt: internal+external clients in controllers
sttts 36ea264
fix: start controllers in background and informers after controller init
b5c285d
REVIEW: refactoring: merge storage factory code paths
sttts 8ccb82d
add: new deployment cohabitation
sttts f8bea7a
REVIEW: adapt: convert proxy & dns to shared informers
dfa568e
fix-test: update list of admission controllers that are off by default
3ddaf28
Enforce etcd2 storage backend
sttts 1d129eb
update: bootstrap policy
f34c5f3
fix: do not install Docker image types, only register
sttts ed67807
fix-test: update expected index in TestRootRedirect
sttts 5b26155
fix-test: non-existing extensions/v1beta1 in TestExtensionsAPIDisable…
sttts 2c22556
add: test cases in TestClusterResourceOverridePluginWithNoLimits
a64a2f1
REVIEW: fix: write versioned AdmissionConfiguration for admission plu…
sttts e57b368
add: pkg/kubecompat/apis/extensions/v1beta1 to restore HPA in extensi…
c63a5a0
fix: install all kube apis and kubecompat
791011d
add: disabled etcd3 testing code and liveness check
01213ff
REVIEW: update: etcd_storage_path_test.go, with unfinished etcd3 support
9f856ca
fix: panic on nil field/label selectors in router ListWatchers
ddc3d31
fix-test: add watch request param support to router http mock
c0c79cc
fix-test: switch storage extensions/v1beta1 migration test from jobs …
a7e643f
fix: wait logic in WaitForServiceAccounts
1130358
add: teach deployment HPA describer about new HPA
DirectXMan12 e490411
fix: openapi generation script with staging dirs
bd5ed9c
adapt: match upstream pkg/proxy refactors
7e430e4
fix-test: add DockerShimSocket to NodeConfig to run int tests as non-…
abd3a06
fix-test: add DockerShim root dir to NodeConfig to run int tests as n…
ncdc 3910fc3
hack/build-{go,images}: include gcs+oss build tags as in build-cross.sh
sttts 7eaccac
fix-test: avoid 'tput: invalid terminal' in core.sh in test-cmd.sh
sttts a1055d0
fix-test: ignore terminating registry pods in test-cmd.sh
50721b9
fix: grammar in error string
sttts 743a31d
fix: versioned objects in 'oc set env' by default
ncdc f451440
fix-test: adapt to Jobs removed from extensions
ncdc 6764438
fix-test: update extended test exclude list
sttts 8fd75a7
fix: DefaultClientConfig: use kube cluster defaults, which fallback t…
ncdc 178ffb5
fix-test: node_auth_test needs to include ?output=1 for exec and atta…
ncdc 4883ed8
fix: return Build, not Status in build webhook New()
sttts 98e8593
fix-test: wait until server is healthy (and therefore rbac post start…
sttts 3f576ef
fix: workaround kube issue 44448 for buildconfiginstantiate
ncdc 5bfb8f2
adapt: use external kube client for events
b7f810e
fix: buildpod controller
sttts 7575fcc
rewrites: compile fixes for unit tests
sttts c7a5124
fix-test: use semantic equality in roundtrip tests like upstream
sttts 5558a68
fix: do not build before update in Makefile
sttts 579f02e
fix: same eof newline on Mac and Linux
sttts 3068df0
Default CNI conf/bin dirs correctly
ncdc 35b0c46
fix: oc idle: marshal versioned objects
DirectXMan12 7529a34
Remove "vendored" userspace proxy
DirectXMan12 9bce621
Fix ObjectRefernce type in unidler proxy signaler
DirectXMan12 5ea7661
fix: be fatal on DNS informer error and fix init order
sttts 7c0cf51
fix-test: replace cakephp-mysql-{example -> persistent} in templatese…
sttts efd4c15
fix-test: correct type cast in PodSucceeded for dns extended test
sttts c506f16
Enable garbage collector controller
ncdc 4629f84
fix-test: Wait for openshift/ruby:latest ImageStreamTag before runnin…
ncdc 69e3e66
fix-test: extended deploymentconfig test issues
ncdc 738ad14
fix-test: 'oc get builds' in extended build test
ncdc 4e4e4be
fix-test: test-cmd.sh
deads2k fa0029e
fix: appliedclusterresourcequota to be a getter again
deads2k 2402efd
fix test: allow daemon set, stateful set e2e tests to schedule to all…
ncdc fadff0d
fix-test: add GC user to globalDeploymentConfigGetterUsers
sttts d0318ee
fix-test: GC user in TestOldLocalResourceAccessReviewEndpoint
sttts 6cd98c0
UPSTREAM: opencontainers/runc: 1124: Ignore error when starting trans…
derekwaynecarr 0956c44
fix: deployment generator for external version
deads2k 3f31ce7
Allow a large burst for discovery to reduce oc latency
deads2k d12e175
fix: decoder for set env
deads2k 0c95885
fix: switch scc review to external objects
deads2k 5e225a8
test-fix: run staging tests through vendor
sttts 08b1008
skip RBAC resources for oadm migrate because of permission problems
deads2k e3d0b8d
TO REVERT: fix SAR serialization
deads2k b1f47c2
sqash: fix sdn after rebase
sttts 6de4382
UPSTREAM: <drop>: disable apiserver loopback loop in generic context
sttts 1e84b6f
hack/godep-save.sh: add kube version check and fail early
sttts b8742b0
fix: clientconfig again, match master
deads2k bebb7ed
fix-test: hpa.{extensions -> autoscaling} in policy cmd test
sttts 75ee23b
fix: build type changes
deads2k 89d93e4
Disable cgroups-per-qos in dind
danwinship f4528e2
squash: pods PATCH permission for rc controller
sttts dc20aea
UPSTREAM: 44730: Check for terminating Pod prior to launching success…
sttts 0d6b11a
Run make-update
sttts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
63 changes: 34 additions & 29 deletions
63
api/protobuf-spec/github_com_openshift_origin_pkg_authorization_api_v1.proto
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
30 changes: 16 additions & 14 deletions
30
api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because compilation often depends on generated files. For verify it's ok, but updating should be possible without having a buildable state.