Code

rebase to kube 1.7 on master#15234

Code

Merged

liggitt merged 87 commits intoopenshift:masteropenshift/origin:masterfrom deads2k:rebase-02-0717deads2k/origin:rebase-02-0717Copy head branch name to clipboardJul 19, 2017

+636,543-224,345

Commits

Commits on Jul 18, 2017

• UPSTREAM: <drop>: revert up to 43e60df UPSTREAM: 48884: Do not mutate pods on update

  Show description for 6fd9d4b
  deads2k

  committed
  6fd9d4b

  Copy full SHA for 6fd9d4b

• update godeps.json to run bump checkers

  deads2k

  committed
  e628e98

  Copy full SHA for e628e98

• bump(github.com/openshift/source-to-image): 7da3d3e97565e652a59fd81286f3956fd43e85a8

  

  Jim Minter

  authored and

  deads2k

  committed
  247b6de

  Copy full SHA for 247b6de

• use revamped source-to-image git url parser

  

  Jim Minter

  authored and

  deads2k

  committed
  9a95fd6

  Copy full SHA for 9a95fd6

• bump(k8s.io/kubernetes): 695b5616baa050ac185abdddb3c750205a08a19b

  deads2k

  committed
  75bcc76

  Copy full SHA for 75bcc76

• UPSTREAM: <drop>: squash to bump, copy

  deads2k

  committed
  9009938

  Copy full SHA for 9009938

• UPSTREAM: <drop>: generated updates

  deads2k

  committed
  68ad47c

  Copy full SHA for 68ad47c

• BREAK logstash formatting

  deads2k

  committed
  3369a33

  Copy full SHA for 3369a33

• UPSTREAM: docker/distribution: <carry>: custom routes/auth

  Show description for 014397a
  

  Andy Goldstein

  authored and

  deads2k

  committed
  014397a

  Copy full SHA for 014397a

• UPSTREAM: docker/distribution: 1757: Export storage.CreateOptions in top-level package

  Show description for ed1938b
  

  Michal Minář

  authored and

  deads2k

  committed
  ed1938b

  Copy full SHA for ed1938b

• UPSTREAM: docker/distribution: 1857: Provide stat descriptor for Create method during cross-repo mount

  

  liggitt

  authored and

  deads2k

  committed
  8d02a78

  Copy full SHA for 8d02a78

• UPSTREAM: docker/distribution: <carry>: Update dependencies

  Show description for bd943df
  

  legionus

  authored and

  deads2k

  committed
  bd943df

  Copy full SHA for bd943df

• UPSTREAM: docker/distribution: 2008: Honor X-Forwarded-Port and Forwarded headers

  Show description for 0f97650
  

  Michal Minář

  authored and

  deads2k

  committed
  0f97650

  Copy full SHA for 0f97650

• UPSTREAM: opencontainers/runc: 1216: Fix thread safety of SelinuxEnabled and getSelinuxMountPoint

  

  pmorie

  authored and

  deads2k

  committed
  697bc6e

  Copy full SHA for 697bc6e

• UPSTREAM: docker/distribution: 2140: Add 'ca-central-1' region for registry S3 storage driver

  Show description for 944add6
  

  mfojtik

  authored and

  deads2k

  committed
  944add6

  Copy full SHA for 944add6

• UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions

  Show description for e2393fb
  

  Andy Goldstein

  authored and

  deads2k

  committed
  e2393fb

  Copy full SHA for e2393fb

• UPSTREAM: coreos/etcd: <carry>: vendor grpc v1.0.4 locally

  

  Andy Goldstein

  authored and

  deads2k

  committed
  275284b

  Copy full SHA for 275284b

• UPSTREAM: 45894: Export BaseControllerRefManager

  deads2k

  committed
  c8e6a6b

  Copy full SHA for c8e6a6b

• UPSTREAM: <carry>: allow to use * as a capability in Security Context Constraints.

  

  php-coder

  authored and

  deads2k

  committed
  6de0322

  Copy full SHA for 6de0322

• UPSTREAM: <drop>: regenerated openapi because it's not commited

  deads2k

  committed
  0be1dee

  Copy full SHA for 0be1dee

• UPSTREAM: <drop>: keep old pod available

  deads2k

  committed
  ad71c5c

  Copy full SHA for ad71c5c

• UPSTREAM: 49130: expose RegisterAllAdmissionPlugins

  deads2k

  committed
  0143212

  Copy full SHA for 0143212

