From 1ad2b42a38f471925dbc6da79cf63d3738e9c060 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Mon, 24 Apr 2023 19:52:15 +0200 Subject: [PATCH] chore: repairing issues with helm Signed-off-by: Alex Jones --- Makefile | 2 +- charts/k8sgpt-operator-v0.0.1.tgz | Bin 2528 -> 0 bytes charts/k8sgpt-operator-v0.0.2.tgz | Bin 2530 -> 2543 bytes config/rbac/role.yaml | 12 ++++++++++++ controllers/k8sgpt_controller.go | 20 ++++++-------------- index.yaml | 16 +++------------- pkg/resources/k8sgpt.go | 7 ++++--- 7 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 charts/k8sgpt-operator-v0.0.1.tgz diff --git a/Makefile b/Makefile index a294ec7e..e39df626 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ release-manifests: manifests kustomize mkdir -p chart/k8sgpt-operator/templates/ $(KUSTOMIZE) build config/default > chart/k8sgpt-operator/templates/rendered.yaml -helm-package: generate release-manifests helm +helm-package: generate manifests release-manifests helm $(HELM) package --version $(CHART_VERSION) chart/k8sgpt-operator mkdir -p charts && mv k8sgpt-operator-*.tgz charts $(HELM) repo index --url https://charts.k8sgpt.ai/charts charts diff --git a/charts/k8sgpt-operator-v0.0.1.tgz b/charts/k8sgpt-operator-v0.0.1.tgz deleted file mode 100644 index ed244fafc31732f7f88fa1397cabc21d8b20c68d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2528 zcmV<62_NDc zVQyr3R8em|NM&qo0PI^!bKAQ0&sv`XlmFsw{**{tH*qCF;?2QY z7>41y>D2v(Vc7l+kHX_O(R6wg{Tdy;KYITrjHXA^qcB;@dTAB>saxCs4WyZ%2J{3$CV-H9doURG|KsR=$N%5k z*RTHn9a_WxqtP9gNlZS|6m&)zj8ZT(p@zmILIjx&D}|2~%mNBuEpJ zluEh;+%*t^8c2fqrW-8!XK<+vl?-B{H`+kDW0+sIAe?KXQvMZojPQy#Z;T^!V?&TII;# z92Q)17f$OYqEag3qHJNO8dpn@PP}=}MFQxE*CKHgjiV7E&N^JlTb_b8G|gfnb0J!? z=rL0WWB)Lwe55mAcEu&CJhRGZy!Dd{mb^HhPV~pCTh}4DHlJ#pms}h7A`>}MQLX9v zG?&X+6V$Y(*nahpix`o+Cn32J-Z3_Q&x}qnnUM z^7HHwu8COz@k3n_w2uXo+IIs3!@mK}jfFAe4SGD92Wa#?%fz&4;| zi#uyjT1@p)Y?W!dtUj(UZf;4rv{$&-?RKc%s@bZD%LSkxxj>aVDj<_gacSHG6C9)= zI-jT9So{4e2W_kc#^lU7GMNL(v&2TrF_}qnMpF=HRKv3?*=kbLTa{;HbU6bZY381p| zHdP6TN3Bz3p~uZqXOyjW&go}P14A&~IlC2S+Z}BBx(C@S1$)B89k8)&-4{0p3GTw6 zp(fW4qtFd&;84xA_3~jL_O9CL^n_w!F!vRRHVWwy>OJ|q3V0>A1@GkF|M@vf2n3yr z1C$Wgj!vtD@SU9!qFA$4LSRYZyOj{0y&WY)!Q^WR@mfN>mJq|?d$@$~UiNSaQHvnM z{^nOOl#8AOIaER*D(ueS2GZV4JDi7Y#*msDzTS~m2Pp4H-?xg|ElU$$Hx zjMzX~&>TV$>88Kzfcu`}XD=QGSKqyEH+Yav0GWNhxwyV1r|0Lh+u84*PcO;M)x{b4 z+w9`<{DuTw*fNo814w3RrqEDnVsf2J@;0S+@YaT3ge6EoJDjNm2wm9WsY>`_4^VrlX(4t0(1DG>{w=Z-C%QGcz(6Srxf$yNer0vLb*W*H99GI%I!4G?>@jdn2lu$3?u z*0TazhJUnQE5$d$+qWY^8m<>uA7{`95W z$VaR4eF6dubeCsJVZvn{CS866Pz}$|OP?yhmWQpSYxF(QCwRb_Plp{x*l#O)Yu&<8 zJq~u+xbs=s5^}p&-7jUKuwJ!q)mqcFx5ZQWm@K%Yf`0{Uu~e+^WV$|~^y8=_$D>!- zey$%@i-!Z(-ci=R2<$>ZhU$Lv3;{OCaiI}D@0mLfHcK*kDZyws5_7dYYt!f9le)u+r(YEI(OAF zWel_)r2n*H>#tlU_LJpDues(0pNA~HhG`z80^2UJMpH;vliwK4A4HVp9s2o2HL9v{S#sCdnVVP2Yg+g zpAmYsy#CU_Yi~&XsF>=CTNSv)rqZD|sUDB4Z@H$nmwXSKw>+!K6q?3isylV^r?d)9 zOirfLWB-WCD5gYAZqKe{$By3oe(lrBqe-#XYdx zbgmLunm2`NZvoqn39RjM8DRN2*_1Zy*mn9 zZqSw!fhPRX4BJ_or}8_%ZWO+t^F%vH{5amTb8*b&ss60wwNj>b98b#Xz4(0kynjhV q+?^Fni$lGSNEuvpjP=t0h3K`tw%7KPw*LkI0RR6>^GNsrJ^%pmfZfOd diff --git a/charts/k8sgpt-operator-v0.0.2.tgz b/charts/k8sgpt-operator-v0.0.2.tgz index 869de9d720585ff93fa8a9d9736c7ab02f28ed13..ade9f32a626c3df149b14af11d482ef424c6961b 100644 GIT binary patch delta 2505 zcmV;)2{!iP6Ymp{Kz|j^TE7C5E;7?8B}&#!T+U?S+HR_eZ?4C7?;Zk=B-9|l9)OCK zPXBuc07>yBT6W~v={2&D2?7V_@tp?&pCI-0Fe-8K|&S^$>(eiD8YapNSZ)I8h9F*O$rgA zX(~9QmdIdTE*B2N;bidK8u(+krvDpAQb7&q5rT{XA^!eg(C`08lkmf|;s5VHe3-ua z|Bq-j{~r%-xqpl!@`Wa#Q_5hFfT1xpG#U^h=p2N$e-Z1@!`ssLhg^-AN>U|3nusJ+ z(k0-ofe6$<9LzWEXwf}`OKqrR5D~r629h1a{IWUWOdFN(Z?I#m4_302vwKuZ(FAJI z%_mdRpb|kUsD!9^6oA22{?3>f|Pl~NfOW^+4LxLSgA;>|NIVn9c{5{k#;;dnrZvkq7Ch9{s6P11j7dT_1i{iJnXFK7L-dgRst^d53l))-F{zG5qa`;5o|#ILOmeds zIcV~EW)$jC3~LZ0&6fd1w&Dhu$q+^~<$+^XI!q6f_)nO7fPPm~p06{sK`xh-7Y=Ma zT7R~I=nYPR7 zK^mg7dBTmg-@h}^##&%VPMsr@Igl)kZL}PcnIxw)0dYz-Jh_ssHg#Z?x1XA;F{nA% z>#6dhh!s0*;=SxT1y%!o44R__s-XrfynibZq~G6cn^SfRO(^sTWE)627jQD$HEFJt z04f`A6BUDa&^l!nde|&=O4(}XoNnecFa*<{vs-bt-NL4;yO+H}ut!YX0UO)aU2(IQ z;4TarYBGI43f-_84%J*+FYgCp=c=tvPbeY=GhcydqmVA4+LO)8fLCyv^G^Qr-+!O8 zgh0@lI6w(;<>)j@2;bQ%A@VgFB?J}}epm_N+1pV<$ZajX$6qkm+SMZ8**}XHoKYq_T}V) zTwk7_lE2T+FV3z>(1tA&nKpoAmZS;|l_nxrnIvx$dJAuD_(fQP1hm7MihB)WaE^Fs3qT9=G*}bIP7z->-9X?J#?Q+DlDysk?{vYy@_1 z@$K9V^dEZrZV6g-4ryjq3i&rzm9>icDNzSJZvmoq3?-4!UIlyI&3+@ zep}gF>*kK?aj?tA@BaL*Et&7^7Ax0Kr=GWZtSHwjzr(tX@8Jdy+kZ{+7s1D9!6g;^ z8(@Q_e1%8T^_i?2z%4l*yvlZ;;ILXe9IE#Y@AgGt7Yb5Tcbg}O^a&W`Ob6%!>A_-r zUfv!u)HgUSom(ndY=`~x>LNGyC?DO%*#D;)9o@sG=_fE@h09&B*;)dm$uFAhOo2w- zf<#zz_}cC0orIevZhzC&nJd#NW1w{}{l`^#f8#Q?-%2mN*qi5k9Tt96`I;9t~>7X$HNLuM2@G^BmaoXD5gY2ZcZ;W&4h6xQZ51O(5NG7U+(HBt#sjTj8rZINfpCMt9N^Z zbCw~O%WJlRI1^khXG^Kd?(;ifnQ7f&ur#l8)!qO$k23?W>GQi3LF>9^iV?T4@o{*o z9*S;nrrruWM`YH#DMj+j2<>yLfY2m-R!Z4}zCXguHL}WZU z{*^ae3v@S)ZVK}wtv5@AS-gyEV}FY(pf;?IuR6RcpVXDOmn5`$Dj$$h zJyLGrw#xD5(*otAMuLd^C8xpGylar4^`(`jss{_1PtBW`DK)EzjJyWE)n9q^RTV&p zyRJvY83?+$2Bu_eGtn^H_d+*d2$@=se>cBwmj9 z>_S`|GkK!FD0!unsoVn~MfIM4K7HB0BqHvz3?}($;wPjGE?dTW?*F^=+Fsjhdu^}n T@$G*B00960kO6C006+i$u6xf< delta 2492 zcmV;t2}Abp6XFw)K!5emTAu=w|Ke``lqg$CT+U?S+HR`3zPTRTy?Y2el2C&HdH^a` zI{oe)03^kiWZ9A9q}RwoCI}py$L~A{Aa^Hbp>3ozAhildXG@B9xTcwSbFdc2ar}NV z@xO5#w}0cK_~^}eGC3N*8&BTFlQ;2ra&$a-L*m1+u)XERQh$6CfAd;x;eL`vHU9(9 za3vG6IvP-|tH*eFG@J}lFbui2zU!3y9YjW$0|}WcB){e}KnWJiK++5n(!$fgt~Dft zYAraUj>uqDEf){t;nCowHSp(dZU48BX+bTR5rRwsA^rAXu-pHS#~(~p4Lr7rBv33*}_gWt`;D@c(a^~6wni|h2rseI35t<_Iv}Kw%r6-gtgpsY=p`KoI&29U4IB}oG|1Dd=^w{8jc!63 z*)On1xFL24Bnus&|i(@B@BB?VrgjEZ{AT1;y zYEJBu8-kz_49H-9*G(l+vws4!LvjP?CK9t$xqnCGB^g~41V@+TvPQuVF+=j3LLgkuRYI25YLkpc3vNq1GnHkzRFpQj|$~+a2sa9NC|G)$X zX^F{a8Mn@U|H{EwXMrI(^NvhrKysbBXgMTPNzP~n;*1)2b|pJ)n#d_{KQ-55PR0`rz>r`3jakJDJWy`H|`k6Dp5NvnOcE!1N2kXA>o$Qr@Jz?S&*toXpi<>(M zZo{CZHa8EW&<|_iP|b|<^4&n}UA5C02qnZ~9x4!H719ONd-7Qo@JenA-pRlJ^M7-e z5C|q02Ph$~J)Kqw5js01M6qV8gus%*cPk+Rds|9~g2~qs;MvU^4@PW9SXoA$Vkh*{9j*Y&LPe1QX&89tFlf}f33t5w`rfrRsv`W7=Zxh7>>{}cqnV_Aoge* zZDI6bD`762XGN|I|Kz?_ihpl}w{Hi8G+Zxo$er^=Mzsl_6tkj#0oMPD@TC%wFVwPS znBtZ1{|u$uAVjP3eF_3BbeCsJVajD4CS866Py^4;OP?yhm4~gRYxD!rCwRbFNQWIq z*l#O)W8K100}i&?xbs=s5^}Rw-7jUKuwJ!q)LPSZu*FmP7|pq)f`5MnY_U|V@MO9n zq4eXZBgdmx*?g`aR*Q!N*WOXqy@=dGkw$gDeujXXfkn|;X)IY8-3v-W((Or!FZ<^85J#4mo1{2n}+!i98B|zHZzQ@)~WYrx=gcXM`{f^#C zxNYJtU6cE2nKA~(?0=;Hv|{V8T&C`m%%5n3;<4voxOm^&~)`?!80=;|40uL|@} zgt_mTTz?+$b$Nb9=+*N2O9QXHA@!qTsw-|);1-)ohu)-mJb$vj<(k@F@;z+c@~lQH zw2i}5f9e!YX%*UpoJ=Oi;SrTpOo@cto?ZDKOK}1A$`3228K0ud)Ymw-)ZG!eBgcg+J&I`E* z3oaMag;Z7d#XYdxcCHdQnm2`NZvoqXB3_xLCxG)v!4`uZ{J?bn*Up9tuAV~+n4-+%AJzA}emUT~S;*8u9VQjK&% zENb&25=91Bjt~iMEXatasZ;#NcKLhfx%wDa&ph)-O$+Al{?x7ljaun8S;fQg@o>C>Xb1#7NtuvZZYY7)%pTDt>f6FlR#Wf!LNguIL6tkIi6rf{8*@zKd|yyaS8`f2o2 zct5ET@W$kJeWqmlP?`#%zFZ++aRCdsFpLTs&KKuYm^yqJ)pW)M@1EzUsC3(3PcJWb zplb1IINq~$am?kZ`K;u% zQZ=@A98b#Xz4(0kynjhV{GAodibK6mNEuvpjP=t0h3K`tw%7KPw*LkI0RR794@yb^ GJ^%ploYO=A diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index fde3f0a2..229e2d2d 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -5,6 +5,18 @@ metadata: creationTimestamp: null name: manager-role rules: +- apiGroups: + - '*' + resources: + - '*' + verbs: + - create + - delete + - get + - list + - patch + - update + - watch - apiGroups: - core.k8sgpt.ai resources: diff --git a/controllers/k8sgpt_controller.go b/controllers/k8sgpt_controller.go index 46fbc05a..f206a57e 100644 --- a/controllers/k8sgpt_controller.go +++ b/controllers/k8sgpt_controller.go @@ -47,20 +47,12 @@ type K8sGPTReconciler struct { K8sGPTClient *k8sgptclient.Client } -//+kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts/finalizers,verbs=update -//+kubebuilder:rbac:groups=core.k8sgpt.ai,resources=results,verbs=get;list;watch;create;update;patch;delete - -// Reconcile is part of the main kubernetes reconciliation loop which aims to -// move the current state of the cluster closer to the desired state. -// TODO(user): Modify the Reconcile function to compare the state specified by -// the K8sGPT object against the actual cluster state, and then -// perform operations to make the cluster state reflect the state specified by -// the user. -// -// For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.14.1/pkg/reconcile +// +kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=core.k8sgpt.ai,resources=k8sgpts/finalizers,verbs=update +// +kubebuilder:rbac:groups=core.k8sgpt.ai,resources=results,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups="*",resources="*",verbs=get;list;watch;create;update;patch;delete + func (r *K8sGPTReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/index.yaml b/index.yaml index 59657afe..f7dfc3f1 100644 --- a/index.yaml +++ b/index.yaml @@ -3,22 +3,12 @@ entries: k8sgpt-operator: - apiVersion: v2 appVersion: 0.2.4 - created: "2023-04-24T16:59:16.394523+02:00" + created: "2023-04-24T19:52:01.766171+02:00" description: A Helm chart for Kubernetes - digest: 88b31be7ae4f21fcaac035d3b5863d6e31bf27f37bac3928ff6d3a725a0a4c5e + digest: 08edae95594e17a464d79f39d0d011d93f38e6583f343228b819b62ac234d7b5 name: k8sgpt-operator type: application urls: - https://charts.k8sgpt.ai/charts/k8sgpt-operator-v0.0.2.tgz version: v0.0.2 - - apiVersion: v2 - appVersion: 1.16.0 - created: "2023-04-24T16:59:16.394404+02:00" - description: A Helm chart for Kubernetes - digest: d155c7db368f5a0ec2c9b841a78ba6ae7c3a4361860d9b68658c86d564f4d258 - name: k8sgpt-operator - type: application - urls: - - https://charts.k8sgpt.ai/charts/k8sgpt-operator-v0.0.1.tgz - version: v0.0.1 -generated: "2023-04-24T16:59:16.394012+02:00" +generated: "2023-04-24T19:52:01.765797+02:00" diff --git a/pkg/resources/k8sgpt.go b/pkg/resources/k8sgpt.go index 3f47ab02..94306319 100644 --- a/pkg/resources/k8sgpt.go +++ b/pkg/resources/k8sgpt.go @@ -127,7 +127,7 @@ func GetClusterRole(config v1alpha1.K8sGPT) (*r1.ClusterRole, error) { { APIGroups: []string{"*"}, Resources: []string{"*"}, - Verbs: []string{"*"}, + Verbs: []string{"list", "get", "watch"}, }, }, } @@ -170,8 +170,9 @@ func GetDeployment(config v1alpha1.K8sGPT) (*appsv1.Deployment, error) { ServiceAccountName: "k8sgpt", Containers: []v1.Container{ { - Name: "k8sgpt", - Image: "ghcr.io/k8sgpt-ai/k8sgpt-operator:" + config.Spec.Version, + Name: "k8sgpt", + ImagePullPolicy: v1.PullAlways, + Image: "ghcr.io/k8sgpt-ai/k8sgpt:" + config.Spec.Version, Args: []string{ "serve", },