From fa05e20a6acc3cb413bd233506489ff34ff75fd4 Mon Sep 17 00:00:00 2001 From: Sergiu-Alexandru Vidrascu Date: Mon, 18 Dec 2017 10:51:03 +0200 Subject: [PATCH] DEPLOY-276: Updated Readme to address review changes, updated requirements and notes for AWS usage posibility --- README.md | 14 +++++++------- .../charts/nginx-ingress-0.8.18.tgz | Bin 9411 -> 0 bytes .../charts/nginx-ingress-0.8.21.tgz | Bin 0 -> 9627 bytes .../charts/postgresql-0.8.5.tgz | Bin 6803 -> 6847 bytes .../requirements.lock | 6 +++--- .../requirements.yaml | 6 ++++-- .../templates/NOTES.txt | 13 ++++++++++--- helm/alfresco-content-services/values.yaml | 7 +++++++ 8 files changed, 31 insertions(+), 15 deletions(-) delete mode 100644 helm/alfresco-content-services/charts/nginx-ingress-0.8.18.tgz create mode 100644 helm/alfresco-content-services/charts/nginx-ingress-0.8.21.tgz diff --git a/README.md b/README.md index 633e26507b..9abdc6b4d3 100644 --- a/README.md +++ b/README.md @@ -36,21 +36,21 @@ Build and start Alfresco Content Services Community using docker-compose or Kube ### Kubernetes Instructions: #### Prerequisite: -* A minikube k8s cluster up and ready +* A minikube/aws k8s cluster up and ready (minimum 5GB memory) * Access to docker-internal.alfresco.com and quay.io repositories - Platform Services team is working on getting the images in [Docker Hub](https://hub.docker.com/u/alfresco/) registry. +* A kubernetes secret (quay-registry-secret) with the above mentioned credentials created in your cluster. #### Steps 1. Go to **helm** folder -2. Run ```helm install alfresco-content-services``` -3. After deploying the helm chart you will get information for obtaining the URL for alfresco, share and solr. +2. Run ```helm dependency update && helm install alfresco-content-services``` +3. After deploying the helm chart you will get information for obtaining the URL for repository, share and solr. #### Notes: -* The images used in the alfresco-content-services/values.yml are images that are build in the 'docker-alfresco' and 'docker-share' subfolders of the project - see the relevant sections below +* The images used in the alfresco-content-services/values.yml are images that are built in the 'docker-alfresco' and 'docker-share' subfolders of the project - see the relevant sections below. * If you don't have access to the docker-internal.alfresco.com and quay.io images, or if you want custom data in your docker images, you can use the 'docker-alfresco' and 'docker-share' folders to customize and build your customized docker images that are used in the docker-compose project. Just make sure you build them in the minikube docker environment and update the alfresco-content-services/values.yml with the tags that you created. -* You can also change those values on a live env by running ```helm alfresco-content-services --set repository.image.tag="yourTag" --set share.image.tag="yourTag"``` -* Hint: Run ```eval $(minikube docker-env)``` to switch to your your minikube docker env on osx - +* You can also change those values when deploying the helm chart by running ```helm alfresco-content-services --set repository.image.tag="yourTag" --set share.image.tag="yourTag"```. +* Hint: Run ```eval $(minikube docker-env)``` to switch to your minikube docker environment on osx. ## Docker images These images are used to build the images used by the docker-compose.yml project to bring up an ACS Community, similar to what the installer did/does. diff --git a/helm/alfresco-content-services/charts/nginx-ingress-0.8.18.tgz b/helm/alfresco-content-services/charts/nginx-ingress-0.8.18.tgz deleted file mode 100644 index 03b8a5398a8de8389b212631acb4d48091f45e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9411 zcmV;!Bs|+6iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PMYMbK5x5D7>HbEBck^*|qaVl;m3`+RfJEvGeS>CgZqbXU^Hm znTjD2k}xI-4gkv0BtF0W6mBF)krZV+PO>9@NGuX)G#Y(FqXEQI5`XBCc*-#6{o@&8 z!dsvy{L2GAgTY|%?BGECKNt+k{|^Vlefzh5KioUq-~S6dBo4Jt$^~M784T_Vr`)-3 z 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 JGZ6p=0Ra1ej_&{f diff --git a/helm/alfresco-content-services/charts/nginx-ingress-0.8.21.tgz b/helm/alfresco-content-services/charts/nginx-ingress-0.8.21.tgz new file mode 100644 index 0000000000000000000000000000000000000000..6a3a35cbb2a9d34f4308b4b9df350666fab1aecf GIT binary patch literal 9627 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 R{~G`R|NpY$DNq1>004`udYk|N delta 5683 zcmV-37R>3tHIp^4(g6ZJ+OyOF$O3=8AjnV&8p{S-PDm;>1gCH=1TRoBOshqAil1^W z6pFHvQ5WZfXfxU@UwJ|pe1RVT2&_ym0R8i0fl|3&02yXn%!lx3Yx^~I@8Y}|!scL* zncr4AQHDU0ggWCmE~MfaxB->*mdTeJ2DPGrvT4ZhB6QHgb4o%I#+*&)G@O6X6fJz$ z>Fb(^`XxX!{_Y7RQ9_h9OJV2On5!GGyK}q`zx-qWK!b>h zA}OCnGa@T+r@5f#G{q^dRn0eGb@%Y#V1M^ybsbJxjXhLOHA~dZ)?xqE@jeV-|6osJ zpiANJZw_BCX$}co%utwxZm@r5TmfaUwyH48wW=SiZb0>8Q~xN5ySm=<=#aJPr5|Up zH{R)|kk;&Zwe#cttKLF!!)5B3^~oo86*|0ot#0%(~vy zu7Rz=Ce&ViI6c}&tEIN>lwW&6<@3UcRHf+(1A5CD!|9PJz*|8n?d@A-FYS}w#YHLa|x z3}MKsUY7L@cf%b*4*!yz!4EOEQ;!4-dKUA_H8yQCQN1pf*c&-l6- zk(1k69hiYts$CRqs>eLbwA5WID%&5~Ih+$gjT*FKf6UKu-BP0*zXo-;F@;Wdg`vnG z43(NgNFlTlhuSZHuc3#b?!D(zy#Bif?=LSypcA7f)}o(nfU%*(OYd| z`N!e$NlUI6!{lya#g`YWml0K%$#;VfkyJz#G9pPLwDdLa+>h(k^|J4y!#C}|<$3(8 z3AEMANah$vS_>GAm?M%#sidL_v^Gdt+4Fa!<>sTO(I6TaN4_4Vzdp1AT7+eEljaDp zPSbz>CyWb)-2&6t+JcwmwWaK00M-?Uqr<(^gPqs=Eg~DfzuWw#&?9;N{BG3lwe?5E z4;dl<-E$mJ;-qm6CtO?*k-&E)(r{;*4ev)?Z~6V!_R6>C%RZg<|LF|V9EFTj z{w1~oZ?XS3x3(U)?EkIpt#A8(U*);H?0Utb5h zR3S7O=#n~G|&kDS-u3!XDWDlH}09s|MkPHvcQ3$QKuRw`{ z#jyR@{7JLpVltthpcmG_v{(wQan%1lsJE3|A6neb;bTEkI-!^V$#a8z6#Rk~x~YG! zbRT*k62=&lLLx|>A^cPY6`ZR>F-;^8fi{kYNoBUIjpv3O&MnfaN9)e@n<-PPgK|LM znU03f?@p$&WiBXF6X^X}hJV(kq_3YG*!xrT4XQ#|Cxqm=;JKiNVmbZUZv2{R?<+PG7MXqV)~93g+9C?h=^u6FdAGA^L^q_+-h=^ZL=_ts4ZJ$EjJ zGuc1i9HSzey}&nP?$Ya1i)_!0g|caM_RPec&P!;Hi2mQd^-}MAI^}=ya|bZgL#|7<^g`c3|Sm8V{SLs(oI!5L-A5cVp52uizDo6Yuo)7>oH09=2}*xK79 z&+pL^tdbdmcJ+OEczqq#Z%To5ecf}rd`AAcRt;%bR+*uo%I?4Tb&jnKY^rG?Zni2M zrsW1lO$Pn=V|&Q>%3h#$O-or{29_(g393-D@xS>$NtQ0wz5>b;WD1_u4Vy8K#jgAy zcU`Fw`tInm(dr@H`a1|!9Y24*-qESw=1zUqr)f$$hxcV*`;>>GG{ZP#Y-G&3RgHHi zWLoiB)z;sq_WiJ4vu#}suHa+A75Z2pJFmH|9Ldq)@yUxf`^TqmkN4jM^(LY@**CmT zJgcKe?P9z0ABo-QnVwQ9kR)@U)zHdMEL7p3Xda<{2va<-ge@@IPy1u8gwG8U#Q~lp^jLUdz8|2>w z&xYPhZ~^k4aQ+4-&60add;dAZd3}_uii&q2ymx9gffuoaOKW>;yvo1r`4Sg6%X#wh z2(F>-+61i@*NAro9_Q8#!+h+Om8c%^oW1b&Xq&$D3!I``Id4Aphmky&p)ID-CC@K(WT8AWe?P94Hys5Zdxjy z9v{Aav%7D?or@B(Ch)LdQTzW_@#Udj*Z)t-G~)?Acc=DllNW8mEeMMrHlIDMN|#Ja zK|$x=^i$ZWSTgjM}M zUF@5KhpBzDk2v;efGVsxNs_dVY#<0_)akYMf)M0@txH3DNXoOH+2 z9KGLtKq-IMCTbZ~G3uD8c=oChNHU|k2Sq5;Mb#SxKpN_$nvh^NEN`}z0he|rsLOJ|g@C?-q3kfn7B*z;^Z>+ih zBKdyX(<%S+^Y}|%1HDcDKi+EJ|K1u5zRCZu@^pXLmtFRB<3QO`)7WmYSyge=Wp+1I z#`)$ScQ>KFM&*VOF7rL=noURfmMcx}?$+{90{wRb;0->Ne+|s5x`rRkzVU5MoD2B&Tf%j*xMLFL-4j6UBP(!39`5;(l0MPVb}rk z^3q(j-%0ZsIVjA9`{jU2L-_6y$&P@Fowx3YUK7GHME)>_^zZcPmj7Sb{$Du%vo#oe zyZ`l7o+a|%$izRM0=Ubr8exp9@?eSyS66=lhKTaMjWIL=6U_=X&d~c|^V!pe-C7+q zGD^tP9*cJ;s>sEXO>Nsn2Z-`ezpkW+n4+?KSYG=U3CfnrIB}lHx*GcHxll-kieKZ?5(}3zL z3Kmd16~cOX?Gfr5!|(oqX;$~EM;6K1I^-liBhxb3qp*}X5-9LvK_yivgCKwOFGXxd zPyUa+5Bei20y{@9s~e+12uDBr`G`OkxzRuFuwcOw6zN>!MA<|TsYGEXcI}X*bGVox zD>v_TB|UBHj>KjX%F!5uz}yQhXQ#TBQYYtd_JO^|G0Ntldoda=onw3759+$hX8pum zD74py?ff)uvAUb{9@)wnag={3j}tV~R755r$-Bn84{Ixp-|HalhK@-WB5f`aB1nb` zg|rLA-RdvfVFF1ZEYZy{ZD&F7H~9Yh6Pkbj{SaPJsX$Y}jaxd_85#2Et}Ls+Wpvq0 z6lGCA!4%!4OP}l>BQMT?Yg1QWq_e<`pQD6wx_#>MEawcFl0c;7F*ScF$Lh={hB541 zrKW+$A5kNR4k;J0f1y;_TwgWCt0@_$4f4DDQH~R&xzJqot!79?HS;d@W)NJ#Q3(JR zo-5d^vjHs@cRW{RPQ5$TZZ{6DAnblD>?MUuo7}TSv$@7*WR7Hvx<@)Hm*r?7k>wKF zcr6}6n^AcfZn1d>Hi~~tZv+SGc3?{C(Ha z6&z_pD?yWo+ZA*fdgG-iu0$w4wiQtf?}GpJ5e;){OvR z^y~%wVl!orkXKxMT#Rkf6s;zm#o~}s+@25yq8ivV5_;aBHr2-ULeneQJ$l=JZE^=L zW-sj9%!REMuU)3Wkx4Z;+Rz||FxngpvfEHI*t9}?4XuB9tc#c zRfpN~Fl-jN*~4ZD4=-Z#rMS4UCufZ@*jbjab{W9W)(jo7-%(8)cU>J#5Sb=6dQRH5-^uQgO>uWufH2y6^7vs!dJ`Kp&#{fo*)s{Q-0T7vA!9sm z6YzIA%|~UXs?imUs#Ht&M#*5)dED3WjmxXr%m{W9z|WR`H=HijM#UaytI8}TDzKSg zRhy`O^3yM2ZTZ)l+cV|oKwZpv+C`ho>jz;{VN-wJ>+bS3cgj285|uXmZo}#GvGHzS zkJ{LrRAqOg&=tJ<@EO>c=!{8t=*M0%l9$PK{q%^k%mNRT!Mjo^R)Nzy1YjfhI~O*3 zP1%Ht%%#q?0YZTj>pYq$>qFo>4VLiO_&8;BuKdmcl6Y2+(+la2!cd}uGn_v+!K8N^ z)t`SKM%8x_G-@M1$T_m(!A~U1Q{1>mEcAT*v`#)ZXew+sA!wJ^k`9%SPMl z)D0^K)1*?oDcWl1yNm@|XH;r$%!{=dKVD;kQ|Kx?itB}|TR=@MWd|2~-toz@n&_0Kqves(2>wbq_ z4%!!V)bj%C#)GoEH(tC}YJbHniCZq-j?6`~Dvecnt21(eW)rG44v^ijX@6#-d%J&S zA$NLx{V;Sl8~f{(H>zyzsFcTE%-+<(D&Fq=~u7 zF~;g^A1+~)8R$lts_BLxgNco=!2XTl1sMdJQTch7E{tv|w#URbqjHm{MsYch8zHm| z?dL~7@7nB$U4q2X(lNDc_`C$@3L;0x@ygmoKt_MV9nUw zKWsjGYIc-0ZyIwK6SJhLGTCQ8?m1fdp)bOy}HFC4NB%O zn$eU9AkxV*84EhLCV^4gPO8FD`{EF^Hsd#OHqQWZht646Otep{d)LZ(czRPPp4}u0E~c{C?fK))gB;DK6d-sMEGVo)%Lx z??eIBgSLU?=8j^}^ntWCuZP?r{S}dCvQLtXGQIXh=vc9zV4MN7ijQB7gUm~gGU{d*U*7E7b zmE#bY1cp`??jf5)o$$7fzeZpaMjJU~k~yO`gk$t6e@fEy)TYgK%c=t9lC+npY#m^) zLY+H;p^C<+NYo^9lYD>AFW>jvy~p>xq5dJc-PL~I8@}&(!+GDkzU~FVFIvhrNl<0E zRzf>karGrCFU#YS&|KXZXGmF4(1x+bpS%s#h%vKEYvgn`MfP3(Qe#z#e_ z$h0?wNz>tN=FP78JhCTFyw8q|5fUo%l+0@p#|xDg${e@>S(qbe`J_lojT(JBtNrcy Z_I!K3J^%gB{{{d6|Nr7q;vfKg004sVS=j&p diff --git a/helm/alfresco-content-services/requirements.lock b/helm/alfresco-content-services/requirements.lock index cd6064fabc..4b6531d590 100644 --- a/helm/alfresco-content-services/requirements.lock +++ b/helm/alfresco-content-services/requirements.lock @@ -4,6 +4,6 @@ dependencies: version: 0.8.5 - name: nginx-ingress repository: https://kubernetes-charts.storage.googleapis.com - version: 0.8.18 -digest: sha256:ee2a7ec0ed228940857082137c9fe72ff81fc4a2bdb3ca8315d258066750b714 -generated: 2017-12-15T16:41:34.393214+02:00 + version: 0.8.21 +digest: sha256:6eae9ef52c9b9be71a85a9223dcb35a5ff43d72044fd0ca47bd91f299f75052a +generated: 2017-12-18T10:40:16.035017+02:00 diff --git a/helm/alfresco-content-services/requirements.yaml b/helm/alfresco-content-services/requirements.yaml index 92118edfa8..dc631b71be 100644 --- a/helm/alfresco-content-services/requirements.yaml +++ b/helm/alfresco-content-services/requirements.yaml @@ -3,6 +3,8 @@ dependencies: - name: postgresql version: 0.8.5 repository: https://kubernetes-charts.storage.googleapis.com/ + condition: postgresql.enabled - name: nginx-ingress - version: ^0.8.11 - repository: https://kubernetes-charts.storage.googleapis.com \ No newline at end of file + version: ^0.8.21 + repository: https://kubernetes-charts.storage.googleapis.com + condition: nginx-ingress.enabled \ No newline at end of file diff --git a/helm/alfresco-content-services/templates/NOTES.txt b/helm/alfresco-content-services/templates/NOTES.txt index 02531b1398..ee8e33d798 100644 --- a/helm/alfresco-content-services/templates/NOTES.txt +++ b/helm/alfresco-content-services/templates/NOTES.txt @@ -1,8 +1,15 @@ -1. Get the application URL by running these commands: +1. Get the share application URL by running these commands: IP=$(minikube ip) PORT=$(kubectl get services {{ .Release.Name }}-nginx-ingress-controller -o jsonpath={.spec.ports[0].nodePort}) echo "http://$IP:$PORT/share" -2. To access Alfresco go to /alfresco path with the same base URL -4. To access Solr go to /solr path with the same base URL +2. To access Repository go to /alfresco path with the same base URL +3. To access Solr go to /solr path with the same base URL + +4. If you deployed on an AWS cluster you can get the route53 entry for the cluster as follows: + +DNSNAME=$(kubectl get services {{ .Release.Name }}-nginx-ingress-controller -o jsonpath={.status.loadBalancer.ingress[0].hostname}) +echo "http://$DNSNAME/share" + +5. Note: if you deployed on a different namespace than the default one, then the kubectl commands should also specify the namespace to run in with --namespace \ No newline at end of file diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 1afcfda968..e560fda250 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -53,6 +53,9 @@ solr: SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive postgresql: + ## If true, install the postgresql chart alongside Alfresco Content Services + enabled: true + nameOverride: postgresql-acs imageTag: "9.4.12" @@ -62,3 +65,7 @@ postgresql: persistence: enabled: false + +nginx-ingress: + ## If true, install the nginx-ingress chart alongside Alfresco Content Services + enabled: true \ No newline at end of file