To add a little more context on why the files are so different at all, we include a small number of differences in our releases, all of which are listed in the release notes <https://github.com/coreos/kubernetes/releases/tag/v1.3.5%2Bcoreos.0>. Basically, we cherry-pick a small number of changes from upstream on top of the official release that we think improve how it runs on CoreOS with kubelet-wrapper. We backported this OIDC change <https://github.com/coreos/kubernetes/pull/69/commits/0b50415c7d862eb973d288bd35f554379f5d7cf1> which explains the difference you're seeing in those files, but as Eric said it looks like we accidentally dropped that patch.
Thanks a lot for letting us know! On Thu, Aug 18, 2016 at 11:18 AM, <[email protected]> wrote: > Daniel, > > I pushed for a patch[0] we need for internal use in our 1.3.5 release and > it looks like I messed up the cherry pick. I'm really sorry about this and > will speak to the team that maintains the hyperkube images about this. > > Eric > > [0] https://github.com/kubernetes/kubernetes/pull/28036 > > On Thursday, August 18, 2016 at 11:01:37 AM UTC-7, Daniel Aschwanden wrote: >> >> Hi all, >> >> I've just tried to update to hyperkube:v1.3.5_coreos.0 as I was awaiting >> the fix for https://github.com/kubernetes/kubernetes/pull/29860 which is >> part of release 1.3.5 of Kubernetes. >> Unfortunately, hyperkube:v1.3.5_coreos.0 does not seem to contain the >> same kubernetes source files as the official release. >> >> If you compare the relevant files for this bug: >> >> https://github.com/kubernetes/kubernetes/blob/v1.3.5/plugin/ >> pkg/auth/authenticator/token/oidc/oidc.go >> and >> https://github.com/coreos/kubernetes/blob/coreos-hyperkube- >> v1.3.5/plugin/pkg/auth/authenticator/token/oidc/oidc.go >> >> it becomes obvious that this fix is missing in the hyperkube >> v1.3.5_coreos.0 build (see line 177 in the coreos repo). >> >> Is there any specific reason for this? >> >> Thanks for shedding some light on this. >> >> Kind regards, >> Daniel >> >
