From 5cc657e5a968c34252ad3c96149a4819bc2db228 Mon Sep 17 00:00:00 2001 From: isindir Date: Wed, 23 Mar 2022 19:50:37 +0000 Subject: [PATCH] fix: refactor to make code cleaner and bump version of golang and envtest (#102) * fix: refactor to make code cleaner * Fix typo * Fix typo * Fix typo * bump k3d and k3s * Fix typo * Fix typo * update all components * Fix typo --- .circleci/config.yml | 36 +- .tool-versions | 4 +- Dockerfile | 4 +- Makefile | 6 +- README.md | 2 +- chart/helm3/sops-secrets-operator/Chart.yaml | 4 +- chart/helm3/sops-secrets-operator/Makefile | 2 +- chart/helm3/sops-secrets-operator/README.md | 4 +- .../tests/operator_test.yaml | 8 +- chart/helm3/sops-secrets-operator/values.yaml | 4 +- controllers/sopssecret_controller.go | 543 ++++++++++-------- docs/index.yaml | 138 +++-- docs/sops-secrets-operator-0.10.6.tgz | Bin 0 -> 11265 bytes go.mod | 12 +- go.sum | 45 +- 15 files changed, 433 insertions(+), 379 deletions(-) create mode 100644 docs/sops-secrets-operator-0.10.6.tgz diff --git a/.circleci/config.yml b/.circleci/config.yml index 20bf6bc5..486d0dd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,15 +17,15 @@ jobs: image: ubuntu-2004:202111-02 environment: &versions # https://github.com/kubernetes/kubernetes/releases - KUBECTL_VERSION: v1.23.1 + KUBECTL_VERSION: v1.23.3 # https://hub.docker.com/r/rancher/k3s/tags - K3S_VERSION: v1.22.5-k3s1 + K3S_VERSION: v1.23.3-k3s1 # https://github.com/rancher/k3d/releases K3D_VERSION: v4.4.8 # https://github.com/helm/helm/releases HELM_VERSION: v3.8.1 # https://golang.org/dl/ - GOLANG_VERSION: "1.17.8" + GOLANG_VERSION: "1.18" # https://github.com/kubernetes-sigs/kubebuilder/releases KUBEBUILDER_VERSION: 3.3.0 # https://github.com/mozilla/sops/releases @@ -41,7 +41,7 @@ jobs: # https://github.com/git-chglog/git-chglog/releases GIT_CHGLOG_VERSION: 0.15.1 # https://github.com/docker/buildx/releases - BUILDX_BINARY_VERSION: 0.8.0 + BUILDX_BINARY_VERSION: 0.8.1 DOCKER_BUILDKIT: 1 BUILDX_PLATFORMS: linux/amd64,linux/arm64 @@ -235,27 +235,17 @@ jobs: kubectl describe node k3d-operator-server-0 kubectl describe node k3d-operator-agent-0 - run: - name: make test + name: Unit tests and envtest integration tests command: | make test - # run helm tests + # helm tests - run: name: Test helm charts command: | make test-helm + # k3d integration tests - run: - name: Docker build - command: | - make docker-login - make docker-cross-build - no_output_timeout: 1h - - save_cache: - key: v2-modules-{{ .Branch }}-{{ checksum "go.sum" }} - paths: - - "/home/circleci/gogo/pkg" - # tests start here - - run: - name: Run Local Tests + name: In cluster integration tests command: | export GNUPGHOME="$(mktemp -d)" cat >$GNUPGHOME/foo <Dc zVQyr3R8em|NM&qo0PKDHTim#^;Q85qg|<2O5?JhhBqXzacg`*sdKfkY_<))D&dtu( zsNHI}2HSEZxk+c3{oD7`%a&jL00NUa?H>}_ma0mns!~ZRl^98w%aBhIXD&$)g`Cj# z;S^Ht&0!S&?FpVvr_*`+=8gQn)9IA|@4R`p|F`a&UiaqLQPv;V>6G0qvh+{-$c@#k$_5o%% z9%K5yQ-&z>*u;wwcL0cCgtCv0`c+Q@BPsQf1UcnAVf}VHzJ!e;#}|bti;IkaIK!6C5H@;0XC4qzKF)#c&iN z1~>sD1QN&?8Uq}20_G&8fTJi0AxF$}oUJDv)pj0u&3P5f~FcjZn;`{sNeC5NB!9jQj=d40{jQL4{ z{F4}S;1g|~n;Vgi(wL_UYgsf;hz~=z*Xi{-ue)y-)>_^K)s0t*aiZ^K6;*peNdyv# zXId0)5w*xxU3HO$p|0HrAAeQg&S!{HJVs24jBCVcEM$TTNl{~qVukp}ROo|NYYB*u z#6bzdBn`s~6b0rWj){_9qe^f*Rzhxs1SDh(UimNQe(r@NI2C2TKSHB4*kc^} zx7QTh@C!*HnISq7sx}ueHF6IeDmgW% z#)1#qdte*K6C(acg6!=*fgQ$kF=C(qQN?QT56}U3Q|wQHPbft!A@Nwsf}b)@A|RoG zP|(8!cpUo_K_(iPQR4trpbrGfYC9m80}ULJ8PdokYq?-8lf#S;6P^k&%Q#k~e#diw zRq0frliwU?ieSj67nF>IZ>rH>Po;)Y#F*q=B0d8Yj}wAp4n|nD)6$Pt|GUn2-InN> zgiziG;->+3if1SmuoRqv9ESs!%w<+lV;Ovc&UUdLd# zL~x83prGda0vxp{x*e^A#}~)-3g`q$F2pAjaKmYeZou*31yJKBxWi#6giLh4^iI?` zKxTMsv{v?UB#ajt1IPf1XPA;$YOrx$>db^hdIlre?aCBNltKn2HsC7sMB8#;I!qT7 zc3zk#mLOj_6hMFK_Cb&Y-LH$JCz13Fj}I@v`wv%5eD;%!&u794g>WPkOSp)I!3Q#i z1IfGRW7*6<@O?FKA4=svlT*R%ZCf$|Kk+m@H^OgKqOu3L@MD!6L@AU0T?Sl8gOa7f z7-xtP#t$TL9uiol!^Upf3xV)d(PzxKutFM$c5}p=)lnHB3R%`%<0yO)cK1D+|14Qo z-=k0zQhj;f}L=BiElq3`jCDP8w zy7Je=jzdc>UKxh&X+|hI_OhPZSsoivFHvM*4kX=pwFDbK|E95xT_a@ z4t}{BULCz3o}M2Z4G+)HemFUHwt#AMAGEs0U(Q_+?GmtjW?uSoa`?- z9}#Nti|GFphH|3dlPE&5n%;Aw&Hp?bda~M5`#1q1f-|HB4#)r$D4CB*sx;1@5}`g~ zWE6UtGDJPKS^`5xj30^^@TV~L)&G<;(S3l#wm7P;0U_o*R2DHKWe>2_p9=IJaE!%# z#uKC5oTOk(z#WVWEwQSlv1%=s#7#&Tk~<-60(vOCv^@aFzX@~1rzjE#V&o&nAf4~Y z_EQv*neyuWl!kLK($27$nt|<{)!Uv18ey)zTLAnd?SuVJC(^$o6v?T-|l(U^?Ul`d%}y?#nDpC6K#qtE%QcOZu& zQ2N|BPW^OpBruCUghC8x8XvHqn3y7UUw1m0CwE*|?wFD^DHWVB5Qx_f0Fzc+T-uOJ@mgT*fZ;DNH1pSORhssqG(jZuU`JV@emapR9ee-6s{{I}$vi=`VQJ5gg zJf1vwD`-jo_ujpJUF`o}r?bE5|7UrA|Gm8nW;p5thPd<%`8+}2i@6E(r>GBh+kgDw zh*Hkrb0U4Asamx*vw7*sc#baT3J(g$2(;=qkwncFaPzX#+wxSvft<8>KPxZRUJwWO zVpxfN@bYG2)1+)=w}B$7(rHdOK!u95e80G?$z?I=d2O<-99F{*LFI zOaMip@B|eQ?YC-oP%m^8XUWRj6vS(4S7fx=Q^@&)CmCwcMyua97<^G4mh`o2iGD1&#<%l`8k(Q%ZOSR`9kKN(5sVps_oe7ilt!H>JK=$^I`J|K*C| zP!)J+JjjyqzuT#d|J`n~tdTLwvdhh~Id~NlUj9^B>Dv*qcZ=h3UoVk5 zg}Ab=6Cn=Aki&i!!L^QRyArQ1;Q(!D`p$9~#>jZ!9^iP4Vh-L2S^)syNsLZCpvAUB z1(uyB@KcH$#wm`2Bh8z9HCt3HaNT@TSo1~dO2KU1*eYn2qZ*S~dTG(zJkRhf zv;R7LVn|7dzLx!e_pV#9|GkazelNN1UA8+Yt8mbszm|(f2Di@hu;1fc}IJVm%!xplrVNpohZRP+O zJ)+-j?`~J2wOZB6Y85(y36noH#Sa9gYquGPJS_nUH{^3U5}1jK9r^kg>ckJ0z&dwd zzLvuf3DG5*2rg8I%17Wf)?-00EcEG@>3`rSkDUE4_y4+`x8?Q!{odyM$Fn>&^M5O7 zt~mRbA09XNFPR$wu|AS7*Q~;%byDnfMvx7e;t2~Z2XbqdlF&^;7^A-V z86xU7Q~iV;^^mRtz(}5IpA676Y$+ci%u!X27Z#XgxLe1_3KNT`^v)itf;AElB!NBO z)0D@UACmk`zM#5andFpnR%+anye*>rmkY`ebr*H3_ZNx(vc9XNAY2FpX`ioGT)5$9R$9FMq^3~gtSve+ad8`D9x)1d7)MjNP~iKZ&l9DMu=1FFF!onk%wn9I4)?p zuByviQODIlzwh?mc^$9gbyckby)D;O2YOw34z^g)HX`=1UoRn)myF4lIeic!I7Spm z=M|G!hUw>C63`s+RB;>!D&|mz45FCn!`Bo6%m9hQxjbnNeU4|S4otZ*3cD+@S6ZqM z2@A30!$}yRNSM&{Q)&i`@*M zbY8mzs$`a|%mWS9spYzPAse4nH4!?LM}L*^RW!z&+m=$)FQ}gIyN(erzSLO_KwAml zm-0tKiyof*CT;pO0HaCUuiaC%iodad))HcOusaw@vFx@TfhdG^!A@sH>A zyjbXV271D8g3y3^CJsG?#ktSwvIg#q5 z^9vJtWp-%tXMw&nIKuiMca!`yIm1uWT8}lVhSl1<;CnQ$YuZXJHYe&I*iuzMWy`Qa z)t8b|2wEwYEiEnPhpqF)ux_uiX7z;AWi?gKD67!F%82ByHQiN|l&9ro982t`eHOm7 zQMasWwlliM_Uj60SE*jylx+a|z%ANF30&Hxb;EZKX_ZTd_ z1}wIBfue-Zk1*AF5gM7b+WNsFBeJ{!byl#Jn8KR7eWE`vRygPH*n+WWt$n$ql+poI zrKTpGfO@Qi09J36;bo<4*4a4%merNT?8=iBYEH`4ma{#}9FT8&nS23{Wp@FOmAoJ? zWoI;a7`B(*YW-6_%l7~E9?wt@XAcSkSQh{J=3S>8|G)os6aV=v&l>UnS!6&dax&k$ zu4r;`-_nESz2?F;x3%Tm9BK5T0SJFVV^XjG-V}uq4q`&l6W~~;|8L9jpF;g#Z}k5; zo-J?zIY(4w6jEId?xrXPqZEfSEo=h)TNoggB>-n>k`T%nU{e%^APC7wh1cLX*aH-W zQ0_L!)$RN}jK|Ivh*6-j@x4kYn&8hSTk(I}(J6dMENcpqK!T{uPvtq@(be#Z6N;QI zpii6se0T-Mm@>x;FmKC$75R=g`a;|CU-M!bw8cN>C!59X9MA~*w`rpCqB*-ByGxv1 zZv=0hU5`hJv-|&?E$}m>n4}Dx91WP`C6xSzeC~L7j9^=pqvSWon=zk^k%TShLe8g8 zpS)cMj(l&|+4Vks`sD0-aO69?-V8_12Y8DF+84AY_4- zURnP;-Oc?U&+=?FT%O^qeAS1uwFRzJGV?<+Mvk)!{^vvP+xUlsbbb0CN0*0(V`eZ9XI&U3Q`jBm$ESuq9jkPS&fkF; z^FW#e6pj&aT^SV?h7yNjL_O_o@P8cuT(?M-AVTGC^z5vRH#awq^ABNQDFQdu0yjD< zsQiE#(hZTh`(zr>EHNbXeYxRHz+p(zF?j#sO0fRmmn)E)Xfy^h48hGUhS811Hvvkf zezP1hLS@;HCkGz@C845&S}8*~#dZwdK5lw^N2_km50F z>x6`^24z;pTzRB;%A;_{*_CNiqve2}w)iBQm3l!OXIr7S(N@ssB=JhNmJimA4I@|AhwXMbH32OC0tF&y?+S3I* zPemO4p+-XCJ}kjkmsVQt0KhD(waKk4;|e6)2Z{4T1=nQUmG=2Fr_g4zwoYP9vB-jX zMs#cv_{Q5DOyNvjjR8X$j8dwhBm(lRcK*FOI7zuo5REWnCS$D76`g5Za$%5N!qz^@ zje)R4N-&g#zB<3SD&~2vwP+Ffg2NEX5o60-?-mEHG_pF};1Txz9F2M`Whf{}P=LVAEt)frf95wz)as;Olc@%} zyn?d}ei4&=CH>-?CC@@iZp^0fjlL&AWtPS=wRD{q0&awu3=fV6!^^?p$;HXw?E30P z^6#d&cVt17zK%_n^8=xPq6wlX7M?UhebMNT!c)p`3r0zZsN6EaH?4lFwb!yET+|zF9a?>v zeSEJ~9THVJ6KN!VNs3mv6C|f9PaJj+)B#~ZUaKV_J>o`<3WDq~aXpgdmuy%N%~r*| znCFB7l;n|sw!#f0HlS+wM3um2zEr~^FH8PbC2IBCQY5@A80cPI$#D;EKK?3&W#ub6 zB%GQIv1Q8ExB^dt4E&^|8LLXZ?UYvEmdoDF^kW^0nfnK^gYa zDgH9vXSgb@;0WW{@nBo3D9a zS%%+492J-sc-eW`+KcITzsqF>&T8>bZcG}rwskS z2RN3i7oBAZu%2~xiAF7L1l|gU3U)F+S9iuG3 zS-7BB2R<7Y^7EGkfF19Rw_jILmNfP3quJ#l?;*FwD#&%`gqygw>|)yz#3uf!1JunB zb9NODKNnzFH}7`4ubW{R4(4Z-mKe?i@@cCdr(q~%?tyo-N}T#URt2Fv8rJH!#HiBR zYsqt5t$s^P)`g)ip5AKpTk^V1WwF=0&-ICKbNw23x!R1%PR$j1T5?IWeXUzw3vktm zx}pvXW*eyA*0ryNrj^h76&k4or`XCTxfE8C@KB$*=H_Vy&yIy{n3S$`PnLvMN%B#K z_k{ORON51hv)o@&F4FztTc;ENJMT+29LuqI?YrGIKu+nTg<^u8bNP7P=|~wdSFY7o zv!bi3H4C@8HCLB`-PPJZ)zof`m0U{=Ywl;4@a?GTa_6mlu^hN}9CLFlg8npLv$M8z zZ(Nrl4sOx>d)d7o_p(2Ky#bI0sk)1hfE&47sTV76Jn#dd=6=aN$0=;5?g0q?dGO&> zE$6Excs(Idp0?R^(OU${R9j1m+8|}qs=KM$1uHDVs>_T@bo>MC?q1_$cefAzNm2>O zY@`_V{%FbZudl2hJAd*>(fW`UJ8s6xL~KRQur(sV7sr3?zkU6>od5Ine)rub{_8m& z*L9s@4mgZHa}>)h!)ktaY1%LKsB|QwQsgqfoxiM-yUfb*6`)uqK#;+uh!*a~nRUGH zyp99ZvH&LWHI5MDFiQGB%q$!`CyJ56nsnJFSy!OWz|BFf?7Y;xYrWA(#QrdB#T(q+svP#sgKH)e>LrCpP4gkz23F?C^Q}9^j@n(j1E*PVP zB42obR#Fwk1{2Sw5cpFRW$EKcg5raVlb>H-6P^*F9;Nm2M zl2BnOI4&OTw8W@z;In{pTacyiJyQ2WF*9or?}VePXpoCVmh+3w^^N1wA0-T68!xlMgk?${20N!pp(cbw1$`ol)k#a!Rs_Ebjur zFdR=1Rh=l8R0PayAxsXoa@(T>l%=BxbCz8REEmfTrA?7OtjZAQfs+^M z0fN)a6^vc23(Dyn?ZS#{_L)eMum$~PX{iBQObSw~jN(yuciqma2hj@%^afdZH>6St za}-r@)I)n8u@jD>OvAH1I28){9?gyO=3CqPHJ}A>4slo(y~Pbzk6uk5!b-lETEfqj zG@HQ(=!+ogo`zn}9~ApdIG5Iy#{Hp{C4Yx04OeP%-t($oe!4t;FycDPzjFNs&9Fa0 zO5wcpO^Xg151G88aEYMndkp0?I1d1^70g(>1{!MV5By|!Tc;QW+{b?MWGZ&-C+{P6 z1UW1ync36aXxDHz znO=;1Xh*_3HcTj);PBzr@|%?52g+Xv88_>kO9b&0GXB9ViHb(51A&&Eyn{>v%vMg< zF_;moX?lTx575_>Cle^S4*VoYmcYL_zIYNXy9knsmI>HTt6|@ylmalR>4h3{1;2j4 zae(Lr6%zv;Bp{50-tw_F5+;N;zy$Vbh6hpnK)q^odoZ0b{xwUdK0=q}idg1-nf(A=UQIzw%vp||S&<=mU}{Z=UDYJ$ z1uN@r-u!Drki8xe!9vHx$qOR{} zNNuA=gf>}MU>_vN*Ck4~HxQq-eG>a9;qs4sP|~R(+goIY=nSJfmrTr3{m%A7`>K2& zL-F~#y``?-_&PGUXxdyL!VX2NipnBIU#ZEmz)GT9gM6MK&%~(9%bLT5D`OFasJs+HSJ<;)oKSi3g51AXuhLN^N2DfHrKWQW_DC+wACfSQ;%tLO zNS?|r?5UbwgcyT?=^(XJa%JvF1$9EPe2Yb;eq6k_Mp1y4ZLM93GOO&YsSI)?VGTm59g9Nbu$W^5A5!5dFo3zV0TH}KIn*?U z>Rf95G)X%n=A6OmOKY1w#?2n%+I3%Sk8$b`rLkEeCqF_q#Xg~lPFPit8TxRU`O%l~ z3IbEX^(PUWuPOj24seWy@>-#X!nj5A;S&s3`YhsRuY0rC{cYM((%j}E&wsfBColq+ zq;a8iv$4L}Sht^VR3$bW>;DoP>(`ro_07KeW?#MT+3c%t_SGBd*zBus_SLP5>+Y*x zztFaN^Ju4cw3oR7IVMFFDDH%p+p?;=^DXb}7dG)SHu1}h+-&04 z71(Uzuil8wCVq+DzovV!*~H&$;%_$bH=Fq1{wDsoY5TsgP2UK5vwi zoW&NQhvu{w5scD}{sPZx%;`L|o${If})EndEKcJ)91Q=k8zBgR?V{2Yp(YvlVcKa2DKzkc)fO|O*y zzw_p8XOsW`IUd(_9hPD)l)8E)y1dYsIfWE&ZdOo=gyYCEea8V{3%~@+BAEBhE+CUv zS5hiGBcaXeBBd+_N-8#F3{jpL2Nz)Wz7(B9CVlHdAFE&FlZ3Tr-K^{svLk(q zdBLhmKSGRgvI$n}O&p0NS^MyziZY23H(zWX0;xA*$Z{saGddWn26Ws1kyT3JC& zS%UoR!n38kUk%3B)n0+kGuXTca({YSR=1~DtL1vKm|(*>uh~Yt1kviz6A3p7VT}6r z1vK?_r9A07;ue^AF_f7bpRCerc6FgU7qbrQO8BL% zsUyE`O8)RBqvSsSv7P)NZoA`-FW+y?Z^PkT9dv_u$&eEZGGlgQsmCM-uTI>T8AgSCSB9uBJbjh^P}O}!G}TNqptA-B~djlXo68V zzC@F{xG?$cqGroZ@<;Op9G{;bpALox7Z;}|hX>au=V!yi%fZp$?E2*3^eSJioyZ|t z4*&p;$81SegW;uyZxqiyc7I*Wc*XXmET{@~b-ZuiqPh1QBXNnnXFpvW|9CF@H0NXz zlsIWhH8Sm)M&UJ>W;JXHf097)M4h;=C}h!I77JO9$sR}CuheEez2zA4Jbl|gS8n~`k?g9 zAUHTXzy5J>Ia~!1j0vA2x;D1IthZT*x`~lXDOfDQS`;fh&!2diFn~3>{h6q3lBhy3 zB8kmRvrgyGXHMZDo&hY+l`mI0Q=zPC2fthmua4diPtOmIhKJ{8Kb++3(7s=*+xpiN z=tX>~a3@>0)#qXICEV;NMcoFn2`R0X{)%h2IYkX4c^x^z%Bw^G)%C>6X%PTI9N|*b zc9Ql%x6`o$f+G~kZH8{|yAL>fZ&D<#U;D}A)9$olZx=+M+R7$cn_Jt|;?*H#aeit! zWs#s+rJhv43}zKOad^>0iYB92;+d8bY=n(H>e?<-;~IRiHw7zb=A zr&LsAh;xtmR~ zo@T}NrMX&eP8KS)MBNJ|o@o*6F}x~mimbz>APKr_py)jeMXwn}zMGY?RhaQ3Oy%j# z