From c7da3a4a4fdc911ce3fc1f4705b5018e092507ef Mon Sep 17 00:00:00 2001
From: Raz Amir <88726761+ramir-savvy@users.noreply.github.com>
Date: Tue, 7 Nov 2023 14:01:15 +0200
Subject: [PATCH] Add podLabels to onechart (#83)

* Add podLabels to onechart

* add unittest
---
 charts/onechart/charts/common-0.4.0.tgz       | Bin 2140 -> 2141 bytes
 charts/onechart/helm-ui.json                  |   3 ++-
 charts/onechart/templates/deployment.yaml     |   3 +++
 .../tests/deployment_podlabels_test.yaml      |  17 +++++++++++++++++
 charts/onechart/values.schema.json            |  13 +++++++++++++
 charts/onechart/values.yaml                   |   3 ++-
 6 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 charts/onechart/tests/deployment_podlabels_test.yaml

diff --git a/charts/onechart/charts/common-0.4.0.tgz b/charts/onechart/charts/common-0.4.0.tgz
index a2ea195f9adaaeb0fedef0804891deee48ddba94..c1a4d6986a981afed930e0cee9dbd94074243976 100644
GIT binary patch
delta 1994
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

delta 1993
zcmV;)2R8WK5Zn-useiva9G(t)&dHwBJ?RadJ#fB(EH#RxB4W?^>anUH_d<w-^a_Qf
z0UyEq#PU$Of`-bJU&CLJ`QYlk0h2($-=Z-JjtZs4iH{?QcaNp+LL333V?o57HBb9<
z?4Ipd&;5lvT1JWfEA&G~6w1ygH{cUG^+~ufI9R3s{XxH?|9|~{Z>RrTq5JzbcsQXP
zp%w21JKq2*WG!evK3bZKPQbn*EJA6|iIDL4XqCXDYu!-pjo{2Qe@8;gM@2lM$jAbS
z@#6j-(w&wKCxUS#)qCP&3+xMINF>_2s7Ht!%8<Bm>k@;hj=2~aBa?a{03$4SS>z$K
zX2|@uK`=Y!X@7wY55Ot+kSplv=CO>rnIL?MaBzcn$8azw3`VbNAFT&4Eb#bfWHO8o
z@Hq;Ukw$lf+*|Odr}McNy+956A4wJXZz;pG4I#lw{qGJd`akTS?(}~v)TI9n8=!;)
zv6f_d5wOU|Of_Plm{5kP4u1ofD0W|kh=XQ~NJr2hQh#VZf`<$=O#NBFl}3gNMkL=B
zD>J|g(CnvCUH_5K--^J$z{#c@fED`R9XeJ2zdzX7|LstN{ueet)d2_u{9OH4w2y~*
zQKBnQ{ldwZp?7!)c|Bq1U7EMDSgk9xQs#B|g-S*FG=mCRf0uM*giHh<!H>z)BEJQo
z4Q|@$1%FOrzu`|iDHSXz!(&y@Wcc`do5r?z25g!F6O0iSze`K-pjVAVOu>XO`E)Vz
zxqQ+@Y)Y8IB9u19>gmWlxrUWEShW<jVRNIgbO{>UEbF_lr&o9XRlBS9_;vbU$A4`E
z<4@TV{yTkVP{aRze~16upa%ReY=9+hU(RKAe1E&$P8_?qvg-83DWVS{`5a-h#}^99
z)dX5U$o3DirrQM|TEpF27}Lq3t~SSW<3SI(`{Dw+HL0%uGh`tOsn>o(W31HwlU`N-
zoxyOY|J$JZ`_2)}sXqdV3baydO?~C-X>n&bf}@U(el(kPCQw_g+**N}5d|*cFh+<Z
zdVfG<AxR7ZWe^D$jmjPa;f6s*V=wRt<+^Z-j9J&W@SlJE8~#od<-kxW6!I86I;Bb;
zL&QB4(hUT{PoI7Q+q(W}*a>4Wjuc$qf^8Ww8^Ek+T4Nvsfm8f)fgvL<zGe(s*ViBa
zzXdk5+AVkh5x;@fr&dzKf?E{u07^vMg@3`Rd8GbjG?~yZhNp}S&%LJWP+kASxx3+m
zpjGkTsZ-Ve-s#T%Z-*LGMsI+p<$Dr0m<P&)f_ad^2=&391yY?8H7g`sZ1h8Q_l6dk
z)A-{s?ed_2Fr!y%MgZCoX-qhs>l&$$t1I&bM#!hRA_aNY^+WQMSU7iIa~>$7gMX&P
z^B{Rep1W4TKZwt24Jrw#Qa;L(A-cK;;<_m1yTHSw!?uZM^6EmY*1ACAeH2vT2kv64
zEUi?5AX7a_GLf}d^FE7|>U;$tgv<gY(g^$<p;R&riIUbySM-mPc->!V6<M3zujkgG
zmrQm1kAvB_8;k;1;(xb_|AXPMyMM#~ZBPUL*EYZsV^HOl-vq<QRB_@{+YS8Ayh~U(
zBi$_8%u_F00P`AP#}kl*lXg*1mqk*cXx~x~N6=Ct!d8aU$X#(4D)ioD#}ZkjIx!Kd
zHktCb;9U@Ll_ub{WRq0r5j?aL7&Q|<u@h%IHxz?BbEjE4M@4>HubQ-fMSqpIHP*VZ
zz45Or;GTj;JQKyqFQvPl9N4F=R<6VUTonF%v<Uw<nE_md|J~tf75}@#-VXn_K@0J}
ziv783xG3qpF~t53uZV01`5W(@G#oChyn^!QfO_3|ujBO&u3s9}@js65jo%?Ra|vMO
z`G4*H&tTZw<$t$A4ftQ(0DsFa0aTJgrStzvWKg&RP&hlPpXe8Z2|a32oDuw3EIvIu
zH6!v|ph?$KPF1@V`<;jBVQuq)x35RhK5_gi)ZTFhz)7AY8lM-clVXz4D8FmWW9S!6
z#V3SWn~-}gu_4Lf5bpzLcO%e-ZTYQ($%~V?X%~L4lGh*Cx2cQpe}6;JZ)gSnpPUY>
z_}?F%?C^gpv=INlALy55FS+sF=_2h+RWLhtNb1w_2<{7-$0Www)uV~DS$0>der0H3
zn^Mo^i>u2zT;~F8WsvOLC3%^a(=oyfe$qE3*ve-ud#&!mg3lk{<tVi;Gn9glf^bPW
zY&wY<RmLu#C1qW^x_|h-KI>(!`}@*>)n;pDq$(e?#EwJbK3&sx#{p$_K$6`+TTk$k
z&|hJfw<68jHg~C1&ExK3&}K^Pzdb|d(<u)GZhnlF_kT{S|NrY`=$!8C|2AkJ&WTbe
zxC9kIyaV8Nh8)HbWgg{I2#I?`rYLP|AAXxr2{H=9Kqv`vhJTE~lm%n(iE?L@Pme($
zBZ|(^n3+O7;hwb*9H%CU20w=;9zzdqshYw69onEhT?n{osYTL;0vP3JTlSmFPnRkX
zXzjz9*|KnTb_pI8(z2&ib<A%pzGaX95FPWIR?May{gW2uoOkk$#>BmeLUZ>?T1U3L
z4Xq=4Om3_rTSEEzIS_Pe9sSeVhbtmz5J~v!n_r}5ha&hLU1izSL(+-aMew_2&!ro9
b*x8}Wj&`)8@0tD^00960o@(qY073u&Rf+2}

diff --git a/charts/onechart/helm-ui.json b/charts/onechart/helm-ui.json
index 87216fe..3f3f2e9 100644
--- a/charts/onechart/helm-ui.json
+++ b/charts/onechart/helm-ui.json
@@ -143,7 +143,8 @@
     "schemaIDs": [
       "#/properties/podDisruptionBudgetEnabled",
       "#/properties/spreadAcrossNodes",
-      "#/properties/podAnnotations"
+      "#/properties/podAnnotations",
+      "#/properties/podLabels"
     ],
     "uiSchema": {},
     "metaData": {
diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index e9b1ae0..f4eca98 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -39,6 +39,9 @@ spec:
         gimlet.io/git-repository: {{ .Values.gitRepository }}
         {{- end }}
       labels:
+        {{- with .Values.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
         {{- include "helm-chart.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
diff --git a/charts/onechart/tests/deployment_podlabels_test.yaml b/charts/onechart/tests/deployment_podlabels_test.yaml
new file mode 100644
index 0000000..43c7936
--- /dev/null
+++ b/charts/onechart/tests/deployment_podlabels_test.yaml
@@ -0,0 +1,17 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+  - configmap.yaml
+tests:
+  - it: Should set custom labels
+    set:
+      podLabels:
+        label1: val1
+        label2: val2
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels.label1
+          value: val1
+      - equal:
+          path: spec.template.metadata.labels.label2
+          value: val2
diff --git a/charts/onechart/values.schema.json b/charts/onechart/values.schema.json
index a911c05..be2af2f 100644
--- a/charts/onechart/values.schema.json
+++ b/charts/onechart/values.schema.json
@@ -15,6 +15,7 @@
       "nameOverride": "",
       "fullnameOverride": "",
       "podAnnotations": {},
+      "podLabels": {},
       "podSecurityContext": {
         "fsGroup": 999
       },
@@ -189,6 +190,18 @@
       "required": [],
       "additionalProperties": true
     },
+    "podLabels": {
+      "$id": "#/properties/podLabels",
+      "type": "object",
+      "title": "Pod labels",
+      "description": "Annotations to place on pods",
+      "default": {},
+      "examples": [
+        {}
+      ],
+      "required": [],
+      "additionalProperties": true
+    },
     "name": {
       "$id": "#/properties/name",
       "type": "string",
diff --git a/charts/onechart/values.yaml b/charts/onechart/values.yaml
index 79b2e0e..f0db6be 100644
--- a/charts/onechart/values.yaml
+++ b/charts/onechart/values.yaml
@@ -20,6 +20,8 @@ fullnameOverride: ""
 
 podAnnotations: {}
 
+podLabels: {}
+
 podSecurityContext:
   fsGroup: 999
 
@@ -39,7 +41,6 @@ nodeSelector: {}
 
 tolerations: []
 
-
 probe:
   enabled: false
   path: "/"