From 78a92bd114fcc844ac785509f2d6c8b2e1920fef Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 8 Jan 2021 16:10:54 +0100 Subject: [PATCH] fix wrong lb tag and update chart package --- .../postgres-operator-1.6.0.tgz | Bin 19010 -> 19074 bytes docs/reference/operator_parameters.md | 2 +- pkg/controller/operator_config.go | 4 ++-- pkg/util/config/config.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/postgres-operator/postgres-operator-1.6.0.tgz b/charts/postgres-operator/postgres-operator-1.6.0.tgz index a20c4c6945c11faa81be92b1f50924cb428b2ccf..bf98cd8183d93920720fcfca1bfee716dabe6960 100644 GIT binary patch delta 18179 zcmZ^~MN}SL8?^}u?oNQ<5FCPs;2N9+cXxM(g5d7%?(XjH5*!}f-Ti6aZ}s23deD=q zL7la#&ZO>r_TE=-JmlX5$Y>q_a9QQJrVhUVxnn<$dQ5#=|DAZcByrc$;X%lqR@EeN zYEg8yyn4UoD=sc1gP{o#pZDsj{o?Tbb9A)^kG zmCHiTd=I(32=!5t%VA3ZjzRc~`aAD3M5#AfDTp(LWAZ@@WC%D@ZwLrB!9?4e+(Dz zvl=7(VGteUhWx`NCqh-gGZ$|n{Rt^iJ`+jiO*%wK>=e*g>qvHj8!67Y1aFt2yf;W= zEkL<)nva)ntUmC)kKF)baeqtNupr6~!0&T!CUUs@;GRv}%kKdAVrPpcqgpQrZRDG# z85eP4m;1l)L&(n$`jF5LIn6kQ)Df<0-ShsYKbfzgTvMal#bX^}E=~C;*5|G?a;7L1 z=;zjDO@h*WZF3}8sAx^liKpNv;1XgdL%v{UUw*8X!jULcs;Uz{m5arZj6-LQErNic zj@0jE%`HOOuLMTT`lTsH1{3mIXhnZVg{`ZKm~&#N_1h!!m%A=O@0z;|VGPzuKvYSG zVPT*L(`O4ZZck2PR1_Mxi0c}O|Lm&PdLd6U2x($7%8+H;&ZEanO^y65e0^2tc9$Bd z`WJ8_i-~yJB}~9949fRF0y=ZJ95?wHr#50mq`!%EM*;!TCFj-Qkr?-=l(mbGdg6m@ zf5zjps>3Bx(V*1D1*Gh0%|^qk8<({8m@S3bu!Wd=hbWBQ$o6T*>M`HjM2Y&yY(4FA zhuIeu>i7(Q9Tf3jfTb~sKL14_6<7Q+@*_RrA}GJisHfEjh7>)9(&39hL5cAW*&pM2 zWWztEy>piF1L@|8;}Z1Jc`|=!V*6jk(6Af*y_17T9{b3$#PRD$kA!qcBnQ~$`GLEe zv9PhZx+Z@kR+hZjOKCGPgFgQjELI|JMP<`CyrMn%%c^|NZM82B3Q?MwS)F`{QBxc5 zZ@2&CaDQFMPHia1<$T75OpR;$Ob2Kw;L%}(uob07VHhur(BLt9O{j`7%0$KV5S5?a zM|m0A?&bJ;cN9vP(gwkmZ*)ojs?lo*7wtBYlo~7A{ffI!o!zOUKE@ z)p?4i_%pPxyia6$u=2HgFsS@qGim_rC>N$;o7296}rTM>mYe=>eK zMSXC8BLRKxrty-CD}bUSVDOoJh!Al2))FkG9U@Yws@R<^k*L5JVhE;x{cTL@ zB~Ms01POvShb7+Lt6INWJb zB==+FI0jflNV>RKSTgiVRvg$oH$qa$M(*x^Bm!C0aRab!{LYGpM?^E*p+?zazeTJ% z&BPQ$BPZn`%d-PA1AkX1bc|vTRWue1=BlMq4GMfdd)tL}b7a)Fm!JG~{b_&4AkGWU z4k2d7v_lDz+S}74?h%d~IVQz1bObLdd4&PFYbZ_to*3Y9zgfX6`QahRMKnP-u@DiW zbzE)2a5()Jg>L#^K8Is8`c!wEt?=3v*;Pey&Kr&tIo{ny{;afR$~6-97gBQ8?2+{8 z8nc2-`#p-vv#na!A2DqDVU1cc(($xZ$)6U?jJ2 zjfbO&D_#J3lY7`x+f$boWTG)Zr6-Ti#&;A?h*^Q`zX-o+;df)0JDNonSXVwB!zso{ z8~S1iag(3bWKi&+=g_m1A_bBjp*$~0-t$4qJ~l>yqJ!r!)5jN$&k(8U4Pltvt>+W_ z!%q%3$L`{fX!^eCFtRN(s=@Gaeq+zN@|RJSme&Nx(arC?dw{}#d`yE!x_4i^^MX{F zeK|N$LPll-iwX3RK>vt&%-E@1Dv|IZn4b%%HQuJSC=)K4=;`n-GEQtpql_?#UKs<1 z*v;@+HRTxbgPMWrcB-8OvF9#YMNOOP5^?#ZdEtM~UUR3v*={J_Hyfn2wuZ5!@AsjV0bTDY#+(w_-C`AA9Ebx*SU@os@5#u>G2jym%qkWa8menI%TSYha-Y( zwK1g@1-rn3FV&5tmFK~b&-BwY3C#6edw6nT@sA2UOB&MO925_d62G3H-2Ak==x!wF zR{z@+q)-&?p8y?JdNewiw)6RQ8?8+bJCNhvxmcZE5SAuIG0?a zabI=P=huZcb#t%2#&9hO*H$IYdw-`CNljxcP97J4Qf=PagruVZU6lRYQ-|;>)5r#( zLkj6zh2r|ckD{iOXo$;`Fua3)S7tm8ZcXU%(|>}FPTY_thIZ?Bk0WZCKMt8`CuTAz zkC2fGk64PIY=%HJBr}y3`xvB(PcS-&_+8Z((Rgwj+Oeo)eQu}Cz3ou!*ek#NM4C&{ z2E7?rSAT7Gnb?^Mph)l>*F4OJYcT;BN3n~eaCo)QbPx>&Y8jMta9R%4f-SU_qo_)riJ2o=zr@fh_IaBhecz$rJ0kKH7Qc`LjrD+ z`z;kWGb;#(Ms+H%r3Rg?Gn4iE@Y}|dzrqioeUj)GQ98$#iwd05+r9?~+TADz?P5d^ zulL;}8ByA3V1g=gx6B}6HsGgK*ZPK$iDM1%=9Q*RWB2RE==S6el19}5E)UBfS`-NH4~e1}ic zEVP3L`)wO%i_^+5gl%0=KOrmYe0T*+Cw*B}hY+R*j_H>e6fs z-$cKf&-nLfK7^6pEfhkrDnkd2oKcnkQarKumZEDw~@GQGj{@pjI%$wKrV>9RppImZgIzl3x*JLW`i3DRan(g%K$6@uK z49R)~?&7U&FktKPf&mMlRj4-PsPP%?W6N9R41LUtwEg!J$3F6%?8xfsZ{9%{yI3Ql8Yiu zCFSXKb-TXbYn#hkOp55FuD8$Qx!qJIf}2w-`epO`ip}p&_g|Z#thxGM3eSRux9Wlr z8A`vUiW)CWXgj{E3EQmStTDkVX7{_Jc=?hh#yyfuQh43>unZyNTo2&T-heYK|K+~ zSik#&(dg}S7xd+~u`pUV1-bzXx_<0;q$f@Li?{{hWfa`%O4psGOBz-5v37>ljpCXfg$)-q$r&tp*S~Ml*Maq6=Pq*?0fHk)%1YoEtvXfml-l(AGxUw<%JwKRON@E z8t$b{<*ECC@n2n<9Dg01JV(pxaSWsk3`D8Q%FLZfOIq`5GPPJrt*->XeAEBXiST1& zTvHY7%Mict`1su2T3l>{@2p@~GQKI(;u;gJOt%{eG+stKKD^|Es6Z(|DcocYY>hb#rCo9NHU3EZ(E{nOy={ zVqZv0W^KCCvP;%8#~<2UymMc=u46@?2BQFJO@-xZO@-tLp&k-!wruB-D-hmcrw!}3 zV%~yA;}Hgf;qF{U8^8MuckskE*<7*8l1t1@?S8kv$wv*fI?-D8omRHRG?K$;lq|+t zOt7$CvXxmC8w`Dsa^Mo{sdN*n6R&GNh7v{^cLbQmM4d@pK+#3GyEC6WL3TX*m>?kV zmQZB6By8u@cZ!Qc&-Zg%Hpr}0@0Y!JTz@XRbSIlrx}uY=UZa12baX;cTbqIVz^6y7 z>GX$kpsmRGPZg1_vcgPz^^#_=|H$6qF-O8#bGbVTyOrr0Tw-Q?YNc;;2L)*enz4*M zM<+8`0JE7C94Q%U4ej@gr?wM;Pq;uHEu2U$nkkgtfIPAQue@{1fRA703(bhSfl zgw7_x%G-{dx=$75DG0mjf*jZqYr&u;kt^z3b5x0kYMoR=G)vRb)P(8t5Ox9Ih_cE= zHU-lhCU z$geYS%l8;$$UhYJ`1S_E@^(s7tl=!Up&u>8!!u`&k}12OaefBU$+i(&7A3%SlsZ|*-=S0<>kmRkYnxK-&jtYwH= zY$sS!5!kHYN>)j6Ie*|QRphq8_1$Vkha{h!H~%j8F}4$6o$zDPE<=ELdt64log9X3 z+j2-^!_!jw?5(B0bf(z#FZ%VljdZgjI3?_8H58(59y;#tkmX`M-)~!5=;@TMtLV_^ zJxE3d(b(^9?z4P1W%9eUxBY34hq&QV#QsHnX@RD!R&n{MyhdxxU!z&g-Ae}hu+SyQ zDrX+Fp?}9MW03(AuR59iy$Yr>e{(h-J)%{0UQYL#F6pztPV4#3pv(>rx8=EuI|jRQ zZg7`NbCd1+!{w3g#n$VE7taM$3UkPxOhqPQODYBROe|L+!x-d<6vKSId`t`|quqH_ zV*c0-XsItsXN^ZX0D|@}GMY8IypMa}0FeB|$RY>nDc?y@idV zI`j7+g~VOy(#%Pl1O(lQR}e9eMml)v{v`!?*xPDUL-_lt? z9>K8QlG7rF24s~%{C+zC;t59a3(AeTHRT=Bei3B|Vh#|>=9tbj=2eHzF30~iRwxB<;1&8NBc)-cUza?E9?AQ~obg9h-Kd#OAT4*VHCv${>@Si3@n-*jH zFRmP#V4DOK`@3iU!w1v{+y(IaMmD(m9W->4un0~tKKH}WO@K(Hpe`6^vOAkx)Ke8c zDyjM_l;{r_TOCwNShtd=m|tCJ6_hYuHuNd3+ID0G%phL+twqPqsQ&xQ)?~vjVpX9= z)j>HUi%Kd(llDAo+?igB^dR{i)#$S*SJeU&H-PU*`$hF(HcZ*<%>37dJnH!--YEUI zXsRlnK_}0e92DPw3uGIrIjV~4F1&AZndUL!(;^|jY?0nw6ztu-@i9ZGV)!7Un>Oi} zI%&r`QiA$BKf&jUlNt5sov965T8;X9=5NY+@=qGZ*Jp7pYNRIBpT6Tik_I(il4eu}Gac4(f`-#wnxK@%{0aGI0@ zw2O(J;HkQJ;lqWH@M|p68vHSDIN4ad5{xnHEUnl6bf#*8Vioq7lWVo^#$oS0mm>B9 z*P|?BYTnrz*q+pu5-|v%WKtFqhs_!SlSrJlP#Fq9zE!MTn`Q~LFudY zSXjK*GKk>HZ;DuEexrMrn9E=0mE%Lt9H5^wv{5o^E;H_{)waDi#@1Z;haC3O!pvE| zeO+!9-ZR!&uSYnH(9Gq@6tYp+VW==pAfpX4W zpJk8K@vcl%e9X#`xGM!W5&y!bTq5(7?E`y_T^U%atYFk+_Zk_G?ge%m5-R?hTh#8_Py(i`=Z3F)vD1F# zyu}MSQlrI0)H`#XGqE@F(tzbSs<&{hn`n=mN#jz3?lS&X_xv`@C z;?`0k72$-5=*^^-*96##e#%o!B3a=SWPf?Xw9`gyp*PNaL#}dXtiXGEb!*znYm>?F zeCN@8E;_gE}p`d56e{t#lYY`MhqO$s;Q<)3DmPA9MX)w9uK)L329*2%}| zRueDK4(}+r&&!pmkD0WUqg&;`Q=V1kZ=-1Is6iOiV)JpFLSej}O#U{-~_# zXlD*6l?!u)!M-gtGHfL4U~6_t0eFk@XUI^nG#6-=e^s?DR-j4}7fNz!!5!#6S%IZF zoewRdD=)qE%Rrq;W*~)8r%H9jwx8fV=t9j1++e}W*;iu?K3JaX*?t0bn8*>IeoW2< zhB1>w*hnv;ADutcR#4Q3Q8)=4D+rh2w)DzOJ%sBsM;-&Y8KLF|n^ZKG+}%PGD$P|c zLAq(jjRZL*{o;a<=MlKr zTmBslywG)YRQj7>GJX2~U&uAI`wTou)EqyCa9b3VT1vTAR<#c<)^6yO5B|>E?0IV6 z^wj25Y%!#t_`{YRb@&z3jrZLE|XS-Dy~-YuO}a2nC>4i_ZK9hZGit` z&zH?FRid4jFo;m$TR1{yzpXG!MCGA>iMB~ldzw9T5<3B9U@?sphCaPSxZd{iE_@7q zPU_T`jcJXJBDJ+;QoOXK6SAvNO`IL%LU7j*uYDq=0~t%PnK&8O+F53ec9Dxcp0+uu znn}>tFg9$wr>Do*e$7%@o8CLdR{(e9;#Q1!m+^J6BU#pY0$9s3PdrohIZddD7RbHP zlG8fKxNs+T|Myf`G}nH!4qja*SJcrc{V)BS>+7i-c%15)>wtZ^(9U#!J+OCXxo~7Mq;%j$r7}_mY6G3R0z7bT zYOHEUnXXKVNa1QulpjjaRMtsD48JaoF-Zwq{yi|pH5=Bv|LkJf=+-vtDc3y9-K;OTD?%r;~W)oIwqN?o)=pPL((XHlRJGt}otZIW8*RCe|h#_bEhmftx zhVkHIzNa?KDM;>8Lcza%NA*pt9;S*NtgzA!>tCN*@}bNEmI5dYm+900JVC4H7Mca) zt#m@!9_Co2`VVrzlgI2Uf~@3@s8Nc98icgQ9Kz`5Q>Siak7SQLE;^5JhMj!RmBh^W zD0+ON32#8e;^PTN*UcH>y4B)-O#NLL$gw4EI00O7n*AD4Ti*OyU&Ti3NB68CiRpWk zEU)&@eReVdWXGaJCEfaF zyU?!^AgVXrLxN3fsS!Or!>D>VtWjEeL^{x~81BrpYv-c7KXv3PB~&=7@WSIRaX3>n zbCYn?ZA}|suDl%m9&b3B!NQOG)~fTyTfjRO1ENNx;TKAXQpV zPo^b~BN_8uDQs*bkWK|+J(hFP6w8qHUW=4Dl@RuB$S9x5i)A8UeAaCsb=8;BzI47J z+RmfoU)WbZZ00i~4z-esg<0Ca)(}G$OBH%}KxGT!4`-O(~M^ZfV!H zpMTsbeky}#kV49oN!d-cYDWN4?()eDI`r?1sKsea1;qA?^aq7Jrgs+Hr#EUVBv1b= zR=20?cT76*kIJp;Wvn_2Ic@!EnVO%capMuXGo?3N+2vZnu)3Tv&&%@TA!66p{>>o7 z0NBR_k9bi%7k* z>Q`K8@~EF^)JG_+BNkj6qfYtLWG1vqpGTWYK?6b&o};sq(N86#UoYYLwUBV#8Sr@& zt5COEUM51$Yd2k0T*@x#7rjLu(Rt7M)inUf@W0`J?`CW|K-*D%R4-Y?;IpeNaILWj ztjx|)oJkXZCz0=)vCPVhsf*cpH7;=tXuFH=T|?qnhZsE3`Fywc)TUzN{hDDT@bF)D zXe02LaeuKM&1Xu^ySL2QUF!kBPJGoXeo=1GyU5OwD$D;gA!1Fb9zOkvlC8Z^6O_Ws zZF=r-nNaKRTXf5Z_Ln0nnS{(*%%;kU-%68}SK8%Y;hQ(&H%$W}@qAa8vlS53D(=^+ zfN|W3?xxlEKCS%O?~jGfv0`W?z1x?5!`4-;LwQ6Va&tU-9pY@V@NEHrF0Y!!&y2Ob z%7FE{PJ{G{Ro06L%|eM{O2R0&ThR`5j%=rZ*4I|6swLtMY~54Wfs|H-0~I5X*L-+k zmIrYR0WvE`s-rbp*B4UXo@#h@@5D6Yehv6Ab8GGcW7<&5Hkiilzuiq54@=ggZ0mR9 z*M(aw85GMO1DCKIjw}%{lZeZnL8`7xk5K$E^3WGAw?N?LQUlrM|6Tg%Wm>};eKEGr6zg~YfV8zP`sZ)@nx$xxU$i4QG1Rey?9ks@MBN}mVt+0vZ9-(#)8&mX?JF=GG5icdv*t!*TL21eSf^YQP1=0l6&^L&UiA3;kM#v zHzsRxgpUlBFa_c^y!1NO3sCCHFDa|tQoyN@Hvc3Nz4429`mC~Rx=9w8i2aQ-dJFaR zC~Ue^Y=u2Zp-wks6c!J4d}>8ph?mrV>;(p^yR&f;E_oxAMw;gRGcR?j3~X!TAwUHE z1O*6$c4!6XeRM`ydEtOF? zBZuB#w|C`Dam;X37{CaM_LQNBeM z;`d4f-dj2;U<#7?2ecR9D!SEScP|vuO+1~~&e=1cS+bs=X`*wXl5#Iwoh`AnsJ+=i zzA04JM*}z0st*-;ZXR{Zx1E2~di_mY{ETvZLQPqcgoT{N$L&YRN(m-2*7XI@ATL)M zpR1v-?j8p4y?zimfsSP>DeXKIHa0IM&J7x7?T^|S5E-hQ{!ts?^b2yIAiFZ4u~G{ho;TQ1m;?4vXWo(J2VdzKc z$l+nR-+HJ@1EVb^=fq5GZmv17C6myK5U>wB_~_3$^Dh1^!7t0yscwg99A#h1*IID6 zNEkVlu0Xz7fwo{bHl8vUDaG9rjmYNAX10>Sq}6PqLfo3CZi_?m1B@1a zCC3wRTr@|=8l@Jy;Vd6n26pNnvG_OU`2KD`_}Lc-c026So)n&Y*b8HdK1Q?IC=N08 zJSXYfO8px2Ua&{^TvdUJ?p;@ZDdoEDV3l{JAS1pxckWf1h=3)-IX>86)mrfnp4k?r z!SnCZuf8V+P|Z`)yXIAv(=wCt9?-68F_=(qg$!vE!lfOzZ~W%HD`qCMV5wm(PzhQt zlh8^bHaa=Acr4bhH!7N=KwqREgwdR~6eVkCiixcBGHBgLeY`y(d3=8WZOi$Awm+^O zUH5)P`%@i$Ixjsv7g4~;x=oIjhUrxMI=F%O^sVzWA~<$14vwxxFF_T6!@**zs^b`0 zXy%DMo;(>D|&q&yUF;Pr(2?S=dXQ3rp21N?S%iC)doUiNl%R1JQd zvEdEdvxy>ldtS^g=>$|dCYYOqH)QZ)EPFQ&T$5lFvR4ThSigG-U1CAGIbJ;&)OK}& zd0RxX$hi&)`M$YJvKJG2j;D}eJzx0^f5{1*4iCOkW!BPK$$@@4TDL=FU}C1w6Ndo- zz!#+Zzda8ZFhPB97eTO7f8THPb~f5d9+geW&k8ls(Z;Q3p8+U#MTV7TQ06O%Xit*M z@?y1cy{*&vI?OMj`iG;1G({RO;ClP9(c>5BQg%A_+Wn*=y|5z{J7{a<+sZ)engygC zj-CbNQlaU4J6{UEvUZU{g<=$k1PLr+K70LYrw7i3vlX*kJZ>4EO?MJyCj)2ZWzV1| zp1gG(SV+>_9r$ts;|caP@D5XrsL*E|m1?$WURxKOJeP#D9r02uiRm{Sr8p#u6dnH=-p`tr)MEAzim*XMusU$(HoI*Fk!u15Iu#X3 zsn5AiK(YdZsB@F=i80wgUKP+yf=(8cPOqVEd)skT_dO@>x8YXuwa9p*j6srI?~!Ri z<(1K7v3TL0XIwi29R`R}-zoH*n{Xmw^iHO`!li7Y&XiX48$ttzwL^fM6{Mu;rKm=s z&!W4LqvOq&Ju*J^gt>jGlSHeMKb-Q&D&xId;ofqsxflOU|T2FVndy9S8IK~NP}50?9(%Z9%_ zf&8+-LYONdiZbS^Kx%^Vkq8PGg61>%>`I(=I-ZUS?G1K3ePvgdi|&th#Ja}Ovc{Ao z9j`k<%e3<_e3+{wX6zp=@zm&=?sZ3&)VN!C^w|D0O6Bf|fXW_P`&{T5g%MSF=6%e{ zf4N!1ezl+YG(D%V@oIu`LVXX8hGzK!fn?4hZ$n9J3Ab2VQR>r$3Lgt>FY*m?YYOeC z?nL4UM?uU_xbD5VSq+R`dG{eY3MuKC^nDzXPnNtvG zNJZj|CsxhiI5AhKu^d>8B={IHge9FSX!PU}B;*URGQQvGG_O;!NV%=bhCtHS0){B_ zD;?4&%W0Q*W94rx>%}c|?sp_R|8Fn2H14R)HAnz0gpG*}Q8ET2-n(c$BYq~_Bu*gQ zPbu?uwYj2~iAiX=Nv(4;tEoW+z7*@eq3T)=yQ^d1tO0x~>f*uWNOkirt2$b+ z7R$*oWOck=bzJZ`)!cx?nA1#MOMa)YgR)D@|3~RT>4xEp1s(X!J}uR?>@;KLvo^^p z^4e|b7U9#U=ZbZOY2u4F1uxA|af)>=csJ?_%`p*&=>>a*r5 zktat8PcIconKgNZq+1Zb3V)h2HJ`=#WqD?V-(TR;Zr2-q^ANTf{!r!-A`7{t2euP( zy}JYWWwq^VmzD)PXa(`cj)%J#t3;x;%QbcDt*~oHsP!_~xYN2?)uEAA0a=WbM6VZv zb4?g`)VMV&WxJ3PUN+=<*33s=k9vJ9sJ(okm*b_o24D_WRDxc`BEy?%mhl%5;0U6c z!hk5%9t{gvPeQO|H**=8yL6lOds((jO61tZh1+Tlm2P*1L?6oAUj`4l-)ZKcAM8e& z&DWtq2b+kh3iaE!QaB;yT5MIbn1}=Cv~0PQgkZv-ovZmHEAgKi;=ipU#(ZayJv2ND z7jIF*3Xzt=zY)h2%cDVeUrFb63|MLvJp?oa#BS1QDdYCt(4uj{Jp8Tg?XF(SrOs7; zm-m*0NaEyu+keImcEXZ=eb{&HrUkk(Z%rl^B)VQS>W`p5ws!Z=d-(Xu-L{J5KD~7` zaqVhPaKlHdVDMPjoJ$2(dF9)OEPfM_##cB^v#FZW&girnXe-@cty6Nc8jiO{0H6mj zaG9obvWSQ~xOpvxx`;+s>+Wnv%f6_0>byI?UvC$UCE->$mVbOsIr5<8-c!!mJ*OrH zJy@--u4ccq>1AZYZAa_AkkCGj4Mjh*$$WOypO(RiI5y1t%tYp0u03=+5l=wn0DQ_% zi1Zxx#Gl2-?Kuo~Bc8&Y0EesrA8HbEp0bw?Q&X8s;7zVVO(3V_(ufPS*!g=Ji*F)v zSBYgdczGF|2(!xg9VGwWB{O@W_4DpX>qbeHE+MCN{Vs4nnhF73Nyh(yMM8qFy_qPa8(Ld7LYkn=@C?Wewc zj728J7Xfblz@In<0(=^hp)Zs$yU6l({KB)n$~sQs-(?2x6xZeiJgs>5x0cV<7Qk*e zbq`H)&lkKFx8M%H51kDD*xDK}{ef6q-GP_0ch>uw`tgb_85K#2`;)3RJMHF8X8L|m ztarR?6W2oXd2s&tiUObndBApj2$Zb5EPfEdYXkq6`!nB-Lag)9bhTHU+)onWLqzde zhwGBeqJ}X>|F*kXFS2oRw=fHDqfaAH2Vp&?#NzLcHa3d8I5!CR36PgI-g`E-wgmfg zujURwa~E9~bv-v7JsWdHazl>bqdC9#!xxjFw;~8j+VJbMNx(|_gG(WAuAA8~Ze2AT z?dF^Q@QaM#mgMiJ)R%okLa4V%{IDV_KYg331_XoIUIW{yyzx_fs^hN>#Y@{N-+4Zn-_^~G zZhz((FY#R${}M4z^(L-Y7a8F%FN6_6zIpvy9)P-_8y1ex(fR3;)WXB-=r=7M&@2}ZU=Gx`Z z)Biu{WzUq7(xJ_UnTk!=V_20%V9PCr!ZlFn?k9KuJAE8fAsZcpPr@Ukn(ltOabc|C z&Q>8TeZ}L-{|9TiR1HHA!I>t(wKFjZQJw>8xC??9Gjx_J-(n`pFiA5eg>VS}hqK_n z2Riw^SCg~L%(2})$cBUeUKB(uPuud)F%fvs8)Avyhl z(AaaLk=RPsg= zXK<@A!^k8a)VPaqecbQabpFAjLcr@4q8=l*_u{+Iel-A?{yZY9HTTS?W}C8n_HI(d zNSHf8nm&*hkuIqPq^Cq(`xNwz-x{J-qVH~7(61BFn!b$L3VgzsM=$b%eD%=`LgVBmlYbXm3O`VHG)u(({+7e)dyMyowlR ztPK?(mmAd&@Gc8tl#g6uzy;;uUZ>$^mtMo~MraQ5E$I8}x}4 zguw+SdbnWQ+VmK=ZS}I8U}Z#q_AgubR0vFoTrMAJ#^H%Ti?fHX2YXW zW;x`cQ9^4xH_}ttw}@7a^iPqqcH4C;^@lz=aIp9xk+%_*Yc~M zhl&_t-YnmJlCMH?+0wKNjTt-oEyz?60eoqhp`?bD0d2A9r9^@h6+q{y|by>(wcatEQ|bp5D#Lnwd85uN2BR!EE8^LzPBDO3Y)) z+wBR_)LpLz$QuSWQG|sUvJE!;!$O_N67&15{Ji>fF2q@VJMm+totK;T)-lS|Zh+;t z2=%Of=ho!;%oB|dcK!4m8bYJJF3_Ueg55Un#wK;spX{Yekls!bH7P1BJ9;Fk-R>Dh^U5Wy*X{e@*8aycPr9 z@yR=+L1uQd&P2oP_@7JM9K44F*uE2&Fw`ucr;6X6r#S|tF5 z1T=FsSvOI0D=M9RcZsAR)l2NIPj=B@D=#Pr;$f+qHinjOD^Pn{(q|!?GgC1gT86kI zR0)};#t8VMGWz9*5cbp192m34img;aEO$CFnO{+t5 z(sTU6e;Bv6lAgQ9JSvY*dxsUoguC0wn|*7Pb_-06jE=#ZHk3VFs>g_hP-iytXr?Fn zh*Xwx-&8R%3o;S*{qLG%WIO3%BtT#lf61|w{qhxsq z)=s4Bg21%atD(V{Hotd1Z(%Z7Ia?N;v;gLAk9Q>PTlfzz1CQJB;}Oc^|9CK%4<2l( zQWxgu6v-HXBDdr}U<<7_RA`M*_Q0O?73Lep2o|^-=|Fzs+YOa}u6t6lo#;TkBnO3M zerB{M4lk)b&w0FW1nI&M+wnekCCnsLdt=i6mXNO6BA$kFTV2SvjA*t&j``5O>-A{I zu9KeuFpCnY6iS3f;r0h6MoNs+v#Boh3X6U0Q?sxQ^l znjH8zMh`S8Ya9seP zvlv+P)G7Eje+YKB$`|(_$#40rxLC=^DKVHDl>We| zm2CoCHGgfB%7eqZY76p`+u4=ebF7!poizdvg9cF*&~bJ&B?QYG*`Mlr&354bCcdmc zh_CejLwtSyAMr)XdGh}dUn4i~H}AdLk;rk5&v}>*3f7LZT#)x)uy>em-tO-$4)y6H zCTrn-Kw8)7@_siR^&R@ay>jrl`cwy%|A%`)G&2tA$p~V9vVt*yWV7Uh!2J4VFX2y7 z1w>9+@e^s4u|Cm`*1$%U62csqWiO7-CyQ`hNtX^)lOiV8T1DSbDyCsgMnDY&=3C&1 zpZtR30Y7v7n?p#26#b>I-1?LLky$P|m2P5IzMSjdRZN4O`ga3a<=J)iM;8M|2JJcQ zSQ+W2f3TZ-dx$0`c-k$>q&Nf^%1|+QdO#}FXV8PJX^yBQdz9y*0StBaD%De_FaO8` z@36CVbqoU4leg-EW@3M7yCj4~-?HHxYn661*&Gk)q5_eOFVg=NDF)X0kAf-9bCxNO z&}C#{O5cZY)EQY83cor&_Xis%J)AZ091k_2v|G76CQ%-Gl`H3h>5bE)H>g*d-Y#H0 zw*$<7Y1*SH{U9=WtsuzH>Yt@c+jk+A*sh8Z3pq`}w^8A`+$Wv!sv->hhV;_NIrUUoIP=xH>)@yHZqL(pb~3301fF zAmC)JguO$;vPjNzYb-XvQHGC?US95h9UNkP+kq~ReW^K^d5CIY10Z*ID(UX`Nxx6N zGylMBwu=cXZC2B<(;}srJNacqLb-e6CV+DvnD?bhWJ-lJPI(3b5{3Ab&g=y;d@@Bd zb|Pt}?Pg^pQm{hJ!gc4GNdlUdiZ1K>lQHorjXUr&hQ|1i|ObMQ0s;LIAUKRIL4FvY0+oN9oZnxwe zCAMXDTioVp5i=&QCD)o|X0&ML?{z=Ho-vl*awtIu4v%XVX%<(#U~>h3z@)6UlU#rn zGUJU{a6xPgJP8WF!jk z0iio3_`Yi+BHkN1E6~bXdO)rf98;0RjrfgW5syNz_K+O*omB&|ex{^ZYV3wm0}R;r z>1s(cg(hxy!Kk*x_|c5ZV6b>7#(q@nUX2vrX}b)daogkow@uoAOSkP~tcG9P;aLmZ zmPXJWIieA=?4`{TrOGY7ix)@7RWsf2)!gj(%dO*PO>KdNUe(GCUF{_|1KuIO81)WS zyD3Z3{U<2u&A*rx`@hO)eY5g(gFs#JJcwkhx}d6F@w~T0qPqYHRsS|>DY>kbTiiz+j(;U*lo#d1E$_f8cP;BTi9y-HV%c(kU(em!QiUObDht7BJLKX9 z2a>!S-w=lByC4%W+ud<7OaaZ}fM%KpWuQ|PR{8O>A?RI|f%i^nGJ2r~{8i@D-HxB{ zm;Cy>A>gfunTw9wiU70B1(SluY}d3tP;giT(D`ZT%VSeoiX>t3^rU^}SEb15i8t}l zu@;vWzNal|W6HfJprn?wr;O}{V`)YuE>&i{+%ieTH9D=U5M`K%V^L(*2g6kzPq&^< zsG_wyB>%JeD>yxYy9uYPjKKR}p2Vtj`9;A{Z~Q$-tgn6I@!@%R9-fEi;W5wu7XSeN M|9@>f)c~FW0H7-XKL7v# delta 18108 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 diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index b7827aa2a..6500ffde5 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -556,7 +556,7 @@ grouped under the `logical_backup` key. runs `pg_dumpall` on a replica if possible and uploads compressed results to an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`. The default image is the same image built with the Zalando-internal CI - pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v.1.6.0" + pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.0" * **logical_backup_google_application_credentials** Specifies the path of the google cloud service account json file. Default is empty. diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index fbac01417..16fb05004 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -145,7 +145,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur // logical backup config result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *") - result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v.1.6.0") + result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.6.0") result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") result.LogicalBackupS3Bucket = fromCRD.LogicalBackup.S3Bucket result.LogicalBackupS3Region = fromCRD.LogicalBackup.S3Region @@ -154,7 +154,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.LogicalBackupS3SecretAccessKey = fromCRD.LogicalBackup.S3SecretAccessKey result.LogicalBackupS3SSE = fromCRD.LogicalBackup.S3SSE result.LogicalBackupGoogleApplicationCredentials = fromCRD.LogicalBackup.GoogleApplicationCredentials - result.LogicalBackupJobPrefix = fromCRD.LogicalBackup.JobPrefix + result.LogicalBackupJobPrefix = util.Coalesce(fromCRD.LogicalBackup.JobPrefix, "logical-backup-") // debug config result.DebugLogging = fromCRD.OperatorDebug.DebugLogging diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 12c8dfc32..1d8e37bd2 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -112,7 +112,7 @@ type Scalyr struct { // LogicalBackup defines configuration for logical backup type LogicalBackup struct { LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"` - LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v.1.6.0"` + LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.6.0"` LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"` LogicalBackupS3Bucket string `name:"logical_backup_s3_bucket" default:""` LogicalBackupS3Region string `name:"logical_backup_s3_region" default:""`