Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openshift/origin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.6.0-rc.0
Choose a base ref
...
head repository: openshift/origin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.6.0
Choose a head ref
24 contributors

Commits on Jul 11, 2017

  1. Unconditionally remove proxy headers to prevent httpoxy 

    See https://httpoxy.org/ for more details.

Signed-off-by: Simo Sorce <simo@redhat.com>
    @simo5
    simo5 committed Jul 11, 2017
    Copy the full SHA
    c75a93b View commit details

Commits on Jul 12, 2017

  1. UPSTREAM: 48613: proxy/userspace: honor listen IP address as host IP … 

    …if given

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1462428
    @dcbw
    dcbw committed Jul 12, 2017
    Copy the full SHA
    52dbc0d View commit details

Commits on Jul 13, 2017

  1. Windows compile time info 

    This reverts commit 0558843.
    @fabianofranz
    fabianofranz committed Jul 13, 2017
    Copy the full SHA
    c8c201d View commit details

  2. Merge pull request #15174 from dcbw/userspace-proxy-host-ip 

    Merged by openshift-bot
    OpenShift Bot authored Jul 13, 2017
    Copy the full SHA
    853e43d View commit details

  3. bump(github.com/openshift/origin-web-console): 23ed4cc6cc7c8ea0cdceeb… 

    …8c0ab043fd03e3f5dd
    OpenShift Bot committed Jul 13, 2017
    Copy the full SHA
    ebde951 View commit details

  4. Merge pull request #15180 from fabianofranz/bugs_1429314 

    Merged by openshift-bot
    OpenShift Bot authored Jul 13, 2017
    Copy the full SHA
    aa13700 View commit details

  5. Merge pull request #15189 from smarterclayton/release 

    Update release scripts
    @smarterclayton
    smarterclayton authored Jul 13, 2017
    Copy the full SHA
    d32dd09 View commit details

  6. bump(github.com/openshift/origin-web-console): 5e4a98b87b2a66f3ac96c1… 

    …1691480c10858f4ec4
    OpenShift Bot committed Jul 13, 2017
    Copy the full SHA
    6ba4bf5 View commit details

Commits on Jul 14, 2017

  1. Merge pull request #15146 from simo5/httpoxy 

    Merged by openshift-bot
    OpenShift Bot authored Jul 14, 2017
    Copy the full SHA
    245158d View commit details

  2. Set mutation limit proportional to read limit by default 

    If you set 1200 as the default, keeping mutation 200 isn't very useful.
    @smarterclayton
    smarterclayton committed Jul 14, 2017
    Copy the full SHA
    c9ed731 View commit details

  3. bump(github.com/openshift/origin-web-console): 450419593645ed81215ed1… 

    …3c0c67696eef3cf976
    OpenShift Bot committed Jul 14, 2017
    Copy the full SHA
    828a3ad View commit details

  4. bump(github.com/openshift/origin-web-console): 860e8a9b09fe11778ff069… 

    …babc5d3974ad7567d3
    OpenShift Bot committed Jul 14, 2017
    Copy the full SHA
    05b9ea8 View commit details

  5. Remove use of policy API from CLI 

    This change removes the use of the policy API in CLI commands that
interact with roles and bindings.  The policy API is deprecated and
will be removed in the 3.7 release.  Thus this is required to make
sure that a 3.6 oc binary continues to work with a 3.7 master.

Signed-off-by: Monis Khan <mkhan@redhat.com>
    @enj
    enj committed Jul 14, 2017
    Copy the full SHA
    775b51d View commit details

  6. Run separate informers for api and controllers

    @liggitt
    liggitt committed Jul 14, 2017
    Copy the full SHA
    6d86bbb View commit details

  7. Remove download of goversioninfo

    @jupierce
    jupierce committed Jul 14, 2017
    Copy the full SHA
    76452cb View commit details

  8. bump(github.com/openshift/origin-web-console): adf6034c1033297756e0b0… 

    …4417de3cc849d4532b
    OpenShift Bot committed Jul 14, 2017
    Copy the full SHA
    0c086e6 View commit details

  9. Merge pull request #15218 from jupierce/remove_goversioninfo_dl 

    Remove download of goversioninfo
    @smarterclayton
    smarterclayton authored Jul 14, 2017
    Copy the full SHA
    bca9c79 View commit details

  10. Remove unused flag from latest prometheus example

    @smarterclayton
    smarterclayton committed Jul 14, 2017
    Copy the full SHA
    9e0ac68 View commit details

