From 63efbd90472816b5f1fb0f82702bb36fd7cce756 Mon Sep 17 00:00:00 2001 From: petervo Date: Thu, 10 Nov 2016 15:46:15 -0800 Subject: [7/7] kubernetes: Only set websocket protocols if we actually have them https://bugzilla.redhat.com/show_bug.cgi?id=1394675 Upstream commit: d220e21d0eb75ca2361d77393d6840167001298b kubernetes: Only set websocket protocols if we actually have them Closes #5390 Signed-off-by: Stef Walter * Brought in a single related line from fb72d3c4 Signed-off-by: Dominik Perpeet * Signing off inclusion in the rhel-7.3.1 branch --- dist/kubernetes/kubernetes.js | Bin 832099 -> 832120 bytes dist/kubernetes/kubernetes.js.map | Bin 6429847 -> 6429982 bytes dist/kubernetes/registry.js | Bin 470087 -> 470109 bytes dist/kubernetes/registry.js.map | Bin 4274371 -> 4274506 bytes dist/kubernetes/scripts/test-connection.js | Bin 274909 -> 274931 bytes dist/kubernetes/scripts/test-connection.js.map | Bin 3229225 -> 3229360 bytes dist/kubernetes/scripts/test-images.js.map | Bin 3685357 -> 3685357 bytes dist/kubernetes/scripts/test-kube-client.js | Bin 444618 -> 444640 bytes dist/kubernetes/scripts/test-kube-client.js.map | Bin 4114391 -> 4114526 bytes dist/kubernetes/scripts/test-nodes.js | Bin 495644 -> 495666 bytes dist/kubernetes/scripts/test-nodes.js.map | Bin 4719794 -> 4719929 bytes dist/kubernetes/scripts/test-projects.js.map | Bin 3412183 -> 3412183 bytes dist/kubernetes/scripts/test-tags.js.map | Bin 2481360 -> 2481360 bytes dist/kubernetes/scripts/test-utils.js.map | Bin 2484409 -> 2484409 bytes dist/kubernetes/scripts/test-volumes.js | Bin 362081 -> 362103 bytes dist/kubernetes/scripts/test-volumes.js.map | Bin 3759256 -> 3759394 bytes pkg/kubernetes/scripts/kube-client-cockpit.js | 4 ++-- 17 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/kubernetes/kubernetes.js b/dist/kubernetes/kubernetes.js index f3f3e21e611987201277e20cb2b5dadd32807ef9..450367b5dc7dad5b234ea2fa6c58da5a9d5cdad0 100644 GIT binary patch delta 112 zcmaF-#OTKpqlOm77N!>FEi66(EVj0`dE0^XVFEi66(+XDhv9y2l3YEJ*>&EmGbH<+bfYdUWoiw+~#cFQ`J tmo?MZd+@MNzwnzyh{>9(-R3t75VHa?8xXStF$WNH0x{Qio8R0v+W}9VCZ_-Z diff --git a/dist/kubernetes/kubernetes.js.map b/dist/kubernetes/kubernetes.js.map index 25e6161b961f3e91b79b1189be109c9ccbfc4733..857f47fa9e5d3b212486ba8a4722db8dc82d6b32 100644 GIT binary patch delta 744 zcmZ|MJxo(k7{>9~mV2>KP(iH7$1S#kTA@`cRBZ8rw0y~>2t^bWkfKJkjV01f>d=%h zG>wLw#dxEGx|q0-8+53XaW!^TSB;a7y7Gv+i78d;vzMERajRn7aPtWMvGP)_Fn=`s4qnB*xQe&>t)1#`YCmnK! z)v)UAH{Rx?pxHUaWhxbNYfN_^#|q1zd7I<}$!n>wNZgeiLR*tIMcXr}#Q1t&nsdut zs@ki%2SlVG4az)W(TpbrX=B*brHaqrZ@yqe0q!I`OME!e5tr36cS}U`+ zF2!zMS-z?S6_3)b{ELaii&m#-NRCKZd(njhXhsVT;t&qQjU#A98$9shD2|~WJ{(7f zVJ~+2?^JE^Z^r1SF|Rqh9`)k{x^NN!1ksICP|<^4oJJo)2%{eZ7{m~UamHAWjy(Oj zRRiM@?T7XM4ZQg>+4Q#ov7Q^M5&5JR5wi~~EaK(!W?AHmE{FJaU9$_%2bWbeK6aI6 kl^G4Ah+qt7F^&mDF^O}S!g*Z4G-hxSmoRH6Gjl72-^Sz!hyVZp delta 591 zcmZwDJ4{ny0EXe%qkn;xS_BKl3l}L=ZbEHoYZW<^i(25cD#gnY#H4j=2%D2QoRo=p z3H~QBVUZ9wC-@N(aMJ-dW@8*oEQ>li`9@cVXZXhVTiIIFZAI@`4RPLN%U(X$Lh(+xdqXr z($7Uhmz>!VRdQih3^)_Ip42evY5gx+{PW;g^7EZ#tiPOk~tfG{|BIe^?LvS diff --git a/dist/kubernetes/registry.js b/dist/kubernetes/registry.js index 517a280493b1977a1c2808b3708100eebc95f63d..b36acb39b6fdc7dda4e84fe609d6b3bece3055e4 100644 GIT binary patch delta 73 zcmX?pL+0)cnT8g|7N#xCMP@9vwzhfOi_DlGGl}cvq~@iUWY`(l7g&|$XQn6^)M{$# aBu{VjW>#&lw`2xl79eKbUT?{E;u8SVb{XgZ delta 60 zcmcb6L+1DmnT8g|7N#xCMP}Q}%$OfDvDRv8>LgDWv}G2V?%)6<7Kkviwa>F;24WT< MX5Bu|l5PJd0F)6G3;+NC diff --git a/dist/kubernetes/registry.js.map b/dist/kubernetes/registry.js.map index afefebf4057af1143890d4efc6ba9c625e90bb42..99b014f73aecf30709897d743ff0c0125b3d260c 100644 GIT binary patch delta 600 zcmZ|Lze^io9LI4?t|lh&w@p)%=rzXQXL{--_gwWZIcbw6)MgOTF?uQ}CR9N>wFN_P zx^^hvLC{Iisa?ubx^{E%570rh2!*z4CqXFvWGXE>yq+)5!*_W9rz zE3a8BuErH>mT7}?*6f^?%*)o>t?+BRWLK4JN6B`6w1pQZ_41f$nu|keDPv~LJ;A|nsZ3Q(OB2{s66td8On^I34K8p)4S2u{KB$E{sD}nL4i0VxS^;&uKvj-8bxo2f8u#Mt9p#*e-WC7= delta 429 zcmZwCuTKJT9LDhpcYqvr>83{-Gqy1_14TBf7c8*C!W)UTr5U;fy>Dx1LZ7U$V3vd za@+J>Yjtg?t{Li@v84&+zNNgI+s_3r_H_4$kTQw|)Hz+f30*Zm5I_VIn85c>?q&9k9@WBksf*3NpliK^zi#hb13=b?lcUiajw0y&q)EbXVb`+T|P+*n$*n!w#e&16k_wT?SBAtpA@P9 delta 27 jcmezTSm5qsfrb{w7N#xCruy40^_d?tZPznmKKdU3sDcYZ diff --git a/dist/kubernetes/scripts/test-connection.js.map b/dist/kubernetes/scripts/test-connection.js.map index cbb403a7cbeae921d92d93558fa23c88f406eda2..472dcaf591ad6b1cbd25f1cb1b76b2dcdeef6425 100644 GIT binary patch delta 448 zcmaLTJx{^_5C-5BP(Z*h6saFj5EZ19V%h*ENJ?TEjfoD9R*D}%YY-PVOh^|E8iywR z0VL8v2TeyOcJv<@M-x{PCtnsPPJ|c-X&BaL!^X5m*n%Jk=bT6vg`#k@X}-5?tJcU4mi&rHZ=lob zC>(}y4Jat-CYRaBcIis}KZ!)3<3x0>%O_MNfcGEMS zH}4-m&~7a$pZ4;R%$W~T;>n`++_NwT0SE#GAqc}fL|_3HVF{uTgJp;V4GFX7W-cy& bW1EQW`6uz$Rx;dAY*%%ifuyPHY}5Dw4X2*H delta 434 zcmZwCJ4ixt9K~^bzbjvL|2_0-Ps^?k%ExU;C2A7H$uR|mAZTdGz(GNTC=4oogoIEa zgo{huE$-qNwM9(^4NVQLEgcA&8a~6>zNdH6SKJ==6{kBa9|@OAp;$2%jz(7?URW)z z2P5J5Szh6zr?$pfmFu#iE-UM@>P}X(j=r2qZYB5kHl>e_T2yI@Si6+DR=+mfT{UPx z3p&t)0gPY*Ggx2!N8GFVFt>*S45RWg~5wgeh== z8+h=57p7qbW?>HIVF7%w2ut9HWhreD4r{;BpH1P*NVO1er^E)QpG^`U5}(8T fD<_nD>Hff_r@^IQre0alH<~R00#dUT^mKm!cUFCC&EM7>cR0^)Z1$eX^1#5$?jS0L1 zP<;Kj{o7bu`7rsw1itayf!jAD&+m-QXzafQj`{pf&o)+WzW%Q!-U(V@2(-Z?Fbp1p z5%2_zf-x`-o`Pp!0!)JE;01UIroc3q0kdEZ%!38+3cLo3U>w w?R delta 271 zcmZwAIa0y^00q#2ARvl@f@oM|6C`fg6DsdPCo|z56n|(PDY%0F0O&cqfxVNVw8Vb^ zi&ww&_dAoyYhu2H?qcD@N$f_EFVlIDJlml=wbow+Ye_HzW olfDdOC^s^avE0f;EV+|=d5}kW5?dT`#S>ow2_^cR8Sy&)0|0ql;{X5v diff --git a/dist/kubernetes/scripts/test-kube-client.js b/dist/kubernetes/scripts/test-kube-client.js index 3c10bfaff801dce3b56326a2ed40fb153a9bfc4f..c29ee21ed59c189da91f950d6b8a4c939cad4d7e 100644 GIT binary patch delta 75 zcmX>#QTo9|>4p}@Eld~dS!``>^R{2CXL`&eu9uUVmtK-#XJB7yRhFNbqF_*~si~7P b{lOF_)%JT$OhC*G#4JF}y8T`g+Z$H^Zap5; delta 61 zcmaDbQTo(G>4p}@Eld~dw_mMidd$RHtEs7zGQFUUNo4x`P9~Ab`%kd7|7~IdVrC#_ O0bEgTGf*)Rs^)soLqduA`|72QzLjTPN=pmX0AyQH+DD8-U0 z&M9-sTAICI;$)NWC5Cxf6`vzT6=fAoE29xre1XkKSfzg!xL;Jyapr1mnS)kZpbf0h z4jo{FPIv%z=z?zOfrsD#C-g!e@T|5h9Db#tvfOSa$z+ny*|O|n`AgxWjSsDBh1F7? zq=-aj$lJ|gsrah6{*FrDZNs!b<+9T4rlXTyoeTc@C)vwZ&V*}2{d(NO8oz}P#ya0^ zp^X8zyLxjgfD0Z$tM7*acnpI;z{75Cy%#^7cm0=o_G3w=c09;=V99`DEyg&0gg S91<`IQ!oulcD$3aPyGXNU*Y=z delta 411 zcmZwC%Sr-a00m$iN5|CcGGZVOM8QrwMnr!>Xb-kP2&sMJX=*=-J*&PM6GU*(!meIY=<~RIPc4z+Ya3C@et?;;;-WunKFi4hcwt uNUK&#e<4^KqS3na?IureDV}uiIo7~rNP`RtsGz|HWMC7vXs)sC%lra93aa}6 diff --git a/dist/kubernetes/scripts/test-nodes.js b/dist/kubernetes/scripts/test-nodes.js index 2f2c5870a2804366e6b50672bd80bf8f992e59b5..8bdf75eaecccfd021757c1a96fc3a7ed9d19be46 100644 GIT binary patch delta 78 zcmbQUKyK3lxrP?T7N#xC7M?7&wzhfOEj*bYGl}Tsq~@iUWY`(lr&yKcXQn6^)M`$j e;L0pE&6U}pJ=upDh*^M`6^PlkC;PDPbOrzf92s-~ delta 43 ucmdnAKyJOc0(U_Mi&4~5DioS diff --git a/dist/kubernetes/scripts/test-nodes.js.map b/dist/kubernetes/scripts/test-nodes.js.map index 887bcf797dcfab00bf99f5916d9c754c79a1ec7a..33401735f0eada4802d4a8fd2f47abed6de39f5e 100644 GIT binary patch delta 679 zcmajb&rj1}9LMp{*;zpt>X>5)?by^h3KpST$9OhcTzB$!jMrddcJv{=X-j;f7Riiw8d(2LVn% zH}t?s=!HHAKtG&<({KiYFaRMq3tyK({wfnW@Rf#c1(WDr0 zpXy?>XLMrOt}d=ENm)sia?-!G8R>DgY*!vsZCd#f3DSO37TOz(r=%he(#s9;4yoVs zg8O=0{MgkVlKqXkC4vM|7=;+b;XGV`iy*@#w{9hV2ZBencNgB}{l11%Ou!f@Fb)%N z8B~~rD=-Dqpg|H+phFsFAOo|mQ)KtVqYC_b#(s83|670-%*+7o=VYGt-pumk?`VD0 zYOxqS++tZmfjGV0W?^@)%ACI~2rb6kPj!~!=<6*OYU?8cWuCM7#=$0oEaYGg3^3vF P?<(ZMat}5OyD$C#&wcym delta 471 zcmZwD%Sr-a0L5_{8#T?mYo#?!H*K=K*Ebyx*P2tBx4h6|e8YRY{ ZbUOm%AP;*`01=8%f-*>Iw^Mn!{R3n0xElZf diff --git a/dist/kubernetes/scripts/test-projects.js.map b/dist/kubernetes/scripts/test-projects.js.map index 2cf0ebc0fa523128048cfcc186f7f7176c503230..e32de4be1a1b2a5401455ed95058702963124970 100644 GIT binary patch delta 248 zcmZwA$&o=(00q!8)8?j4ZS2X=ZTN<2f2D+AYx&C~3RTzQmL(+vK`3e12|x-0a09S7 z>vKI`Tvyqz@{VzAGamhqhGsFgt)*Ek?TOPf)&_)&a1$QFOZW&s5g>v@h{qy}WxUCG?)Q( zFbn3uJXipWU;|cS-G5+O`-Pzh-gRLo5sYzWL(v+68r6XPGNnZvsl#y7kU_1WYeuX~9M3tx! zbwVQ=M3ZQ}pdWV4KY3(5XGXL=+3RThO=LMq(^1 OF%eT?$L4-^zy1L5IYs;c delta 194 zcmZw9Ne;mP00q#P=b^NydEC>`VdW5d0iwOdPgwleT1Z^M1w?ubH}Vf)@wPAdK2wR@ z&-T%E;&|gnzTGnpSVG1Y2L?@eWPYnRDo24a@&GP$hLk^qcK599y< diff --git a/dist/kubernetes/scripts/test-volumes.js.map b/dist/kubernetes/scripts/test-volumes.js.map index c62f09a24a5867fcd5061ec8ec9574e835e4657d..476ee051ee19ff91c22c798e09257146ac419639 100644 GIT binary patch delta 508 zcmZ|LKS%;`6bEqh&iq&Q$Nri9`Pu*UGOhEx8%(a~f}k3r!KpCM93;hrNQa}rjHaf3 zfm^#-sjPE_=xIvZw&W7rm^6mAurTR_>z z@Y6$*!mZ;}5EUAIV?DIzlf63aGMOmz#Xgr0851;s87yE08`z-{n!o|g&;qT{22N;) z4(Nm~=mr<`=!cAZV~IX_d8>&;A`wF0yu3@VFT0QJ-Tt(?vz<{9 delta 376 zcmZwCJ5Rz;0LAgNwA6yd2OyUE03V3rqtx5pb})d8F+M&(H%;2G>4;O~K$|$}be&z? zHQMOPu5mJPa$zTa0OCnp9e%@qJLm4T&)vTCxoclNu?*j@+n#MuO29cay@qZX&SlUI zxNg9AgTzxH@I&chx3$-z`|-_Cpb61K_^dGy%8|m0kOT=vK!y~gVH6a|z!;3f1WZB} za*&59D8MwRP`p=o?T~#OXlhK3wW~CH$Vgc>cq~fny+g#%)k1eBbZ0|%E_COg-O^V( z_um`#t($pvRyB8`X0HTgSb#-Xf@P?{3RGbg)}RLKumPK}1v=Ehh?~9b^Y-7o&l>qj ZG2@67*jtArBbgE~!2$|)EK^6V`~uVWbwvOG diff --git a/pkg/kubernetes/scripts/kube-client-cockpit.js b/pkg/kubernetes/scripts/kube-client-cockpit.js index f003b4d..f44a1d3 100644 --- a/pkg/kubernetes/scripts/kube-client-cockpit.js +++ b/pkg/kubernetes/scripts/kube-client-cockpit.js @@ -533,7 +533,7 @@ if (angular.isArray(protocols)) valid = base64 = protocols.indexOf("base64.channel.k8s.io") !== -1; else - valid = base64 = "base64.channel.k8s.io"; + valid = base64 = protocols === "base64.channel.k8s.io"; } if (valid) { @@ -609,7 +609,7 @@ channel = cockpit.channel(angular.extend({ }, options, { payload: "websocket-stream1", path: url, - protocols: protocols, + protocols: protocols.length > 0 ? protocols : undefined, })); channel.addEventListener("close", function(ev, options) { -- 2.5.5