• UPSTREAM: 49131: expose direct from config new scheduler method

  deads2k

  committed
  ea99666

  Copy full SHA for ea99666

• UPSTREAM: 49132: make a union categoryexpander

  deads2k

  committed
  7077632

  Copy full SHA for 7077632

• UPSTREAM: <carry>: make wiring in kubeproxy easy until we sort out config

  deads2k

  committed
  a72c131

  Copy full SHA for a72c131

• UPSTREAM: <carry>: compensate for poor printer behavior

  deads2k

  committed
  cb0c13a

  Copy full SHA for cb0c13a

• UPSTREAM: <carry>: increase wait in kubecontrollers

  deads2k

  committed
  ad59ecf

  Copy full SHA for ad59ecf

• UPSTREAM: 49133: update permissions to allow block owner deletion

  deads2k

  committed
  10353e9

  Copy full SHA for 10353e9

• UPSTREAM: 49134: tolerate missing template

  deads2k

  committed
  48d8c04

  Copy full SHA for 48d8c04

• UPSTREAM: 49136: don't mutate printers after creation

  deads2k

  committed
  ed68883

  Copy full SHA for ed68883

• UPSTREAM: <drop>: hack out portworx to avoid double proto registration

  deads2k

  committed
  dcb5eef

  Copy full SHA for dcb5eef

• UPSTREAM: 45294: Fix protobuf generator for aliases to repeated types

  deads2k

  committed
  cf811dc

  Copy full SHA for cf811dc

• UPSTREAM: <carry>: generator updates

  deads2k

  committed
  af751c7

  Copy full SHA for af751c7

• UPSTREAM: <carry>: squash to SCC

  deads2k

  committed
  3cf3380

  Copy full SHA for 3cf3380

• UPSTREAM: 49137: proxier is it really nil

  deads2k

  committed
  876bfc9

  Copy full SHA for 876bfc9

• UPSTREAM: <carry>: allow separate mapping fo kind

  deads2k

  committed
  a438f25

  Copy full SHA for a438f25

• UPSTREAM: <drop>: disable suspicously failing tests

  deads2k

  committed
  ec2bd40

  Copy full SHA for ec2bd40

• UPSTREAM: <drop>: restore normal alias test

  deads2k

  committed
  cc6ad45

  Copy full SHA for cc6ad45

• UPSTREAM: 49139: expose proxy default

  deads2k

  committed
  322fa7f

  Copy full SHA for 322fa7f

• UPSTREAM: 48481: protect against nil panic in apply

  

  fabianofranz

  authored and

  deads2k

  committed
  a1cb2cb

  Copy full SHA for a1cb2cb

• UPSTREAM: 48582: Fixes oc delete ignoring --grace-period.

  

  fabianofranz

  authored and

  deads2k

  committed
  a513e94

  Copy full SHA for a513e94

• UPSTREAM: 48578: run must output message on container error

  

  fabianofranz

  authored and

  deads2k

  committed
  6181629

  Copy full SHA for 6181629

• UPSTREAM: 48733: Never prevent deletion of resources as part of namespace lifecycle

  

  liggitt

  authored and

  deads2k

  committed
  fc5fae4

  Copy full SHA for fc5fae4

• UPSTREAM: 48613: proxy/userspace: honor listen IP address as host IP if given

  Show description for d828e7c
  

  dcbw

  authored and

  deads2k

  committed
  d828e7c

  Copy full SHA for d828e7c

• UPSTREAM: 48884: Do not mutate pods on update

  Show description for 293f4c6
  

  smarterclayton

  authored and

  deads2k

  committed
  293f4c6

  Copy full SHA for 293f4c6

• boring: simple method moves

  deads2k

  committed
  7580da2

  Copy full SHA for 7580da2

• boring: fake client update

  deads2k

  committed
  c7ba7be

  Copy full SHA for c7ba7be

• update generators to work again

  deads2k

  committed
  6605db1

  Copy full SHA for 6605db1

• update build for 1.8

  deads2k

  committed
  2f7b62b

  Copy full SHA for 2f7b62b

• update defaulting to handle new kube

  deads2k

  committed
  f53cee0

  Copy full SHA for f53cee0

• rewire controllers

  deads2k

  committed
  7cc4f4d

  Copy full SHA for 7cc4f4d

• handle upstream storage controller changes

  deads2k

  committed
  02d7e5b

  Copy full SHA for 02d7e5b

