Skip to content

do not merge: rebase 1.6.1 #13875

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

Closed
ncdc wants to merge 147 commits into from
Closed

do not merge: rebase 1.6.1 #13875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
972cdda
hack/godep-*.sh: bump godep to v79
sttts Apr 6, 2017
617d52b
hack/godep-*.sh: symlink staging dirs
sttts Mar 16, 2017
d0ac600
hack/godep-*.sh: workaround godep dependency issues
sttts Apr 18, 2017
62ca6c2
hack/copy-kube-artifacts.sh: add staging/*** for proto files
sttts Apr 12, 2017
dcd425c
bump(*): Kubernetes 1.6.1
sttts Apr 19, 2017
2aa53c3
UPSTREAM: coreos/etcd: <carry>: vendor grpc v1.0.4 locally
Mar 21, 2017
ee338c0
UPSTREAM: docker/distribution: <carry>: Update dependencies
legionus Sep 8, 2016
aa622dd
UPSTREAM: docker/distribution: <carry>: custom routes/auth
May 8, 2015
92f8417
UPSTREAM: docker/distribution: 1757: Export storage.CreateOptions in …
Jul 6, 2016
315243b
UPSTREAM: docker/distribution: 1857: Provide stat descriptor for Crea…
liggitt Jul 20, 2016
0502376
UPSTREAM: docker/distribution: 2008: Honor X-Forwarded-Port and Forwa…
Nov 7, 2016
9aeb31f
UPSTREAM: revert: bedff43594597764076a13c17b30a5fa28c4ea76: docker/do…
Dec 22, 2016
ab93fa9
UPSTREAM: coreos/go-systemd: 190: util: conditionally build CGO funct…
Dec 12, 2016
70d547f
UPSTREAM: opencontainers/runc: 1216: Fix thread safety of SelinuxEnab…
pmorie Dec 9, 2016
2108772
UPSTREAM: docker/distribution: 2140: Add 'ca-central-1' region for re…
mfojtik Jan 11, 2017
f483ee3
UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions
Jan 24, 2017
a931f93
UPSTREAM: google/cadvisor: 1639: Reduce cAdvisor log spam with multip…
derekwaynecarr Apr 12, 2017
d6e3ede
Fix hack scripts on Mac
sttts Mar 13, 2017
989fbec
Rewrites
Mar 9, 2017
caf39a8
adapt: event broadcasters
sttts Apr 3, 2017
d8cc00d
apigroups: remove meta kinds
sttts Apr 4, 2017
76b32df
apigroups: adapt to new 1.6 style
sttts Mar 13, 2017
8501c17
apigroups: remove double registration of meta types for internal vers…
sttts Mar 13, 2017
3cd3fe5
adapt: upstream store.CompleteWithOptions instead of ApplyOptions
Mar 15, 2017
0ad99e0
adapt: match upstream discovery type changes
sttts Mar 13, 2017
0a94b63
adapt: pkg/api/kubegraph/analysis.FindHPASpecsMissingCPUTargets
sttts Mar 13, 2017
2c1c8d0
REVIEW TODOs: adapt: pkg/cmd/cli/describe printer updates
Mar 14, 2017
0b941a9
REVIEW: adapt: pkg/cmd/util/clientcmd
Mar 14, 2017
9120236
adapt: pass client to admission plugins via WantsInternalKubeClientSet
sttts Mar 15, 2017
68305d8
adapt: use InternalListWatch shim to translate ListOptions
sttts Apr 3, 2017
da96551
adapt: v1 secrets
sttts Apr 3, 2017
6d50497
adapt: shims around auth registries for pointer List/GetOptions
sttts Apr 3, 2017
c5aaca0
adapt: add GetOptions to non-generated client
sttts Apr 3, 2017
80a045e
adapt: upstream informers/listers for clusterquotamapping controller
Mar 15, 2017
d5a6d4c
remove: legacy kube informers
Mar 15, 2017
4fc1055
remove: old clientsets
sttts Apr 20, 2017
0ee9ec3
remove: old api/protobuf-spec files
sttts Apr 20, 2017
41caf0d
add: internal kube informers in origin shared informer factory (neede…
Mar 15, 2017
c23a847
adapt: request timeout and image pull progress deadline for docker.Ge…
Mar 16, 2017
68136cc
adapt: f.PrinterForCommand instead of versioned printer
Mar 16, 2017
ca920ae
REVIEW: use version that handles internal api objects to determine ef…
Mar 16, 2017
46c5605
REVIEW: adapt: remove OutputVersion helper calls in pkg/cmd/cli/cmd
Mar 16, 2017
f769d55
adapt: stop using a ShortcutExpander in OverwriteBootstrapPolicy
Mar 16, 2017
dd13b53
adapt: pkg/deploy informers
sttts Mar 17, 2017
fbb019b
REVIEW: adapt: wrap controller manager AddFlags with our controller list
Mar 17, 2017
ab4a774
adapt: pkg/dns: replace kendpoints.PodHostnamesAnnotation with proper…
Mar 17, 2017
edee42e
adapt: use SCC lister from kube in pkg/security
Mar 22, 2017
a810c43
fix-test: misc unit tests
sttts Mar 16, 2017
9949f95
fix-test: update HPA test example versions after extensions/v1beta1 i…
sttts Mar 14, 2017
c13df7d
add-test: legacy apigroup case for hpa test
sttts Mar 23, 2017
6da14ec
fix-test: fuzzer panic in pkg/api/serialization_test
sttts Mar 14, 2017
9b5b34b
fix-test: upstream roundtrip framework in pkg/api/serialization_test
sttts Mar 15, 2017
9c7d2fc
fix-test: add SchedulerName and TerminationMessage* to container fixt…
sttts Mar 15, 2017
440932b
update: pkg/cmd/util/clientcmd security related restclient.Config fields
sttts Mar 20, 2017
e6a4e83
update: pkg/cmd/util/clientcmd generator list
sttts Mar 20, 2017
c781332
adapt: pkg/cmd/util new upstream batch and hpa apigroups
sttts Mar 20, 2017
3d1a52a
adapt: match pkg/quota/image upstream refactors
Mar 17, 2017
d6c2ae7
adapt: match pkg/quota to upstream refactors
Mar 20, 2017
24fa4c7
adapt: match pkg/sdn upstream refactors
Mar 20, 2017
c626e0b
pkg/sdn/plugin: use upstream ConstructPodPortMapping
ncdc Apr 19, 2017
75af792
adapt: pkg/cmd/cli/cmd/rollout signature fixes
Mar 20, 2017
23651f1
REVIEW: adapt: pkg/cmd/cli/cmd/set printer changes
Mar 20, 2017
23e7339
fix: add 'oc auth', fix apply args
Mar 20, 2017
2b92753
REVIEW: update: known kube apigroup versions in pkg/cmd/server/api
sttts Mar 20, 2017
8720cd7
move: split pkg/cmd/server/kubernetes into master and node
sttts Mar 21, 2017
d406e3c
REVIEW: initial 1.6 port of master setup
sttts Mar 21, 2017
2a2ee4d
adapt: internal+external clients in controllers
sttts Mar 22, 2017
ffd9da9
fix: start controllers in background and informers after controller init
Mar 25, 2017
1e424b5
REVIEW: refactoring: merge storage factory code paths
sttts Mar 22, 2017
c46cc26
add: new deployment cohabitation
sttts Mar 22, 2017
c590831
REVIEW: adapt: convert proxy & dns to shared informers
Mar 22, 2017
caca020
fix-test: update list of admission controllers that are off by default
Mar 22, 2017
6c10716
Enforce etcd2 storage backend
sttts Mar 23, 2017
e58de0e
update: bootstrap policy
Mar 24, 2017
05f9d0a
fix: do not install Docker image types, only register
sttts Mar 27, 2017
d9ed680
fix-test: update expected index in TestRootRedirect
sttts Mar 27, 2017
d8beece
fix-test: non-existing extensions/v1beta1 in TestExtensionsAPIDisable…
sttts Mar 28, 2017
c1a1b02
add: test cases in TestClusterResourceOverridePluginWithNoLimits
Mar 27, 2017
de163d4
REVIEW: fix: write versioned AdmissionConfiguration for admission plu…
sttts Mar 27, 2017
a599e9f
add: pkg/kubecompat/apis/extensions/v1beta1 to restore HPA in extensi…
Mar 29, 2017
4da07b1
fix: install all kube apis and kubecompat
Mar 29, 2017
127ef69
add: disabled etcd3 testing code and liveness check
Mar 29, 2017
0db9f9b
REVIEW: update: etcd_storage_path_test.go, with unfinished etcd3 support
Mar 29, 2017
7512969
fix: panic on nil field/label selectors in router ListWatchers
Mar 29, 2017
adc4fbf
fix-test: add watch request param support to router http mock
Mar 30, 2017
a1db0b9
fix-test: switch storage extensions/v1beta1 migration test from jobs …
Mar 30, 2017
12d646f
fix: wait logic in WaitForServiceAccounts
Mar 30, 2017
d23b867
add: teach deployment HPA describer about new HPA
DirectXMan12 Mar 30, 2017
0b84f8c
fix: openapi generation script with staging dirs
Mar 23, 2017
6db2626
adapt: match upstream pkg/proxy refactors
Apr 4, 2017
fdc919f
fix-test: add DockerShimSocket to NodeConfig to run int tests as non-…
Mar 31, 2017
34d309b
fix-test: add DockerShim root dir to NodeConfig to run int tests as n…
ncdc Apr 11, 2017
0b0f42e
hack/build-{go,images}: include gcs+oss build tags as in build-cross.sh
sttts Apr 10, 2017
c0e6aef
fix-test: avoid 'tput: invalid terminal' in core.sh in test-cmd.sh
sttts Apr 10, 2017
02a52af
fix-test: ignore terminating registry pods in test-cmd.sh
Apr 7, 2017
9afb7af
fix: grammar in error string
sttts Apr 10, 2017
ff94a87
fix: versioned objects in 'oc set env' by default
ncdc Apr 10, 2017
d877604
fix-test: adapt to Jobs removed from extensions
ncdc Apr 10, 2017
dab295a
fix-test: update extended test exclude list
sttts Apr 11, 2017
9cf845a
fix: DefaultClientConfig: use kube cluster defaults, which fallback t…
ncdc Apr 11, 2017
e6d2396
fix-test: node_auth_test needs to include ?output=1 for exec and atta…
ncdc Apr 12, 2017
f32d9bc
fix: return Build, not Status in build webhook New()
sttts Apr 13, 2017
6d9792e
fix-test: wait until server is healthy (and therefore rbac post start…
sttts Apr 13, 2017
bfd9aa6
fix: workaround kube issue 44448 for buildconfiginstantiate
ncdc Apr 13, 2017
dc1655e
adapt: use external kube client for events
Apr 3, 2017
63f42c4
fix: buildpod controller
sttts Apr 19, 2017
e866d12
rewrites: compile fixes for unit tests
sttts Apr 19, 2017
4f3f99e
fix-test: use semantic equality in roundtrip tests like upstream
sttts Apr 19, 2017
3dc605a
fix: do not build before update in Makefile
sttts Apr 20, 2017
e1fabc6
fix: same eof newline on Mac and Linux
sttts Apr 20, 2017
99478ed
Default CNI conf/bin dirs correctly
ncdc Apr 20, 2017
b9cfa59
squash: storage test
sttts Apr 21, 2017
d478277
Run make-update
sttts Apr 20, 2017
db1e738
UPSTREAM: <drop>: Run make-update – vendor/ changes
sttts Apr 20, 2017
052747f
squash: double import routercontroller
sttts Apr 21, 2017
1e62d27
squash: InternalIsServiceAccountToken
sttts Apr 21, 2017
7c9dcbd
squash: pkg/client/buildconfigs.go namespaces
sttts Apr 21, 2017
02dc009
squash: remove cm default TODO
sttts Apr 21, 2017
de56d36
squash: serialization test: c.Rand.Int()
sttts Apr 21, 2017
575ec75
squash: move Origin/UpstreamObjects into testclient
sttts Apr 21, 2017
c45042a
squash: ServerName in AnonymousClientConfig
sttts Apr 21, 2017
e6c46b1
squash: do not allow rbac v1alpha1
sttts Apr 21, 2017
22bb22b
squash: oc idle: marshal versioned objects
DirectXMan12 Apr 20, 2017
4b833fb
Remove "vendored" userspace proxy
DirectXMan12 Apr 21, 2017
3af1856
Fix ObjectRefernce type in unidler proxy signaler
DirectXMan12 Apr 21, 2017
033ec55
squash: only install request header client CAs once
sttts Apr 21, 2017
7c887e6
Run make-update
sttts Apr 21, 2017
25a52da
hack/godep-save.sh: run godep-save twice to install test dependencies
sttts Apr 22, 2017
ef761b0
UPSTREAM: 44861: NotRegisteredErr for known kinds not registered in t…
sttts Apr 23, 2017
e2e0836
fix: be fatal on DNS informer error and fix init order
sttts Apr 24, 2017
1de9037
fix-test: replace cakephp-mysql-{example -> persistent} in templatese…
sttts Apr 24, 2017
a3850a6
fix-test: correct type cast in PodSucceeded for dns extended test
sttts Apr 24, 2017
876ecfa
UPSTREAM: 44859: e2e: handle nil ReplicaSet in checkDeploymentRevision
sttts Apr 24, 2017
9555b2a
squash: update deployment controller permissions
deads2k Apr 24, 2017
741b8fc
UPSTREAM: <carry>: add OpenShift resources to garbage collector ignor…
ncdc Apr 24, 2017
4356d60
Enable garbage collector controller
ncdc Apr 24, 2017
2665e99
squash: allow statefulset controller to PATCH pods for ownerRef/adoption
ncdc Apr 24, 2017
51835d2
squash: allow daemonset controller to PATCH pods for ownerRef/adoption
ncdc Apr 24, 2017
181f8ab
fix-test: Wait for openshift/ruby:latest ImageStreamTag before runnin…
ncdc Apr 24, 2017
7e54313
fix-test: extended deploymentconfig test issues
ncdc Apr 24, 2017
375452c
fix-test: 'oc get builds' in extended build test
ncdc Apr 24, 2017
621aed7
separate quota evaluation for admission versus reconciliation
deads2k Apr 25, 2017
8d7e313
Merge pull request #94 from deads2k/rebase-02
sttts Apr 25, 2017
967465d
fix-test: TestOriginQuotaAdmissionIsErrorQuotaExceeded
sttts Apr 25, 2017
d56f49a
squash: allow project admin/edit/view access to apps.k8s.io deployments
ncdc Apr 25, 2017
a4b5b88
squash: PrintResourceInfos: remove rogue premature return from loop
ncdc Apr 25, 2017
cc5ebd4
fix test: allow daemon set, stateful set e2e tests to schedule to all…
ncdc Apr 25, 2017
File filter

Filter by extension

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.
7,135 changes: 4,247 additions & 2,888 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ verify-commits:
#
# Example:
# make update
update: build
update:
hack/update-generated-bindata.sh
hack/update-generated-deep-copies.sh
hack/update-generated-conversions.sh
Expand Down
60 changes: 31 additions & 29 deletions api/protobuf-spec/github_com_openshift_origin_pkg_authorization_api_v1.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading