From 9e69b6897d3d632414c539ca00c389e2efe030a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=8F=E6=96=87?= Date: Fri, 27 Feb 2026 19:52:31 +0800 Subject: [PATCH] Refactor namespace configuration to use global.namespace - Replace all .Values.metadata.namespace with .Values.global.namespace across all sub-chart templates - Remove metadata.namespace configuration from parent and sub-chart values.yaml files - Update _helpers.tpl files to use .Values.global.namespace for service address generation - Remove sandbox namespace OSS secret creation from envhub - Preserve sandboxNamespace configuration for controller pod templates Changes include: - deploy/values.yaml: Remove metadata.namespace from all sub-chart configurations - deploy/api-service/, deploy/controller/, deploy/envhub/, deploy/redis/: - Update templates to use .Values.global.namespace - Remove metadata.namespace from values.yaml - deploy/*/templates/_helpers.tpl: Update helper functions to use .Values.global.namespace --- deploy/Chart.lock | 7 +++++-- deploy/api-service/templates/_helpers.tpl | 8 +++----- deploy/api-service/templates/deployment.yaml | 2 +- deploy/api-service/templates/namespace.yaml | 2 +- deploy/api-service/templates/service.yaml | 2 +- deploy/api-service/values.yaml | 3 --- deploy/charts/api-service-0.0.1.tgz | Bin 2140 -> 2302 bytes deploy/charts/controller-0.0.1.tgz | Bin 4053 -> 4349 bytes deploy/charts/envhub-0.0.1.tgz | Bin 2694 -> 2930 bytes deploy/charts/redis-0.1.0.tgz | Bin 2029 -> 2163 bytes deploy/controller/templates/configmap.yaml | 2 +- deploy/controller/templates/deployment.yaml | 2 +- deploy/controller/templates/namespace.yaml | 2 +- deploy/controller/templates/rbac.yaml | 10 +++++----- deploy/controller/templates/rolebinding.yaml | 8 ++++---- deploy/controller/templates/service.yaml | 2 +- .../controller/templates/serviceaccount.yaml | 2 +- deploy/controller/values.yaml | 2 -- deploy/envhub/templates/_helpers.tpl | 2 +- deploy/envhub/templates/deployment.yaml | 2 +- deploy/envhub/templates/namespace.yaml | 2 +- deploy/envhub/templates/secret.yaml | 2 +- deploy/envhub/templates/service.yaml | 2 +- deploy/envhub/values.yaml | 3 --- deploy/redis/templates/deployment.yaml | 2 +- deploy/redis/templates/namespace.yaml | 2 +- .../templates/persistentvolumeclaim.yaml | 2 +- deploy/redis/templates/service.yaml | 2 +- deploy/redis/values.yaml | 3 --- deploy/values.yaml | 14 +++----------- 30 files changed, 37 insertions(+), 55 deletions(-) diff --git a/deploy/Chart.lock b/deploy/Chart.lock index de0168ff..725a6d88 100644 --- a/deploy/Chart.lock +++ b/deploy/Chart.lock @@ -11,5 +11,8 @@ dependencies: - name: api-service repository: file://./api-service version: 0.0.1 -digest: sha256:1f01dff06c6132524b527accdcfd47083224855e2104c7b53773cc4fcac9ebf4 -generated: "2025-12-11T15:05:52.740323+08:00" +- name: api-service + repository: file://./api-service + version: 0.0.1 +digest: sha256:d8cde747fdada74e8ef391a9dba4b459469d7854454856888eab3bb97c8e2fa7 +generated: "2026-02-27T16:59:03.91986+08:00" diff --git a/deploy/api-service/templates/_helpers.tpl b/deploy/api-service/templates/_helpers.tpl index 8c3f63d9..f4934f88 100644 --- a/deploy/api-service/templates/_helpers.tpl +++ b/deploy/api-service/templates/_helpers.tpl @@ -39,7 +39,7 @@ Selector labels {{ if .Values.backendAddr }} {{- .Values.backendAddr -}} {{ else }} - {{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.metadata.namespace -}} + {{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.global.namespace -}} {{ end }} {{ end }} @@ -47,7 +47,7 @@ Selector labels {{ if .Values.scheduleAddr }} {{- .Values.scheduleAddr -}} {{ else }} - {{- printf "http://controller.%s.svc.cluster.local:8080" .Values.metadata.namespace -}} + {{- printf "http://controller.%s.svc.cluster.local:8080" .Values.global.namespace -}} {{ end }} {{ end }} @@ -55,12 +55,10 @@ Selector labels {{ if .Values.scheduleType }} {{- .Values.scheduleType -}} {{ else }} - {{- printf "k8s" .Values.metadata.namespace -}} + {{- printf "k8s" -}} {{ end }} {{ end }} {{- define "api-service.qps" -}} {{- if .Values.qps }}{{ printf "%v" .Values.qps }}{{ else }}{{ "10" }}{{ end }} {{- end }} - - diff --git a/deploy/api-service/templates/deployment.yaml b/deploy/api-service/templates/deployment.yaml index aac0ee3c..b342b0fb 100644 --- a/deploy/api-service/templates/deployment.yaml +++ b/deploy/api-service/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "api-service.labels" . | nindent 4 }} spec: diff --git a/deploy/api-service/templates/namespace.yaml b/deploy/api-service/templates/namespace.yaml index 3683bd46..de6f2268 100644 --- a/deploy/api-service/templates/namespace.yaml +++ b/deploy/api-service/templates/namespace.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Values.metadata.namespace }} + name: {{ .Values.global.namespace }} {{- with .Values.namespace.labels }} labels: {{- toYaml . | nindent 4 }} diff --git a/deploy/api-service/templates/service.yaml b/deploy/api-service/templates/service.yaml index 0ac95cbb..aad2bdb0 100644 --- a/deploy/api-service/templates/service.yaml +++ b/deploy/api-service/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "api-service.labels" . | nindent 4 }} spec: diff --git a/deploy/api-service/values.yaml b/deploy/api-service/values.yaml index cb46d4b7..cf86494b 100644 --- a/deploy/api-service/values.yaml +++ b/deploy/api-service/values.yaml @@ -6,9 +6,6 @@ replicaCount: 1 name: api-service -metadata: - namespace: aenv - # Namespace configuration namespace: # Set to true to automatically create the namespace diff --git a/deploy/charts/api-service-0.0.1.tgz b/deploy/charts/api-service-0.0.1.tgz index 0562679a4eb0d1e5b14df37166cde6da322696b4..07f7497bffae8cf9cdce801d7ac168eb7c94f5bc 100644 GIT binary patch delta 2266 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 delta 2103 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 diff --git a/deploy/charts/envhub-0.0.1.tgz b/deploy/charts/envhub-0.0.1.tgz index 7f6805582f5abf97e7eef869d7b4cf16d8ce3b97..9948aec918a8e13eb6df5976431a57f25dd2711e 100644 GIT binary patch delta 2899 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 delta 2661 zcmV-r3Yzuu7KRm&Jb%w}Be&7t^E^d=RJqFD&m0aVids+AcaSA{t=e5lCGM`jO)9ko z&NN9_7+?%w=;iJ@l~m=BL(VxQmpn(}*KzrnS4aVv8O{uc`m>fL$HhKKB+%$?4A714 zABM>1vuxZum=US{1xeV0+ovE1g5h9b{|7=Igyl%87j~M#t11<3S*#L3s{Iug2p6eM5FROPofPA z2O{G-guYh~9iEqm>6FSYLi!e)84`2&MsEsjN zW@!GCOpAnQ8WF}85J@B&LCf^c)zJQ74Zn8Oj5l#5M1LMUCwEu9!rs>A#4Xh;CZTr%~L4n z)GdKK1D*;Je@+Ar4_em@-S8P=4+Hd-*0)wSM&)6obHYF;Fia^}aW zpnt|cI~}{9N29XsQ$T;}e+r$M)@j)538lIb@6HIHzMYB8CyXvK9w|Q(iFs<{EV{s4 zQX$K=Ssy6HnLyEX9bMC5#$Mp!OyY#TDGYgn3rKB?ja5dL7=MkCR-RePsm(E#HoKO8 zfBzS&1UeNvJN9YrM-eJzJU>RRDPamsK!0O`#3s&3k$|$U1s|V|Mz8k|4vt2n*H4aK zy*@q!!eeN(j*bq_kDh;GWee#9AfHnyc!FFnBjtUEeoOiJUqlv~XrSf%pTdBYm z=YM~D&^-TlgJG~a|L=m{z3V;nj^3nZBNt~9h>87dvwYus*!%7~@7=qu3B!~lbbs>n zz~AF1v~ssp|&Y0Uvre9kKycn>B4G5JI1e>>25-GTS!z~>PRckD-+jIxOdFr99v zeKI0R1kaEBwFbIwXWlzR84cF5b%2ixcIl$v5rowwmM;zsvW}eY?o7npWa} zj42Zfb5h+}HF!n*9}b4Q&GHKWMxl+66W~IZdMfF+pXc6Akt}oUidEGT zG>^D>xB)0am$NM)I+{JL7~5*@YIt6nJ#=CVAIrs7o~f1iE!DHqyn12g#v7`ZiFuP9 zti>ymu$tCK#i;7k46)i=u7CaTOL=Yq%CR-Oo7L!2>q?z^UGrBba9N31aMUZ)HeJgn z-6(h4jfe!-gmRP>%e$9(LqTh8X}3qMHKxB^7n~ym73H?2g~>ejGr?%I2;q2gBJ`O= zWgL6ShkRbQteD&W!Es*Q)VjgpMPEpfgpCf!>!l~SILFCqZxKV>UVrO4<`%9CT&z`J zwayh>_hwy-`XVjMmqjS$7o~H3b(Rw`MdZ=R;o0f&N$XT<>s%99$=jMX)VyY`X?Z1n ziD93=IC#?jgjdYUh26}ksxDJPpPe6las2<+(pSO*>r_@{pC3IwK0UdXTn8ImM`#TY zxR+gcxfN?{y+^NUw|}ICT_BGe{SsrUR>s)YE{S8=#_kj3b6?FP zKVq5ED19a(!ouOs-e+q>UEreY(5D6i^7+b;R7l-utZcLV81oI+`i<7@<{;@crBxu+ zcA-Yh%F}hLH`6+8ELwT&IgECl`3ZtqK`0 zxoSZ2ho@~#Wn?m;oa#j-yUkl}QAq{zUNTj2@DEXS-$mOk(n|e5OUZ3t17C&z4*Sjb zKL*=De^dY81%Ea2!8Jv64JBBz^yb@R)TBTRz7&$aHQ}3`iFiL}L)i`=G)vCnhB8Ms zoA^NYrT_te)&AVxm6bV58{A>qS0E37o7h^r+N&H{)yG-k$p=-h|JDs!^5lcuVPIx+ z$%v+<$)H z1l?8dPo3kHcD1AH_vHU8@xMgrZtoPh>ixgne$a^jyF0_p`#*O=4L4h^e*S_?w-NnI zc({BC=W=v-9r|nZ)>F??bN;4H>mksRp$*mqk2TUs6INY;RIjb4dN+38>-eFx;{UF6 zztt4*Du4eU44VEw*xTIy+zoBP4}bpq5C8h7L*?6DJ?~rf^CsGJlM5hsGM}d8n+&}| z>=ulP!r|b@@BjMaKmPdR-~RN&AHMgX0s@Ed>Z@~2z8d^r-t54m5T1SYYVn)HFW9r> z#rDbedE&t;ELI!b3PP>Qx$pJ)xv9nf9m;Zx0e|4C`Y#BE&GSDP?rr@4E@+Lz+dc40 zy!S2MDs909O@~vlmBYEmXCa&jj$RG*?B=-Il~|_B=N%4NfkxXP#s+?RiHcVAvZ|>L z_pMj9`nfyG6s;6>9(Ui4UioEkJNP(wGD(N???u@A-$L*CQ|bZT=a1jYp8Z=i%%(l_r(XD~=DfEQG$zqSmfBymDDR=KzD>P{{+L{N z4}G1O&qC6v_we`L7Q7^qicG=r;gRzEREn=L(w$ diff --git a/deploy/charts/redis-0.1.0.tgz b/deploy/charts/redis-0.1.0.tgz index d11be5b625e79656adfb1f8d782104404932c9e9..265fd58febd6bf092486ca17f8e64f0a51b4110c 100644 GIT binary patch delta 2127 zcmV-V2(b6<5AzU^JAYbFj~qu8-*bP8r}o7T%xw3}^b9m7YYibHwntfHgb<2qyWi}T zT>U3i)e|Q69C8Q($$=X=a0v$xNMIzyAs~lOV|(G`uYjtm|5W$P&aSiTbz;rC>`vFK z_g=lO_p4vOZjLb(`v-HvWq(N$w)YCe^E_`n8tK2D=XL*j{(pF|=Li0990cRh#NYG$ z!O$P>f%htc=}I9a;d|bNeRUW24H1&ld&mXN(hwE{hva$vbJ8F5M^20);xw1~(oOgw zvIHWvU0{}Rcu#E~CnX7nptq7EmpO(&@|@9#s9DaUGU)aFzURE|74O6rQ~wLX3KXvj z0M4j?e=_t`{eK7EAQ<`+Pt|`g40iQ@6><%3;fxeag4qMQs`aMmJFU8QuE8CWpvXyt z5M}9%9v9pccv@W#9e`_ah!SK5k{77{l0s$)ku)NVEg|AaB!ZkH)YBX&FNb=PHgZ=Z z4q?E^5i+3-#j&>AnQ9b5c(7_uBx#yS9pJXvmXxFR4GeKp>msJV?BsmVj z)xhXF0C~aKG-EVchVahpP9~=u1*WpJGA$T8#E7F5A^hy;I!|{O$T^KM1lM(D1!HR$ z9gZ4153(YaA^46XkT0mou0huWRtSmwovDf;<1&QtaPnO>Q)C5?P$*SK6Dsw808w6q z;QFrqk$+&K7v=hIQ&%tag91fI)$@{$_8=JFrmo|pS&WCsFp?QJDU%sPZs(B9W;CU8 zX?|UU=Z`*q`max(J^J1MKKbQo%rEUII1B%W!$9HxXfhf5 z!DP7S`J;(H+Ts6I$b$zxh;c?!1lPd60wfoDtCdrZ>C>Tq&rk$4+WJvp7d%wun?^7m z>VIi+Sj=Yh7vT09YnaBcS~N|jT`x5ZM0!bEL{rV%URP6qnW z4tjh1<`go~&ygj4G2hoTIfMrfpl=?q6qvzk)oZSlWE&o;ELSh!g;c6bOM6qzhn)m@Y*A^Y7j(0X|vQaP_PdCamS!phZ@hJR%C zQVr47uPpHy7*roNtgIAa2Edip0DwL7yFvYH9LbDySh z*pMG5K}ljFiDEl8KoLwAJp&t+ihshVhmg`V##F*U8Lwsb=|v_~1N&MHNK z>R9#QYGt^sVN|^`XnT$#SEnwr&BV-FZF@$wH=_(;U&XnvNU|}}QdF0Fk|vlH5(3Zj z^k~BwVTq!G$x~vf=$~5!q3Ap1sIIF8op)M7R79kZ^YhNyVeA_yUHp$RXMfo;!SoW_ z!DrzA$oB?K|7Sc__&@S@_a;QIz*ny!#$t8Efj z4;tOFhogaM10iQMXKl`ek(w!TjLKdOqY)7;S9Tx8xT&aPSR$Z|=I>gbH~L=Z%}oqr zW45ZE(yWy%C9LJ)-0S;J1%K4l8mqZ2zTWLKRg(bLI#8_uYEHkwq0uPe-CT&WR1%sZ zx6JfT-3qO3P>JcQfot6$eF;`8x2ra_`f6SMW~^;ro%2?7c7#>;&X#&b)23(A*2sA# zvnXRB{P- zrmr-ZU|TFfD-^43+D>8T5wzB{>c$_mlib-KR92 zMrhK$Ly@|4=e#H4De-UYz*s%?M%Qk%TRA&3W#{r3+nzQX9d9!Fx*5z)E+Sq2UlX&d z>;HIx7g+p%vg`j`p>*K0x&7sf+TLkxo%&_)=BI=0e1H8gs(<}9t>^W}f(?)~Y7EvO zx5c{sQdsNS?|)y;&zsQ$>DGU9=$XS(pKuq%g0uR+oj@s4f9_UB-<^b7F zzLIqDU+8Yp<$rz&cozTjM_%Xq-%&91cldu5qKbe2Ex3=l`Jgw?grG+ZVOGe3BNPI^ z2T{Q}rjjk|kB@)~5GY|m3Dob4z71(6!R#P-YhQE6*S)@-Y?t-=*WVgmDgc~S|C3RbS8=rTXVaV;yC?pJu&v z=#|~+4F>FQ5CA0M$0(<3t?W%N9NI51+V8Jk@@3U%NAPyClby8W{{a91|NmNV{D%NI F000^ZNY(%V delta 1992 zcmV;(2RHch5bY0;JAWEYZzM<6=l&H>?Mo7varb;ebBeqWBC@-q7%f5wMdj`{p3+u- zq^f$tV2?x&K}6b+8#!Ynk~$$H0HY2L-2s#ou$ z>V4I#<`_|Na5y7eb{8aOdoKYz&+|ruf&S}xUi+`-k9vFl(0})b<57Pw8t!?1ukZKw zz_Lg@ICK^d9{^$MSx`V0dhgpB!GF(Az4=a9Cv%&ffJz!InAUVdJ}$(EQU~- z3rtfE?<(_g5)xwo+LRo*$S?qsWsHVIt#aliL9gp~J?FMH-hmCq|L26|C|*_oxWfN? zo@e}j8TLgm8z+J|S4K79J`kIok+x%lew^C!PM|MZKmfAjJ4Cm%bRN*zLCVid%L z95ajpm=Y$`0STFMa)O792yssvtE&VfVTeN9O@AXS`mSNm>1lqxEg3139WE}dddR|nk(rbJY;jUQ!t zf-{w$lMqII{V$D=^68ZR3fxXj4U-6#OMk~%RuJIieQo<(peNp-7fgIzT0bZA;rl9%PRofQUZrN}TW8gh(=L^PP$ z%`(HLEMkKq2Fh^uj>UN`?{?v9%P=xzOaCdzTHB?7H8@;bzwecyy40~;`vH}+O2>9H zv0MbO(q?Q3Ak&|dn5}1MFn@{wZwA6Nk%T75Ei#=;jiF%(C79+ZxYhybp>Ewwh2=6> znU>@PmP@xyX=3$PSJu?c*QN}r8n865wJ6)THdIV8=hBjc$|!;}T^)5D21*Sf)) zZLt!4Ln^{gR)jJ;*%8R+$ldm2r&H5fnQVB#3SYM+W#gC?FgnKsg@2gv^cb6B$uK)g z!-pt?_BQDKS=~aKP)P~9gN!VWFiew31km>yI2m%9M%Aou&vGOYeW}6>H_0+=h+_56 zn_F1=Qnl#?rsZ3Huer%B`>-0_-Lg7u;LlT*$9PvovQ75eQE{iW9kE(8A#xU&;&jvb zuY?!7pa%5&xvj{09@t&qh5dY{lB;K|82n9 z+iKkv-oP4s`<)0t5`KbmveHOc*Y0VykD49EZ`e*8 a?CxMY*uf6A2LBHL0RR7n+R~W-Gynj^?e)+A diff --git a/deploy/controller/templates/configmap.yaml b/deploy/controller/templates/configmap.yaml index e70d19d3..c7365e2d 100644 --- a/deploy/controller/templates/configmap.yaml +++ b/deploy/controller/templates/configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "controller.fullname" . }}-pod-templates - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "controller.labels" . | nindent 4 }} data: diff --git a/deploy/controller/templates/deployment.yaml b/deploy/controller/templates/deployment.yaml index f5e2fcd5..b135bdfb 100644 --- a/deploy/controller/templates/deployment.yaml +++ b/deploy/controller/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "controller.labels" . | nindent 4 }} spec: diff --git a/deploy/controller/templates/namespace.yaml b/deploy/controller/templates/namespace.yaml index e6940378..fc7d4657 100644 --- a/deploy/controller/templates/namespace.yaml +++ b/deploy/controller/templates/namespace.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Values.metadata.namespace }} + name: {{ .Values.global.namespace }} {{- with .Values.namespace.labels }} labels: {{- toYaml . | nindent 4 }} diff --git a/deploy/controller/templates/rbac.yaml b/deploy/controller/templates/rbac.yaml index cc681c61..7cbfab0e 100644 --- a/deploy/controller/templates/rbac.yaml +++ b/deploy/controller/templates/rbac.yaml @@ -33,7 +33,7 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "controller.serviceAccountName" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} {{- if .Values.rbac.additionalNamespaces }} {{- range .Values.rbac.additionalNamespaces }} @@ -53,7 +53,7 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "controller.serviceAccountName" $ }} - namespace: {{ $.Values.metadata.namespace }} + namespace: {{ $.Values.global.namespace }} {{- end }} {{- end }} @@ -63,7 +63,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ include "controller.fullname" . }}-role - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "controller.labels" . | nindent 4 }} rules: @@ -91,7 +91,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ include "controller.fullname" . }}-rolebinding - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "controller.labels" . | nindent 4 }} roleRef: @@ -101,6 +101,6 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "controller.serviceAccountName" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} {{- end }} diff --git a/deploy/controller/templates/rolebinding.yaml b/deploy/controller/templates/rolebinding.yaml index 2b18cfd9..51b9963e 100644 --- a/deploy/controller/templates/rolebinding.yaml +++ b/deploy/controller/templates/rolebinding.yaml @@ -24,7 +24,7 @@ roleRef: subjects: - kind: ServiceAccount name: aenv-serviceaccount - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} --- @@ -32,7 +32,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: aenv-serviceaccount-role - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} rules: - apiGroups: - '*' @@ -49,7 +49,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: aenv-serviceaccount-rolebinding - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -57,4 +57,4 @@ roleRef: subjects: - kind: ServiceAccount name: aenv-serviceaccount - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} diff --git a/deploy/controller/templates/service.yaml b/deploy/controller/templates/service.yaml index 9b0393a5..6150cb80 100644 --- a/deploy/controller/templates/service.yaml +++ b/deploy/controller/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "controller.labels" . | nindent 4 }} spec: diff --git a/deploy/controller/templates/serviceaccount.yaml b/deploy/controller/templates/serviceaccount.yaml index 3a85c9ca..27fc82df 100644 --- a/deploy/controller/templates/serviceaccount.yaml +++ b/deploy/controller/templates/serviceaccount.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "controller.serviceAccountName" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "controller.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/deploy/controller/values.yaml b/deploy/controller/values.yaml index 5c4ec4a7..2f2e7aa0 100644 --- a/deploy/controller/values.yaml +++ b/deploy/controller/values.yaml @@ -6,8 +6,6 @@ replicaCount: 1 name: controller -metadata: - namespace: aenv sandboxNamespace: aenv-sandbox # Namespace configuration diff --git a/deploy/envhub/templates/_helpers.tpl b/deploy/envhub/templates/_helpers.tpl index b33cfc55..ffb424d0 100644 --- a/deploy/envhub/templates/_helpers.tpl +++ b/deploy/envhub/templates/_helpers.tpl @@ -39,6 +39,6 @@ Selector labels {{ if .Values.redisAddr }} {{- .Values.redisAddr -}} {{ else }} - {{- printf "redis.%s.svc.cluster.local:6379" .Values.metadata.namespace -}} + {{- printf "redis.%s.svc.cluster.local:6379" .Values.global.namespace -}} {{ end }} {{ end }} diff --git a/deploy/envhub/templates/deployment.yaml b/deploy/envhub/templates/deployment.yaml index 44547897..e8744d1c 100644 --- a/deploy/envhub/templates/deployment.yaml +++ b/deploy/envhub/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "envhub.labels" . | nindent 4 }} spec: diff --git a/deploy/envhub/templates/namespace.yaml b/deploy/envhub/templates/namespace.yaml index 3683bd46..de6f2268 100644 --- a/deploy/envhub/templates/namespace.yaml +++ b/deploy/envhub/templates/namespace.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Values.metadata.namespace }} + name: {{ .Values.global.namespace }} {{- with .Values.namespace.labels }} labels: {{- toYaml . | nindent 4 }} diff --git a/deploy/envhub/templates/secret.yaml b/deploy/envhub/templates/secret.yaml index d82e7db3..065cb592 100644 --- a/deploy/envhub/templates/secret.yaml +++ b/deploy/envhub/templates/secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: oss-secret - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} type: Opaque data: # OSS credentials (base64 encoded) diff --git a/deploy/envhub/templates/service.yaml b/deploy/envhub/templates/service.yaml index 92db4e19..f14f3f04 100644 --- a/deploy/envhub/templates/service.yaml +++ b/deploy/envhub/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Values.name }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{ include "envhub.labels" . | nindent 4 }} spec: diff --git a/deploy/envhub/values.yaml b/deploy/envhub/values.yaml index 6c425f30..8ce82fe6 100644 --- a/deploy/envhub/values.yaml +++ b/deploy/envhub/values.yaml @@ -7,9 +7,6 @@ replicaCount: 1 name: envhub -metadata: - namespace: aenv - # Namespace configuration namespace: # Set to true to automatically create the namespace diff --git a/deploy/redis/templates/deployment.yaml b/deploy/redis/templates/deployment.yaml index 81e3d6cb..92ac157f 100644 --- a/deploy/redis/templates/deployment.yaml +++ b/deploy/redis/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "redis.fullname" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "redis.labels" . | nindent 4 }} spec: diff --git a/deploy/redis/templates/namespace.yaml b/deploy/redis/templates/namespace.yaml index 3683bd46..de6f2268 100644 --- a/deploy/redis/templates/namespace.yaml +++ b/deploy/redis/templates/namespace.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Values.metadata.namespace }} + name: {{ .Values.global.namespace }} {{- with .Values.namespace.labels }} labels: {{- toYaml . | nindent 4 }} diff --git a/deploy/redis/templates/persistentvolumeclaim.yaml b/deploy/redis/templates/persistentvolumeclaim.yaml index 389918d7..97342e0a 100644 --- a/deploy/redis/templates/persistentvolumeclaim.yaml +++ b/deploy/redis/templates/persistentvolumeclaim.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ include "redis.fullname" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "redis.labels" . | nindent 4 }} spec: diff --git a/deploy/redis/templates/service.yaml b/deploy/redis/templates/service.yaml index b20ad1a2..3ee17050 100644 --- a/deploy/redis/templates/service.yaml +++ b/deploy/redis/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "redis.fullname" . }} - namespace: {{ .Values.metadata.namespace }} + namespace: {{ .Values.global.namespace }} labels: {{- include "redis.labels" . | nindent 4 }} spec: diff --git a/deploy/redis/values.yaml b/deploy/redis/values.yaml index 6dcfb10a..08f5f7a9 100644 --- a/deploy/redis/values.yaml +++ b/deploy/redis/values.yaml @@ -2,9 +2,6 @@ name: redis -metadata: - namespace: aenv - # Namespace configuration namespace: # Set to true to automatically create the namespace diff --git a/deploy/values.yaml b/deploy/values.yaml index 07ccd32b..da99e225 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -13,12 +13,10 @@ controller: enabled: true replicaCount: 1 name: controller - metadata: - namespace: aenv sandboxNamespace: aenv-sandbox namespace: create: true - image: aenvironment/controller:0.1.0 + image: aenvironment/controller:0.1.5 imagePullPolicy: IfNotPresent service: type: LoadBalancer @@ -39,8 +37,6 @@ redis: # For persistence with ReadWriteOnce access mode, replicaCount must be 1. replicaCount: 1 name: redis - metadata: - namespace: aenv namespace: create: false image: redis:7.2.4 @@ -68,11 +64,9 @@ envhub: enabled: true replicaCount: 1 name: envhub - metadata: - namespace: aenv namespace: create: false - image: aenvironment/envhub:0.1.0 + image: aenvironment/envhub:0.1.5 imagePullPolicy: IfNotPresent service: type: LoadBalancer @@ -93,11 +87,9 @@ api-service: enabled: true replicaCount: 1 name: api-service - metadata: - namespace: aenv namespace: create: false - image: aenvironment/api-service:0.1.0 + image: aenvironment/api-service:0.1.5 imagePullPolicy: IfNotPresent service: type: LoadBalancer