Commits on Jul 15, 2017

  1. Merge pull request #15196 from enj/enj/i/remove_policy_cli 

    Merged by openshift-bot
    OpenShift Bot authored Jul 15, 2017
    Copy the full SHA
    0720d4b View commit details

  2. Merge pull request #15206 from smarterclayton/set_mutating_proportional 

    Set mutation limit proportional to read limit by default
    @smarterclayton
    smarterclayton authored Jul 15, 2017
    Copy the full SHA
    987a609 View commit details

  3. Make the master endpoint lease ttl configurable 

    Very large clusters can fail to update TTL in a reasonable time.
    @smarterclayton
    smarterclayton committed Jul 15, 2017
    Copy the full SHA
    72514e8 View commit details

  4. Merge pull request #15214 from smarterclayton/configurable_ttl 

    Make the master endpoint lease ttl configurable
    @smarterclayton
    smarterclayton authored Jul 15, 2017
    Copy the full SHA
    e1d18a3 View commit details

  5. UPSTREAM: 48884: Do not mutate pods on update 

    They fail validation
    @smarterclayton
    smarterclayton committed Jul 15, 2017
    Copy the full SHA
    43e60df View commit details

Commits on Jul 16, 2017

  1. Merge pull request #15190 from smarterclayton/fail_mutation 

    Merged by openshift-bot
    OpenShift Bot authored Jul 16, 2017
    Copy the full SHA
    9dd6aa8 View commit details

  2. tail build logs into build object

    @bparees
    bparees committed Jul 16, 2017
    Copy the full SHA
    d2d4121 View commit details

  3. Merge pull request #15181 from bparees/build_logs 

    Merged by openshift-bot
    OpenShift Bot authored Jul 16, 2017
    Copy the full SHA
    41ac679 View commit details

  4. Merge pull request #15220 from smarterclayton/default_prom_param 

    Remove unused flag from latest prometheus example
    @smarterclayton
    smarterclayton authored Jul 16, 2017
    Copy the full SHA
    5748c60 View commit details

Commits on Jul 17, 2017

  1. fix templateinstance update test logic

    Jim Minter committed Jul 17, 2017
    Copy the full SHA
    010b3fa View commit details

  2. Merge pull request #15231 from jim-minter/issue15211 

    Merged by openshift-bot
    OpenShift Bot authored Jul 17, 2017
    Copy the full SHA
    8693402 View commit details

  3. Handle cleanup of individual authz objects

    @liggitt
    liggitt committed Jul 17, 2017
    Copy the full SHA
    1a09bcf View commit details

  4. Merge pull request #15217 from liggitt/split-informers 

    Merged by openshift-bot
    OpenShift Bot authored Jul 17, 2017
    Copy the full SHA
    271fb1c View commit details

  5. Register aggregator resources into scheme prior to starting any compo… 

    …nents
    @liggitt
    liggitt committed Jul 17, 2017
    Copy the full SHA
    fea9842 View commit details

  6. Merge pull request #15223 from liggitt/rbac-controller-cleanup 

    Merged by openshift-bot
    OpenShift Bot authored Jul 17, 2017
    Copy the full SHA
    6c3acd2 View commit details

  7. Merge pull request #15226 from liggitt/aggregator-registration 

    Merged by openshift-bot
    OpenShift Bot authored Jul 17, 2017
    Copy the full SHA
    9ae8fce View commit details

Commits on Jul 18, 2017

  1. Fix hack/test-integration.sh on OSX

    @liggitt
    liggitt committed Jul 18, 2017
    Copy the full SHA
    8385bd2 View commit details

  2. Remove test-integration.sh dependance on symbols

    @liggitt
    liggitt committed Jul 18, 2017
    Copy the full SHA
    02cb731 View commit details

  3. Merge pull request #15227 from liggitt/osx-integration-fix 

    Merged by openshift-bot
    OpenShift Bot authored Jul 18, 2017
    Copy the full SHA
    7d661a2 View commit details

  4. UPSTREAM: 48813: maxinflight handle should let panicrecovery handler … 

    …call NewLogged
    @deads2k
    deads2k committed Jul 18, 2017
    Copy the full SHA
    db8b549 View commit details

  5. Merge pull request #15306 from deads2k/server-06-panic 

    Merged by openshift-bot
    OpenShift Bot authored Jul 18, 2017
    Copy the full SHA
    20e72f7 View commit details

  6. update bootstrappolicy/dead addDeadClusterRole to include systemOnly … 

    …annotation