• remove NodeLegacyHostIP per kubernetes/kubernetes#44830

  deads2k

  committed
  575a91f

  Copy full SHA for 575a91f

• update admission plugins

  deads2k

  committed
  73af8b0

  Copy full SHA for 73af8b0

• react to client factory changes in oc/kubectl

  deads2k

  committed
  d7eade3

  Copy full SHA for d7eade3

• handle printer changes

  deads2k

  committed
  f39394b

  Copy full SHA for f39394b

• react to upstream command changes in wrappers

  deads2k

  committed
  7dfd369

  Copy full SHA for 7dfd369

• React to upstream NewBuilder changes

  deads2k

  committed
  bcba886

  Copy full SHA for bcba886

• proxy command changed a lot. This may be a wrapper now

  deads2k

  committed
  12dbb35

  Copy full SHA for 12dbb35

• directly depend on the scc admission plugin

  deads2k

  committed
  c33c241

  Copy full SHA for c33c241

• router metrics changed/disabled!

  deads2k

  committed
  9abed32

  Copy full SHA for 9abed32

• adjust to new systemd library

  deads2k

  committed
  f159b77

  Copy full SHA for f159b77

• DISABLE UNIDLER

  deads2k

  committed
  8885f37

  Copy full SHA for 8885f37

• endpointsconfighandler changes, can't remove from history

  deads2k

  committed
  9ecdffd

  Copy full SHA for 9ecdffd

• sdn: update for CNI changes

  

  dcbw

  authored and

  deads2k

  committed
  e1d325f

  Copy full SHA for e1d325f

• wire up new kubeproxy

  deads2k

  committed
  fe183c6

  Copy full SHA for fe183c6

• Port SDN proxy filter to new EndpointsHandler

  

  danwinship

  authored and

  deads2k

  committed
  d41eca9

  Copy full SHA for d41eca9

• fix pkg/sdn/plugin unit tests for CNI bump

  

  danwinship

  authored and

  deads2k

  committed
  3fcddf9

  Copy full SHA for 3fcddf9

• Update default enabled ciphers for go1.8

  

  liggitt

  authored and

  deads2k

  committed
  6da689b

  Copy full SHA for 6da689b

• rewire openshift start

  deads2k

  committed
  9f0525d

  Copy full SHA for 9f0525d

• minor API updates to allow generation

  deads2k

  committed
  0163fd6

  Copy full SHA for 0163fd6

• react to upstream flag changes: api-version was removed

  deads2k

  committed
  a06e194

  Copy full SHA for a06e194

• new openshift permissions

  deads2k

  committed
  0ac5984

  Copy full SHA for 0ac5984

• remove old hpa serialization tests

  deads2k

  committed
  7b6afdb

  Copy full SHA for 7b6afdb

• storage changes in 3.7

  deads2k

  committed
  150a9f1

  Copy full SHA for 150a9f1

• remove dead volume source migrator

  deads2k

  committed
  9b01cb1

  Copy full SHA for 9b01cb1

• boring: generated

  deads2k

  committed
  719706b

  Copy full SHA for 719706b

• disable go version checking

  deads2k

  committed
  715e2f6

  Copy full SHA for 715e2f6

• disable registry url validation in prune

  deads2k

  committed
  e824c14

  Copy full SHA for e824c14

• node default config value changes

  deads2k

  committed
  fa7ce0b

  Copy full SHA for fa7ce0b

• Fix cross-platform compile of pod manager

  

  liggitt

  authored and

  deads2k

  committed
  6d6152d

  Copy full SHA for 6d6152d

• sdn: additional kube-1.7 rebase fixup

  

  dcbw

  authored and

  deads2k

  committed
  ae8e183

  Copy full SHA for ae8e183

• add FSStorageOS to SCC

  deads2k

  committed
  a2adb09

  Copy full SHA for a2adb09

• defer adding new oc/kubectl commands until after the rebase

  deads2k

  committed
  df37357

  Copy full SHA for df37357

• disable projectrequest unit test because the fake client is weird

  deads2k

  committed
  812ec33

  Copy full SHA for 812ec33

• disable a few failing e2e tests

  deads2k

  committed
  4f26b45

  Copy full SHA for 4f26b45

• UPSTREAM: 48813: maxinflight handle should let panicrecovery handler call NewLogged

  deads2k

  committed
  7d969d4

  Copy full SHA for 7d969d4