From cc8ef8240b5011f6636fb9edd5603df361d8e2c9 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Thu, 27 Apr 2023 09:17:02 +0200 Subject: [PATCH] added service monitors Signed-off-by: Alex Jones --- README.md | 12 +++++++--- .../controller-manager-metrics-monitor.yaml | 21 ++++++++++++++++++ charts/k8sgpt-operator-v0.0.3.tgz | Bin 3814 -> 3968 bytes config/default/kustomization.yaml | 2 +- index.yaml | 10 ++++----- 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 chart/templates/controller-manager-metrics-monitor.yaml diff --git a/README.md b/README.md index 3c56e252..ef1edfdc 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,13 @@ you will be able to see the Results objects of the analysis after some minutes ( -## Contributing - -Please see our community [contributing guidelines](https://github.com/k8sgpt-ai/community) for more information on how to get involved. +## Helm values + +| Parameter | Description | Default | +| --------- | ----------- | ------- | +| `serviceMonitor.enabled` | Enable Prometheus Operator ServiceMonitor | `false` | +| `controllerManager.manager.image.repository` | Image repository | `k8sgpt/k8sgpt-operator` | +| `controllerManager.manager.image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `controllerManager.manager.image.tag` | Image tag | `v0.2.7` | +| `controllerManager.manager.imagePullSecrets` | Image pull secrets | `[]` | diff --git a/chart/templates/controller-manager-metrics-monitor.yaml b/chart/templates/controller-manager-metrics-monitor.yaml new file mode 100644 index 00000000..681469a9 --- /dev/null +++ b/chart/templates/controller-manager-metrics-monitor.yaml @@ -0,0 +1,21 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "chart.fullname" . }}-controller-manager-metrics-monitor + labels: + app.kubernetes.io/component: metrics + app.kubernetes.io/created-by: k8sgpt-operator + app.kubernetes.io/part-of: k8sgpt-operator + control-plane: controller-manager + {{- include "chart.labels" . | nindent 4 }} +spec: + endpoints: + - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + path: /metrics + port: https + scheme: https + tlsConfig: + insecureSkipVerify: true + selector: + matchLabels: + control-plane: controller-manager \ No newline at end of file diff --git a/charts/k8sgpt-operator-v0.0.3.tgz b/charts/k8sgpt-operator-v0.0.3.tgz index 06e75fc705eafde69ce7e89317dfac3701c26547..5179445b91f80501b8de734d4ddf33f8a6680410 100644 GIT binary patch delta 3945 zcmV-v50>!e9e^K@Jb!C%+d7u_>*`l<(;f8Q?nss$C+QmKhfI>W8{9Mv;@mD4gF!({ z$2KPvsY_CB+%)^!7ktQiShiy~b40tw`=|n!?6B;*a4{fdc6< zoInrN=*d&l6nY4!DJ2oslX#Qaa$yh#``&Y7;9tAc`G10G2J&eIzzY6vA9RlD{D066 zcl^JN5^<&kr+*a0d(7|%M9)L$HXFe807qAX-%WJ|Lb@L&3`8HIOb|6a;Y`7uvaJYV zO8Mt2K_-O42+m}LDYi0Wh^YkEE5a!r5K0sQnU6#$7CbF}`RMrK!u%o$9zot9Amx%M zE~Y&+ibOzoOM^Mc2#rCQXI~6(d5unxqfo+kKcjeiN<^TPy$ATgk?NQsO^=y2aWlBAyv zhvW|J`FqIC1uWK&o`LN|09JtTY=vP)=@k8uVM>MsVr^R*r~~hRz|L*@E4_k-RH6Yy zIFo=RPoQM6+Pw}5&{!fYz)CQPk>W^=i9|mSrUnnEmwnxruo03eM85>y`49=9fTcs2 zlYi*aS;nT0DD;_7iUxo(so|6e8{i$Z3(%^2R8dQYGfd`%qZ7OH;{D*S-?2Mft@6{wg|Fgb2uxNYXX-F!qgD${Ym%jw)5p8*;DNnM0V+#`2V@K*+QBH zzbu-Gm3LR-_k7Mh_ptY<3FdhExi##|E{pBI!ZY-p_u@M{+D|ys-os;W30C?4?W6sw z{nzQX_jmsPR!aH)&mAjaqafk}xPJ^Hp0p-y@0PH*hn(bmZ+mH{3ddMs?L{q;btU#k z4-fuolJby~z1AO`7myK8QqF*>9&$q$bu{wH%Ks*hc78;Ph4T5Zxw`}1Pbp^5L-RZF z5HbR@iU2xOgI^INEC!}fS4$;rNa{TTi&IWm?u-rq3lKN_7T8}2g&t~6uzzTYjI|_0 z0+ei3VRn+x3Hp}O1FhSN)wqXRWgMjyj};*qjiKuLDk@Jn8fx-Q0#(;CL(~Ys2!^!eS1RF|JIU zptP($*+|ja2|I_%p9LbSM3kS2nRPfMjHqcbCF3z1&(+$Sd?Fw|&4087*^kB$XOytf z`H1mZ_1PUnnTchTM%p=Z=lcdkBCE~5J=?RpRDhJ#9p*i5K@)gon^;8ST0ewxYVM(P zHrHsQpY_T0^f-wRyG`{XX{=Av=&(znp+)ZhS9tdr@VR^{;3;9*U5O>kna_IaO^jqY zXyp6W?DHv+3Yd@MSbrn_T^N{uy;*Q1@1CVn3BbuaZA(l}{`maTt0BS& z5_?sYi<1S>qJo9;Fxhe$REdrTW<*d#)X>92Z|&guIE!TuwGYai1A_2)*47DYY+FA=0XQaW1FT0)H-&czxb1LbW>038+8mpgr$yh+ z=J`q+GkAU3V$T^nmY1AebFO9=9(F|is(e%HUKa%-A%D!6Y`+Q|!Bzbbw&4FQ_WxZ= zB;xPv|9AHf>iJ(sov^+0|F==9E-isO1*q_&KewE zOFGirA_w+IfQi@Oqm+1K1S}|JbX6jOlQ3wvO$t}xS8d{Djs(wA?S0kY(qKD?>}G#^ zD}TMZF@F`>2L7#7c|lwTR7x{}>1?;wbs}t(Q7rOW?W9ILg&xwvLZ&!^*h6_Nxsri2 zX=9p>al5#iojH>{1$KOO{&BxwsYa-hoNK{DM4A|&?P`*A^-l*RI=(tDOhlpCzM4OV zP>CWcilwsFYYmRmx;C0C?p`_BSyZ==9V^51Ik%xWtFEuFifqH^Jf#nPw*58(5s+~mF9CvujoA& zfCw9MX9@ROtr1ZZ&(6!cKxxia*6hFbyc;T34;B0Jce#~OT z>2eFxrs}2OU*z-NRb`N4tHn%m3I)Dck?%gmI?ET#zruPMdQA zt~rHGB3yIC#LeCK4;>K{8Pzh$*MAoCuiCM2=Dd+b74c>+Ux#FrU~{`V0Wom(BT$~b zp_lgIGgc;O;Ul{*^JuLl^O(-sW1yg5e)))V5xZ*zcYgEmn7qR84@(m&KwD(BrAzbM zN$b(pN0R1W2#d9P(^ZF$t<@AXCqe1Gl9%oqlS zPa2a89>2i+J=$xpY-XA%Dmk;J9z8s~er_rIa?4`k_(57ao>3GwT-Q8Ry9s*HR`@Xx0Mv0Rfr85w|1RagQ2(} zd=YT8hJ;~CzJREKvl z-W(|7Z)az0T9)X4m%bpZUH1)UzzY2z9vsd2|KU#mZ>MZo|5s>g9dXx`=Jb*zUv85y z&hilH@7EVjOO;;3sH(>2KK;k=zsq^}1{Yw}`(NQ4|A+hS-TVJrDSylI|DX63FGol( zoa?_|in|SzloH>npCt)&dsANfhVU#)8}Hh6T#o3!l|La+1IlzkU-N9NVu}v(A0D2Y zdUxep%VPO&IPM8wkOSx`q7jgZ;z$_uq~>yZ67hQ@%_7x4WwUf%Ctw%?@h$-?nlt|GNlGl=HtuKEu}X zzb$wR^1mIByZrB6{`W5b`#JKzEqAWY|1L?Myev**jzM8U8-KE!m*sy8k>4zp3sF#i z?S9qjZr@sAC^A`)6TM{S$IWj`g5@nVB)XT&ioET-WbDZ%TawdV?Sh5C)8?G<%A1F4 z!LW4o#p})s7BnYZ&M*6C*Ei_+^z{7Z{KMt(1?pd&ouI#-pIw~xO|ZR2w(f(=4N#sZ zDHjTBpY1whXn!xkx3H&0w}25aZFT~Rcnk;+6$q5@m<*>@cxjPCv{SPNVw$t_mkda; z0H!_|EUqyy|J+6WOBIeKYqf^yYIXV?YE>HeT2&dmCwT?H38Kfm0?;6fcCP^ZbCtUP z7mR@>#C)>l$<|mI|DXH*SGRkxi~nz>yh2x4X-nBy(|`8h(dRKRWc)BKhf^Hg;t|Ne zdxdVaOqN+{!$NWll%f&k1N(szP6Z6f9mMD} zQDgM)zXa$5qf^A08L2@+DF{RfgTM<;`=9!nmAzNUebV^jNgu^TNG})>)iQrA_+Bvh zB3kBeUScsGwe+9-r<|}>G0^}=w^?d5jr86G@^k9F2?qGqdlRTcKXXAw-kbmPUZIaz z5S~eNetIUoAQjw5ynw`jTeiF4|L}r|)C#S&`}FLt?8>gZ)B@&cG3)w!J5UKqc ziP@`XD?tzh`@Nq1KL~>Q|G{ps`>NCH?e6wEyFqvFRnY0}c7HpsAb36$mX}m%B3}hh zo~ypNAEc0kenhFL;C-0xdL&7T*TC=iffu0)B~7%gI)wj17DH$b355=KK}fOykly1))VSl~m7;1lM?@T`K@# zOnknObV?bH@kE7$5hpW7gelB=g(M+E%BZHO@{s_M6v_Op1&3#6_Kn75jCq5^L@26- zob_QGN}r0hL35Z=7NNAyEjc7%D=|oCgESdiIn(L-9e>Y3Q6iP$e0D}-s!OgR~1N~1g$F`>KVLz#Ua#w3rO+Z2tPfX57oMYp9HYLl-SS~h&1FcOUi>&ptuFsH#);kK_NNK5 z1f}wI@1af6 zV5hYM87$TC9EVztO?A{k56FV5(qMHVR_5}gFY2($n_p$dK)&MX~{&j+S2=?Ek;Bq}3VCec-9 z8GqY4s^K$b42B4)GI%N=7WoX@C1f={s-&f(f|7Y-LCvho()Nc?o2dfMzgf)t?;pOM za~umAI3WI|Baj=L<5{U(6S+iEu1B!*7uEWU+Nr^ElRo@#H9uC4Txl;2cVvEx*+;vd z+2L@#7#Sj4x~KNg^y|4NRs$-HEt}C!a=;f zZ5Z+u{z!$!+F}=>IEyQ44QCEeep)gkppjUE4EcM=RbOMP5dmjcEKO z9%2>eG7B}G)VknS*&0b0ij-?3&{BoVmt%V$y3XgzWKXr5AG)b);{T`GV&~G#|9KfC zUS3^^-*cEd*~89*04(tI_tvm4yDYc=B21W=#mJu=4!pR>D=+!3w?g6*%P)at%ErMp~_wS0)xo64fp!c3d#a z=BYIw^34h6Vi!`dR>BC!J~U#!4q1&s-LH7{M)75GejzyJ=iSUufLswfB7en1hm*4s z)gFdzBfg7f%pC81H+e28v&l=lZlfU;JRXY4+PJ)PxY&*4Txc67Doty4Hq@-P!R3$-qiLnTJXsib^72qze&jPmj6n2VzNe( z)AvE~j(l21%E{7SfB)Ob<@w3g$>7t`+3$m^lgm%XAAUPLJ@;yau!6+73b{C05-psw zP#z{-ErTl2ao>*c=Mh!7yX&t#T$6DL|F3oTyXrCJ-Lea}#=v(e!kN>r*!YWTfU^v2 z9tF*SECfHH68g2`N`H(0Au)UKii^>6F;<$f6O@;zY60@c%(pDsULklcPs`Ic@x=rQ z(-TALA-0B;M+I+~lisQH&7#iLZdJ~xG6s?eWy^}elHQ18!lN=4?W)Fjxr~zGxju_j z2R@297@Zy(Cq||X7;$S)E3yh3>Kcw=J`yIX7Kv7 z^EIdZP@M~YDTMArNl7h+N*-(7o1#(1lv|VS7fC|AsBgjs{J-V?f7TMp=o|b0z3yK9 z{{NtJ(B1m~n|~-(mzLs=pjpuX>D^IhG<#jQ3T;%b=ZMBBMgFT2VcEFrTv)LpY>Q*r)w5c-GxqmzvToqc}ZbqH@mhSU`YQ6=AV3dzg zx=kEO5nGtZqeM`y-3=I{RU6(O;B**Mt&02((87l!%m4O9G>M4D$cIx7M}KkW3;6p#JU1~$A9H03fB(n# zHn(0}S#JNA!x2<)8)JH$CvcDbzuWEYSMC4ZPN%oc|J_I_+y8clNvbD8(l6FdTW|s{ z1;fYOa4j4rVPoSz^o^iQnUP5?V=@0?9E;4Hx3Z`r-fZx7M8`3)(bXx+VOBpz?SHul zy>btqiME#(EpY3ykIq`Mk4e!UAw!Le(}zOHC<`lO`?rXX%`5r#xHORhjYU?Qx&+?= zt>3mj@M!*x^2n&lXF8$74BU@?PzA$F99eyu?avB|dbx_dbUfO|6r^CH&ZsO|0`!|9dXx`=Jb*zUv86d z!SgH9-!IQHEtT`qf@=KUyZ;dW&vG7~-~!yk|D9lg|ATI@{r%@g%BuYT=SgL6)eh1N z=lXA#;_fa=N{MgPpQZbzy?-gM{gL>rN*nLFd9obQe<}Zjw1$-J0$=lNtT~8XXx-g? z@6)?2Pc6&kzvZ}Ri2mFk|LH7z|K(tJe=GktQZ{S`_NxUn3?-54?7LS> zuVS>gMlNwm@pE%2RR06#e_z@a)bhVwY<|1EO} z8_WN8=q<_r&XC;Ze{b`@xB1`SBmdiR=l%KLCCQVQ5Z#yq3e>Pw%a=NQsh?Hd3oHJhe z<>6X5tek!Myo-Vb7KF>``QYU83J#BtPp?itoFAUS;Ns*6{`2(Y?08@=+iS-*``~5+ zmZxzdq$b8^yG%Lk#N--xjOdm)MsCbbgiu5XWTa6-EFwCZIe+10L=H7h%^HMh&dy&k zAR!XD{$Q!N#=!h@7xgbyWGq>$wM;9r0C;R9zg5ZsP5C_#b}80F}D{_)_`z_7CS8nRDXemojLM5XflG1YDR*P-wE z!!NRJ|K=5waohaKU)7Yi=YWPJyiOCVX_WWYSDzE_tw%p3*WO!S$L3i`I`-cFulE{0 z5=lj>;Pm)Jd43{=m3TglkhEQQDgNpCQ)Ludd;96ZZP}J>dCBGf0ssL2|13W|3jk;U E01oPvivR!s diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 0bcf4bde..a4c82523 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -22,7 +22,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. #- ../certmanager # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -#- ../prometheus +- ../prometheus patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. diff --git a/index.yaml b/index.yaml index 9d985c9c..0246f9e8 100644 --- a/index.yaml +++ b/index.yaml @@ -3,9 +3,9 @@ entries: k8sgpt-operator: - apiVersion: v2 appVersion: 0.1.0 - created: "2023-04-27T08:20:12.671029+02:00" + created: "2023-04-27T09:16:53.562871+02:00" description: A Helm chart for Kubernetes - digest: 757ee19557e12b630f25db5bdcab4736e9d4ae80e92d547ef752bf725f65a43f + digest: 48138af5e01194ac73cabb698bd9f5245fcff1955123632be37c8b6f03826e69 name: k8sgpt-operator type: application urls: @@ -13,7 +13,7 @@ entries: version: v0.0.3 - apiVersion: v2 appVersion: 0.2.4 - created: "2023-04-27T08:20:12.670806+02:00" + created: "2023-04-27T09:16:53.562637+02:00" description: A Helm chart for Kubernetes digest: e0dbf56b6e036a1eaf9f03a0c6a1b4a2a360a339c5b82b24a58fbc7df23a89c6 name: k8sgpt-operator @@ -23,7 +23,7 @@ entries: version: v0.0.2 - apiVersion: v2 appVersion: 0.2.4 - created: "2023-04-27T08:20:12.670506+02:00" + created: "2023-04-27T09:16:53.56221+02:00" description: A Helm chart for Kubernetes digest: cd4a0ca2651f617ff7c1b81de031d9ae9acc23f291e46dc940a51f6a01857154 name: k8sgpt-operator @@ -31,4 +31,4 @@ entries: urls: - https://charts.k8sgpt.ai/charts/k8sgpt-operator-v0.0.1.tgz version: v0.0.1 -generated: "2023-04-27T08:20:12.670096+02:00" +generated: "2023-04-27T09:16:53.560128+02:00"