Roles that have been replaced by kube controller roles should receive
the systemOnly annotation to ensure they are not visible to typical
end users (such as those who would use the web console).

- updates bootstrappolicy/dead addDeadClusterRole
- updates bootstrappolicy/web_console_role_test TestSystemOnlyRoles
	- still skips controller roles (maintenance simplicity), but will throw an error if the annotation is missing
    @benjaminapetersen @liggitt
    benjaminapetersen authored and liggitt committed Jul 18, 2017
    Copy the full SHA
    f2263f6 View commit details

Commits on Jul 19, 2017

  1. Merge pull request #15320 from liggitt/system-only-roles 

    Merged by openshift-bot
    OpenShift Bot authored Jul 19, 2017
    Copy the full SHA
    12575c5 View commit details

  2. UPSTREAM: 49120: Modify podpreset lister to use correct namespace

    Jeff Peeler committed Jul 19, 2017
    Copy the full SHA
    23f9499 View commit details

  3. UPSTREAM: 48960: No warning event for DNSSearchForming

    @derekwaynecarr
    derekwaynecarr committed Jul 19, 2017
    Copy the full SHA
    83bbd78 View commit details

  4. Fix conversion for role binding to cluster role 

    This change makes it so that the conversion for authorization
policy correctly handles when a RBAC role binding references a
cluster role.  The code incorrectly assumed that the role binding's
namespace was the referenced role's namespace as well.  Now we use
the role's kind to determine its namespace.  This was missed by the
fuzzer tests because they only made role bindings to roles.  The
tests have been updated to create bindings to both types of roles.

Signed-off-by: Monis Khan <mkhan@redhat.com>
    @enj
    enj committed Jul 19, 2017
    Copy the full SHA
    b4a23e3 View commit details

  5. Update quota controller's role for Kube authorizer 

    This change normalizes the cluster-quota-reconciliation-controller's
bootstrap role so that it will work with the Kubernetes authorizer
which is case sensitive.

Signed-off-by: Monis Khan <mkhan@redhat.com>
    @enj
    enj committed Jul 19, 2017
    Copy the full SHA
    3e477e4 View commit details

  6. Add an ENV to control ipv6 behavior in the router 

    This patch adds an environent variable called ROUTER_IP_V4_V6_MODE
which must be set to "v4" (the default), "v6", or "v4v6" to control
whether the router to binds to IPv4, IPv6, or both.

Note that when set to 'v6' or 'v4v6', the X-Forwarded-For and
Forwarded http headers will be in IPv6 form (even when the connection
was an IPv4 one, if set to 'v4v6').

Back-port of #15229

Fixes bug 1472976 (https://bugzilla.redhat.com/show_bug.cgi?id=1472976)
    @knobunc
    knobunc committed Jul 19, 2017
    Copy the full SHA
    19208a5 View commit details

  7. UPSTREAM: 49230: use informers for quota calculation

    @derekwaynecarr
    derekwaynecarr committed Jul 19, 2017
    Copy the full SHA
    fd5ec6d View commit details

Commits on Jul 20, 2017

  1. Merge pull request #15350 from derekwaynecarr/pick-36-48960 

    Merged by openshift-bot
    OpenShift Bot authored Jul 20, 2017
    Copy the full SHA
    4c2392b View commit details

  2. use openshift service catalog in cluster up

    @bparees
    bparees committed Jul 20, 2017
    Copy the full SHA
    fc278e0 View commit details

  3. UPSTREAM: 49111: Fix findmnt parsing in containerized kubelet 

    This fixed unmounting of vSphere volumes when openshift-node is running in
a container - vSphere uses spaces in their mount names.
    @jsafrane
    jsafrane committed Jul 20, 2017
    Copy the full SHA
    5e35aff View commit details
Loading