From 7e63a381b5267e67b5d56edc0a38f8062c01503a Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Wed, 1 Feb 2023 09:17:17 -0500 Subject: [PATCH 1/7] update dev dmz kubeconfig --- files/dev-bkpd.yaml.gpg | Bin 1242 -> 1241 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/files/dev-bkpd.yaml.gpg b/files/dev-bkpd.yaml.gpg index 76323ff4aed3499e086c55302714727cd4f52871..b710c2f21dca50a5faf000ef8fe090e0fba818c4 100644 GIT binary patch literal 1241 zcmV;~1Sb210gMBBUMEcj?zk=i3;#pS1&xl!D*gQ5>1$Td?`^gi3?8x2I%slMB-C!| z)~K(4Iw7XJzUB(>sb?A+)=h+sMjCl}dY-eN5}B?)orp^z1uGEgI9dimA9DWk*^P=k zl2pzJ%fRIsM<^Q-8#HwP8Ts9{%_(WKRS5?g=8fvBorCrYPz-UcUT{`6S8=XVzjtU0 z4HV;gK`gF0ge#ED!HG{7YlC#V*{XMKJkeLL{jfd_B6}H`eYN7(!pL>;zjZP^Fa2)# zZeR5|eAnz=Yb^X_N1A6930AMx#_)=p`7swepA_RA0fK>9+O1e!xwYrQKqahX^|^+x>_oJIsXw3|Ze~vH=)(j<%uPCSWoL*iApvh(mk?n@THQ0GA1uc&mlYq29?~6jMSO zOZ#A%Dr87JjVVo#At8tcWO<29y&||sxn0slgoU5iq^s3fI_*97=4NM08U4Z`5|>U64@u=MY*lq-yTpOI(c=}faP5B%yv~~b9$Iid2^?~1RHBat< zpIge9_3nz|G~xrOuHXi(qV?+`yX}VXGiC>1{27RaC;&&F%{t^RHPp2Ch2VT@j5!$m zi3x>dGQgmGXF{Q>d*{NL+2K59e19*nXI1rKYCtg;MhFaRXeqSHd7PbXZ+_B5UedsL z0gxWfZFq!0)UKIaFWud1X~mnhI5dIpCU}r>`S4O15s;MNNxYY-IX5CF@kt}_=g0|` zD6$|AI9VM1Z>t6*13Pbh)UFyW`@YC#=GE9yz4c^uT+d{BR7;hB?li-SE7az0|j`o z-#AZ>`kR>zE5xT^pDqDermO7lqW4bqZ=I;lmjBB^6TIBdb#{)!{anmrnhK3vkQYW6 zSv&C;jc-M&M#_8nNp)!0vWhl|NAZ@!7^GtO2@G^7G}4E7 zpUj7_WiFf|lF33Si}i!`hKj@hHIGe7bCnvvh1y_R)n9&5L4~yag-q}wr9m6&ax4vc Dhy7zR literal 1242 zcmV<01SR{00gMBBUMEcj?zk=i3;#U*9E2C|%yjB!VT`l^q~5En?Z)#KX$ez(xR}CL2zZa4 z4N+?5x+t7iy=qXv2=X(HE`WsbMjjijbgn*xX)>a<`53S$r@^aYS5AiM8J@uxfMw}; zD$lmi4M6pOt4!Jo&oaAMNQF~}oj1-?B2VL3Wjv=_aZaCd1iexJ)*&YRFg~-YYW__C zSS)~B+^^Ei;d_as*zF(HgJNq?0YlnxJc^j7CIT5&^;!kN+E>;3@C8; zXoKf@H})o=H}Ae#vxBlS*IiFM_|8`YTnlN!&H#!qN6h5wMSx8M$bnQ7ugE$$!+B6x zv8w6QN2@>O{y_H(biE_o;A&t7}T;vUwby0MB| z#+}HC?m?Au!s1jqVkeZL*7ZV3Z%6SHW6sE=`NLS@RgB+j@M%97)fYM1*T-?FV5G>@ zfgciJL$*C^vf|6DZNp=Dmqs#F25-dr)mCWJmZhVJ;~moLYe!=~80aC>e4Rx1Dw{ zSZAV@q?7wnYh#w{uO&>^64jiR%$rzCVqE#%<|BJA6u;&zjQsKvX6AC=#P0LbMo$W4vMFV%WZYCKJu&jgd5HPO0)1TC z?S)J<8r3b8*HaIb0)l$(&;~^un|mHwugr*k5s%5q;9yD6J!eJNG%Cs{|8)Q9a9<`# zI*FB7{}saxdI=~#co|+3yp^$<@9DKKbgkZ3#-%ye-i|$~LpuY_QRh zF(K-JVq}3yp?R!?HUB>>ODpoI?28BRd2yfOB@kVh*j#T_E+fuIHRkfWkonwy;njVc z2Ln5KW5I>|4#6tct-6xqcbmEuLjN*P^y~$~K;#tSm;j@Utc|Syh{23_jk!QQxqP}+ EM64%zJOBUy From 9f34b16d9dd39ae32519a237e2b238b71d7af4cd Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Wed, 1 Feb 2023 09:20:26 -0500 Subject: [PATCH 2/7] update dev bkpi kubeconfig --- files/dev-bkpi.yaml.gpg | Bin 1245 -> 1243 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/files/dev-bkpi.yaml.gpg b/files/dev-bkpi.yaml.gpg index 6cd5ec8cdc7624789423dbcd6f5b80dac8816a8f..38692c5b7ddc89db6c123c5bbce5036c703b0187 100644 GIT binary patch literal 1243 zcmV<11SI=~0gMBBUMEcj?zk=i3;iCR;tfWevtxW4+Z!5S{rPmf7zw+b?wOA;TFRso zV21ou5QPA4^byI-@S`8@b1?D3uDo%=ZxFPFGw=(wUiasgkD5ly>O6shty|>I_1ybY zl^hxZVS43=($ol#i#&V9F^|=o#+mwmGfy?kBM5e@x;1c}*Qh9i9raqNd&U+GHp|KJ zx~!bd5!e1Xix{O`F?*&yMPw~O*i~VXUH@RBJ*VNjoCNULMyyYo5#g-0UdxFr`&Gjg zM&wge%&BfO6<~VaE#l+QEdpqb1dx4S?rSTs2sMmFd-+ju9|xuiERa>* z?aO{i2x%K9gx+}|BBI|f8YydG=zH_WX=rK4Le>+Io9QVb_y1UtZ}x=(35_bKnLtW!<;xPB#{@oeBDp`S8l58(fAL0|ac3InG^GZ?UfinEhB_ zxWF3rF3M&w5*$c0!RC>rC5d~+!au+=xv8{T!!x7ZbTU2aQ6krYYa~JmhAQ&eOy(Qn zBCXhiwVr?GS#htqP*y37c03%ulDttNkhTY->x4C`tm57)_d&B0X8!ly3n-lbwA9q{ z>#7ma{;p3RmA_vKPy{1G6gxvzZ)r8Csm!X$L3#ZhkU_IMM!13D#XK_w3ODk3;qdO}&_eTZB{7> zUUjJaX?T2i=(ok0%>$NQ=-3n&*sSTEx{-K~3*sGe7($E3%CErRJ9~8ti$d&_Sw@u_ z83F5Z%fHj={s>PjdCxJ(&$WwO$;30dnJTkvynR4iA=15Q^cd>35gXe=q`(`B&_9k9 zng(!b^{J)Kv0O+u%82YR@`r6Hq9e;bb|@2=L<4t|ul4ao0dlRYX+s zfax@{FQ(Exx14W}O!UW>i|lS$<`vau1$*6qVN9d9#C~ddWhw$RNeGm=bZPrTaAf7+ zp6vJ%uZ>w_8K#19x?9S%%}u9B!i0#Ee&tU(;t~B>UN7Ns-KciiP589Q{m(^*-l8y` z=#@{Q`8SM(PDypLj#C&2rRYs5A^Zes4-*1GtQ5hLjC{PXjL7AWllO@zuNSNzxST+1 z4i&7HLM#M*ZCVz)(eE@dQN~7Fcnz=d4VgibN}Yiy1;Y1GG}GW>rBrUfZTZ>&(qa%; zmKG1JOWrk9?~a?iokm{^M&$ZuTf^wx{TW)4 FM_s9VTy6jW literal 1245 zcmV<31S0!|0gMBBUMEcj?zk=i3;$$Cyf3LLVor&Rvg2}Tw(&@X`l|vgsxO|VU3~85d-gmN9G>qN`qcPw?32l9|MNSa3FJ)w`!S}BGBxUDF1~G?Xf%rA zES?}?InxuIdm?2PFoH7_{Rj+}L5lf*?!!yFx`F!4@rb-u*+awtn{`(YB`MXfjP-!X zPP{;Lf2Wn`&LYneM?jIR2Hj@3tw3`Dr!-XXee$lTY2QRgzK3!e@`O49Bs`f+85`B2 z+jEE%#@itfhxIesf%sNa1bKOCJ(gj0FcynIK(z{7Gq=mz)SAbo^1NTAvjK z=V%V(6>i@d?|b3J4PWuw$FCO&5axO|2IpY=9N$erHBh({_u7LK{|AKv3TnKZH7<7EIPi_9$LIKdK$y9mqwW~;D(0# zV*&Tpjg(2%A;{m*BgcMQ?_Am`v=y7_UY3iMUBV`(TE@~ASFer~>65#>=CPOwwYxzoS2`?VJE86TiKnKWX8u}KOV z;>ZoK>+AbZ*hpxCi+*ZVrUQC8dveE}dit)e zaYBP&5@^5v;TmlhN7~vuTy~5Zf%GW4x?q%S!p1TdrD$mxrvbS)8OmHA(lV4GU5;tPi=9|)Wj>tDooCMohVYLu770;QRp?X>YD@XUbCsheXbf)H&m^ zyiQo5NIVvx&zm>DYu|Q-%gCgZ2UdvlEba+vk#`tmt`q7t8&U2(6O|8H8%xh%eew(z z>jG|uM4lyrBafFcvJMk{&m4HL6MUy~Wj3znUFfAZ%w3r|*YOGs>CN4h4bFckFCM`u2`w)Q5{h}+DOx92??>kdo1CsPJ HYlqSBcRXBe From 82662877360f9414c352859827bc77b872456828 Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Wed, 22 Mar 2023 11:25:14 -0400 Subject: [PATCH 3/7] kubectl version in action increase to match --- .github/workflows/dev-build-deploy.yaml | 2 +- .github/workflows/dr-build-deploy.yaml | 2 +- .github/workflows/prod-build-deploy.yaml | 2 +- .github/workflows/qa-build-deploy.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-build-deploy.yaml b/.github/workflows/dev-build-deploy.yaml index 4b722c1..64e441c 100644 --- a/.github/workflows/dev-build-deploy.yaml +++ b/.github/workflows/dev-build-deploy.yaml @@ -20,7 +20,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Delete run: make delete.dev diff --git a/.github/workflows/dr-build-deploy.yaml b/.github/workflows/dr-build-deploy.yaml index c873f59..6a97ac8 100644 --- a/.github/workflows/dr-build-deploy.yaml +++ b/.github/workflows/dr-build-deploy.yaml @@ -19,7 +19,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build diff --git a/.github/workflows/prod-build-deploy.yaml b/.github/workflows/prod-build-deploy.yaml index 29efdf6..0bfd5a2 100644 --- a/.github/workflows/prod-build-deploy.yaml +++ b/.github/workflows/prod-build-deploy.yaml @@ -19,7 +19,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build diff --git a/.github/workflows/qa-build-deploy.yaml b/.github/workflows/qa-build-deploy.yaml index 5a2776f..63cd1dd 100644 --- a/.github/workflows/qa-build-deploy.yaml +++ b/.github/workflows/qa-build-deploy.yaml @@ -20,7 +20,7 @@ jobs: name: Get kubectl uses: azure/setup-kubectl@v3 with: - version: v1.20.0 + version: v1.22.0 - name: Build run: make build From c2078849951fec8ff5cff5bdacdd2044397fc5cd Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Wed, 22 Mar 2023 13:34:53 -0400 Subject: [PATCH 4/7] add runner labels qa and dev on qa-ghrunner, prod on ghrunner --- .github/workflows/dev-build-deploy.yaml | 2 +- .github/workflows/dr-build-deploy.yaml | 2 +- .github/workflows/prod-build-deploy.yaml | 2 +- .github/workflows/qa-build-deploy.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-build-deploy.yaml b/.github/workflows/dev-build-deploy.yaml index 64e441c..dd25db9 100644 --- a/.github/workflows/dev-build-deploy.yaml +++ b/.github/workflows/dev-build-deploy.yaml @@ -6,7 +6,7 @@ on: jobs: Delete_and_Deploy_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, qa-ghrunner] steps: - name: Checkout diff --git a/.github/workflows/dr-build-deploy.yaml b/.github/workflows/dr-build-deploy.yaml index 6a97ac8..5bd8fc7 100644 --- a/.github/workflows/dr-build-deploy.yaml +++ b/.github/workflows/dr-build-deploy.yaml @@ -5,7 +5,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, ghrunner] steps: - name: Checkout diff --git a/.github/workflows/prod-build-deploy.yaml b/.github/workflows/prod-build-deploy.yaml index 0bfd5a2..0f75ed2 100644 --- a/.github/workflows/prod-build-deploy.yaml +++ b/.github/workflows/prod-build-deploy.yaml @@ -5,7 +5,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, ghrunner] steps: - name: Checkout diff --git a/.github/workflows/qa-build-deploy.yaml b/.github/workflows/qa-build-deploy.yaml index 63cd1dd..3955c86 100644 --- a/.github/workflows/qa-build-deploy.yaml +++ b/.github/workflows/qa-build-deploy.yaml @@ -6,7 +6,7 @@ on: jobs: Building_and_Deploying_bkeXtest: - runs-on: self-hosted + runs-on: [self-hosted, qa-ghrunner] steps: - name: Checkout From 8e6ddf7159d714fa7b127e1493d3b586911bdbca Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Mon, 22 May 2023 10:01:54 -0400 Subject: [PATCH 5/7] registered in blackbox: files/robot.dev --- .blackbox/blackbox-files.txt | 1 + .gitignore | 1 + files/robot.dev.gpg | Bin 0 -> 1028 bytes 3 files changed, 2 insertions(+) create mode 100644 files/robot.dev.gpg diff --git a/.blackbox/blackbox-files.txt b/.blackbox/blackbox-files.txt index 1b3b662..52f78d5 100644 --- a/.blackbox/blackbox-files.txt +++ b/.blackbox/blackbox-files.txt @@ -6,6 +6,7 @@ files/dev-bkpd.yaml files/dev-bkpi.yaml files/qa-bkpd.yaml files/qa-bkpi.yaml +files/robot.dev files/robot.dr files/robot.prod files/robot.qa diff --git a/.gitignore b/.gitignore index 820872d..c20c3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /files/qa-bkpi.yaml /files/dev-bkpi.yaml /files/dev-bkpd.yaml +/files/robot.dev diff --git a/files/robot.dev.gpg b/files/robot.dev.gpg new file mode 100644 index 0000000000000000000000000000000000000000..93f1e7fb74155299d969e83a40b7039e9cba553f GIT binary patch literal 1028 zcmV+f1pE7i0gMBBUMEcj?zk=i3;rRC4A?;TUsK)~FBW_Vo#&w`qECt9-ODw###Y@u zU_ht&iaQzckwTNVe=D{plrL8-XxPmrP8(#NAO_1`myNCQ8gre=r(0g)bliB3lSbR~ zO;p-KZv^&5r}teHoJ^{4fU(wVK|=&MWm=H-ppyJpkzwp{rx>c$s@PQ88_q8kxGM+K zBm4`+csiuL$PEI;bL2aA$Kzq>9L5>iJ3L5U0=JaBwp3WJ;iXExR&^^F=2qXJ1Ow;v z#~iih>edRlU2!f&I3k*xWIbYPUsI`;6;*_dyd<-Lk^{ztN+i&Y48d(Zu~KAf`FCWE zi6uc<-W%m%(&_nYj{pRJ666_@K5s2Om~;Zmm*@-OlrviN$(o60u4+uERTc{b*Qse1 z#5BG>H4S9a>*F68E=(5rC3E-mlosW-8WO2uoWmlW-Rx8kIGU1$Cw5N-zwXAIQQ1px z4sB?8aCXOT4UzwZ4NGp3igo6SXvJQ(kijD=e4{Y{4pvd4CaaUsuiAwI3DKV7UiwXTAjmW1s5QZG#uqWC2CQbBx0tK8G5{d!T z^B)@ks~`g%auC9Fz>Qt!spG<_fEpb!cufyLN5ZGUqJy6iU%|m1E5eRjD8lU7bDpT? zSW^5x(t(IZs}~0|5JJ+K26C)gzkdSO^qgBL&;k}R#~y7wOpE6J!IcFb0_U__@F-0k z-*=R;B#h?oKe}>?7gdZwU-;d72b&R6ZWo5Uy*+lOm^C`L-mwM@U-}=2F1?9w^W(jx z8hf5z$W7iJit@n&r}F4>hkeaga|0j6mk6pka}cN}Q{ zvuRbA(jwrFv9Ka(m<#9GyM>DzZ&x!)n*nu~{pI(H3p!e0GcR`RHs&TMb{M-wtH$KK zL&C#JnewOiZI}4>e;=>kUvT%p+{FGC{c{GnS7A?l7NoTZ2R8CB^fOGewwIMQSR z1dYA}^{9i*|E~_QttfMvbS*eBt+>!~LN5-xD^*37d6Wmjk=R(6B0Ilp&sX-rFx1Ii yWpIlWV~^wYXY$==Wrc3|&U9ZT%+6U3rKt$4T7nti{a=Y;uh9R&Mzouon}S9lSo*sF literal 0 HcmV?d00001 From ee31470516a3db42db9a15a416ad99a86c62a22d Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Mon, 22 May 2023 10:07:01 -0400 Subject: [PATCH 6/7] Automate DEV --- .github/workflows/dev-build-deploy.yaml | 6 ++++++ Makefile | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-build-deploy.yaml b/.github/workflows/dev-build-deploy.yaml index dd25db9..aefb821 100644 --- a/.github/workflows/dev-build-deploy.yaml +++ b/.github/workflows/dev-build-deploy.yaml @@ -21,6 +21,12 @@ jobs: uses: azure/setup-kubectl@v3 with: version: v1.22.0 + - + name: Build + run: make build + - + name: Push + run: make push.dev - name: Delete run: make delete.dev diff --git a/Makefile b/Makefile index aa07eb6..101e811 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,14 @@ decrypt: files/bkpidr.yaml #build: @ Build bkextest image build: - docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest ./ + docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest -t harbor.cis-dev.brown.edu/bkextest/bkextest ./ ## Docker Logins +#dlogin.dev: @ dev docker login +dlogin.dev: files/robot.dev + cat files/robot.dev | | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-dev.brown.edu + #dlogin.qa: @ qa docker login dlogin.qa: files/robot.qa cat files/robot.qa | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-qas.brown.edu @@ -46,6 +50,10 @@ dlogin.dr: files/robot.dr ## Harbor push +#push.dev: @ Push to DEV harbor +push.dev: dlogin.dev + docker push harbor.cis-dev.brown.edu/bkextest/bkextest + #push.qa: @ Push to QA harbor push.qa: dlogin.qa docker push harbor.cis-qas.brown.edu/bkextest/bkextest From d05f6a65d19fdd427312af429c305eb11e014dd5 Mon Sep 17 00:00:00 2001 From: Tom DuVally Date: Mon, 22 May 2023 10:08:06 -0400 Subject: [PATCH 7/7] dev login typo fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 101e811..bc3ca9e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ build: #dlogin.dev: @ dev docker login dlogin.dev: files/robot.dev - cat files/robot.dev | | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-dev.brown.edu + cat files/robot.dev | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-dev.brown.edu #dlogin.qa: @ qa docker login dlogin.qa: files/robot.qa