From fa9a27a9e2f4737d75adebde986791a34ed2ab48 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Tue, 10 Jan 2023 17:48:08 +0800 Subject: [PATCH] chore: release for APISIX v2 chart (#446) * chore: release for APISIX v2 chart * chore: set ingress-controller adminAPIVersion to v2 by default * ci: don't check version --- .github/workflows/ci.yaml | 4 +- charts/apisix/Chart.lock | 6 +- charts/apisix/Chart.yaml | 8 +- charts/apisix/README.md | 3 +- .../apisix/charts/apisix-dashboard-0.6.1.tgz | Bin 6870 -> 0 bytes .../apisix/charts/apisix-dashboard-0.7.0.tgz | Bin 0 -> 6981 bytes charts/apisix/templates/configmap.yaml | 70 ------------------ charts/apisix/values.yaml | 5 +- 8 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 charts/apisix/charts/apisix-dashboard-0.6.1.tgz create mode 100644 charts/apisix/charts/apisix-dashboard-0.7.0.tgz diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9b7b46f7..d5ba0895 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: && cd ../.. \ && helm repo add bitnami https://charts.bitnami.com/bitnami \ && helm repo add apisix https://charts.apiseven.com \ - && ct lint \ + && ct lint --check-version-increment=false \ --charts charts/apisix \ --charts charts/apisix-dashboard \ --charts charts/apisix-ingress-controller' @@ -83,4 +83,4 @@ jobs: echo "Please use helm-docs in your clone, of your fork, of the project, and commit a updated README.md for the chart." fi git diff --exit-code - rm -f ./helm-docs \ No newline at end of file + rm -f ./helm-docs diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock index 14c7061b..36a28254 100644 --- a/charts/apisix/Chart.lock +++ b/charts/apisix/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 8.3.4 - name: apisix-dashboard repository: https://charts.apiseven.com - version: 0.6.1 + version: 0.7.0 - name: apisix-ingress-controller repository: https://charts.apiseven.com version: 0.11.3 -digest: sha256:c7873b7d21e0f5eaeca649dccdc344de5fceed50c11925c9f71263659671057a -generated: "2022-12-30T18:30:37.854445324+08:00" +digest: sha256:16443ab0568e0a70214309f4da138ebf645a4f1e06f31edb3d404b189f790a43 +generated: "2023-01-10T15:54:08.708874467+08:00" diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml index 2be12259..4a6cadb6 100644 --- a/charts/apisix/Chart.yaml +++ b/charts/apisix/Chart.yaml @@ -16,7 +16,7 @@ # apiVersion: v2 name: apisix -description: A Helm chart for Apache APISIX +description: A Helm chart for Apache APISIX v2.x icon: https://apache.org/logos/res/apisix/apisix.png # A chart can be either an 'application' or a 'library' chart. # @@ -31,12 +31,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.12.3 +version: 0.11.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 3.1.0 +appVersion: 2.15.1 sources: - https://github.com/apache/apisix-helm-chart @@ -46,7 +46,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: etcd.enabled - name: apisix-dashboard - version: 0.6.1 + version: 0.7.0 repository: https://charts.apiseven.com condition: dashboard.enabled alias: dashboard diff --git a/charts/apisix/README.md b/charts/apisix/README.md index 9cda1c64..7626839f 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -62,7 +62,7 @@ The command removes all the Kubernetes components associated with the chart and | apisix.httpRouter | string | `"radixtree_uri"` | Defines how apisix handles routing: - radixtree_uri: match route by uri(base on radixtree) - radixtree_host_uri: match route by host + uri(base on radixtree) - radixtree_uri_with_parameter: match route by uri with parameters | | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull policy | | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image repository | -| apisix.image.tag | string | `"3.1.0-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. | +| apisix.image.tag | string | `"2.15.1-debian"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. | | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` | | apisix.luaModuleHook | object | `{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}` | Whether to add a custom lua module | | apisix.luaModuleHook.configMapRef | object | `{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes | @@ -143,6 +143,7 @@ The command removes all the Kubernetes components associated with the chart and | gateway.tls.sslProtocols | string | `"TLSv1.2 TLSv1.3"` | TLS protocols allowed to use. | | gateway.type | string | `"NodePort"` | Apache APISIX service type for user access itself | | global.imagePullSecrets | list | `[]` | Global Docker registry secret names as an array | +| ingress-controller.config.apisix.adminAPIVersion | string | `"v2"` | | | ingress-controller.enabled | bool | `false` | | | initContainer.image | string | `"busybox"` | Init container image | | initContainer.tag | float | `1.28` | Init container tag | diff --git a/charts/apisix/charts/apisix-dashboard-0.6.1.tgz b/charts/apisix/charts/apisix-dashboard-0.6.1.tgz deleted file mode 100644 index 2090dbda34636e12c624f5b08062e1e35ee0a2be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6870 zcmV;{8Y$%;iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PKDHbKAD^Z-3@ru~*KS#yJ)x*^ZOyPR@+$xUKI=9FOI+x0A_4 z5D7_WNP-1GKaTD5w|{5x;7ioQkGk!Ah0Meh2`oNX0E-2%Sdf%ScG(VzoQ^mVVdr2< zgz~RQ9DVaxq1)|t_jY&n-)^^C|J&Vp+54uqyR*H$_p-Os-T9{5+uiN;zJczeAy^PH zsfhTd`{2Clh5MTXlCqzvkc=mNIN$b2n&v;Z{oan>^+GBG!BVB)?ZZzriXp&80%I;< zKPADG!v4w8;OPIuTi1*{7GU(LQmO2BIz-3vxtMe!KH;(>sO*@gXaD$VGVx-<5=B@- zh3tE6NJvckpa}16@9e(Z+uPgO+40QFdb9P^RjOa75eo=n_0C;6y8fQu^Zsl`|3$-0 z|34>DM&+XlfF=EZZ+CaM-v9UZy6gV`6k)^LfOjmQiKHPY4hlQ7>C*!~Ru@E2_6KuUsRDk1 za%0L;-`jvQEXLpmheR5(I#0#nSDx82l!|M)umx5C!nWV_HsCo%Y1xmh&HoEmJcF2A zLBbVel9njb%Ydc|SONi$(}}Mwrin3$Tp;l4{`+@r(>Re8*cN^gNHnWJ3EMfS@UtOmT6A;~X}E&dewXkY-VI!Xp-3_2FoI%+-mY zk|xRn*nkh`R0tO8?m$6P21O=tG3Am%Xv@vaXEVkZ3W4tdMmBmun?xx~sD*cuMbUr; zf-2dEPoMP|?egkFtL2TeD4KccNh;1+K=*?{msUd@nA)TgE~Zqs1_Cx75EBvPlxIDh=NOLcvq_+=l&k@AR{vB>a#>SErn- zA6P`?l~gn?@mXZazC7j$MyS93D5>Z}PeTcKGG-IZ0H5$LK*Xe?iFpQ?a;Z>T)Bo(d zlnd2|?~nriq$&tq^bHtfDSnsOa+&V$aTY0-q9|5Ds0m`lqcCwDIWeDtD3gi`ONu68 z%2}eMqm3M}ol9rAz4Pk3JX`YtOo1|C+gK{-m|Z&9`bQsHwu`p%#D|#sh)5Oy$<$Pj zYW8C$sW27)Uq^;WdBH{K-b8%j5KyXX^}$l{2aSTe!-#b`7^F&p+_Od@HT;lHyH6$w>TLeKBL z{wGM&X22#ph=`QO*!zgGV;Qzk_g448Ci#H0zvi@k#yggvuhaG+nXu%tF`|lOn*^FR z_Li2$8S+>w0=iCI3!|4LP9thMB{pW;SKGF$%#2DA4@hLYFr-9H^UjT&@4WD!AOp+E z6jV^C1E|P7ZD49s@rF%$uxMMrZ52tEZwa=AQHg5v@&uJU69Fyc?=KWGnUN^E0zm^F z$21AGlvUgg`B(Xfm8aI?S8<3aIk%b_ky^b=v6IFu zIWMdVP^iHE2Ev`4`+u1UtOw)=CNe{zq7Nq zQ=9+q^|sgRe@_y6KKw|Hs3|R;!N=2gIBOJHl2|=eQk>PsBnf5TyS{D%8-xF|SuAp6 zpY7Xld#hszl1wN((`s1%%}i`PG+6(X)D56=58CeT}*s+}`#( zo$G6pm8J`~x7XL;7t~EOul^X}Om?gnF9=H{w2pa5Pq^aK!Kt(X23fgVdZ)8dW3JBtqMmU`K$NAgaTWE9mP4Waw`=)j6<2c}J zW%g6|v!7THw=FmAkVuIoL6n6QS~DZIn?tm8kvD4?k4|a`k-oeaPNrzAAxcG5CjDHy z#&`C|ZA$|PrrfPtJhL$R&vKs4VgEZ$!tY6h!>(9V1pt8JsSig=FQh2)l>&h=y}rhU4cI0-Cuhi~s(-SRwu_QhQ) z@!O&j2ZyIWA00H*qo%q__IJn^+HE%kKR) zL|B54dGw!EnNk+~fA*03mkJB?zb{i7rBp~?r4QQ*TB85G?CsX~e_wUGdu#pgDZ+aH zXTATk-v24>|6E^pUU-L>sa{E{?E&a@Am4k@vC4^Fcb-4|w~J_cnaVe|HF~6Xs!MrS z1a3fyED2z5M?bQ7kd4Re5?bw6ZSrDZ9+-^=lIMV`+!g$uk%)~M4YAgB0etTlYG~{D z3Uk21NEp$8U@Mk9rsdUAUF$ex?i2 zf3tec78rAO7$SB3&)}@Qyd$_&utbfa^$*$phiuhonM_x2XU&h5)>o=l>@(Kv2CGz8 zt!*bJRzyZLTBUk*^rCL-Wh%4VJUgL%1A?XzDu}IrwxIQ;b@xuiF<-h`s@_AfmKOmG5jueyKIt((mWHwD@gy#*y1Xp)Ng>wwMw__l)>&8QXT7-XMl5CvX~j8MLwYv{>(5Lt7Pa;IfY7`t zyiy^{Ti?g?1X(qjZ#R}}!^-oOruLijh$iJSm*j{e-?9%g)9pqAGqU2(R&dv0VOTK# zGaKA7NgrwqxNQCZRjZX(4*^#cjA1raW9!Be(^9^SQ`hn_}hf%f?-W2^Eqt z&t*N;#cHtJs_Z7_-^+;r+EDBcmQz`srThxDF=w+>{#MvAA*rSq3kW)6rwZ3{11MeO zh8Qyh8($dKMtoAdj><+}+H&kmv2tu<%T&*( zMjwk0fKa!@h zlPiI5b9wmp(E^b`dew6-jo6ABs-2!`23=UZluv~e3S4OqqN2jh#WDwv zoC~J6U8QV}f%BTvR7w z1;cOvt9&T&_avV#&dx`hXOMY@f-4^Is1IicC*|1;JEsYi@uP>ckAlN^c9?x=R)GeTLk-K%Ehb?A=RaPq=l@R; z*7N`M{C_?Fuh{=pEHLKGk}InOMU>9@_J}ItRt$dPg8c{8+~|ad`!*UCf4}7ejr&ZW zt~{l7W2kAN1mDjrmfTlks~ik1O%KXdQi@{}l@E{3OH{Qte& zJ+FRh6?3nu(HAr@`5TkL{y7z7LQ9#I?eeb5A)q-|db|QK8#UjPS_q+P z+_%_b?JqhTS)l*BG3k%i|F^ea&Dj5Udu#izCkbo)f35$o_5Wq||MrCA-*4g8EYdaj z*eP7)l&m(|CDZ*mK6%VQXO`nm>V^wV_81lWkE)s2{f(J+|7yeN-!?2C|Lxh<2dDu{ z$NyfpI{t5WcV50)kN-~**5m(r{9lj%^Vk38p1@zEC)n6`RTmZ*x&E2!Sv3|s;{@xQybU9lB|Fx&%K79HX zqkj9@S>cL_#FuyA!~zGWnyjGM0F^VgKc?qYJfSq4>Hj|RlT8vX=ws!vtpC5O8|369CfD@t=73P*4Q}1vwr3s8O7HJhbCBauRp)$YpNVuqN4~TM zDQH9#JEwY+q4eJ9UkRPqnS?piZxw&|Kbt;$NTMq}t4IwbRNwTK2fpXO9ef!mGt;mR zx_&+wK*)sj{0UPX{l9_l`J?}cj{e`hm`*zQpZh7#lTJZsM1rqbs#SRDz3}Bl>b>ws zS1~?w!6x2||9TtnGZBnu5{}*;O3zOP|BVL9^I1qq$3z$WH_tzp0S{^C@1WGo z^#9Yt{kQKA{WyHQJQnx=?Vaw++Wfz_^J;f@-T$8=Y|OpE)B99^_4&EG&vU}mG#mK= zk2`a&BI|7G86uTzl9*X$OulNzk3<3`@(TZ^TuO#hQk=^fj|qwcPxT#HHDGEgcs7{= zfwAC;!f69b6cu9kU@}eyN1Q9E1W9quH*?Yl3bzJ&(h8pnua~BP{Z6OiD{j-> z7FD{m>(fs(iVJ>N9c0tVN-(bSgztG98*n11o{CGRsPw!#TirZemi=!!H;O&KxBE{+ z=0~dFl%^bxk}>zZ;cyu6MDmDgw}bkAIDO5Ty*pGE zsY=S;zU}6F+m@o;HdF2*hQWF^&F`bIH7aMTnkTxlN^EsC$;=mbCbDvum+yIB29(05 z%G=M+H!8n3VMHT-;eTr%K@5LkKjScviuxg#u zd7UM5xILe%j)hFx%Yr0e`Z}+8obp89azv!$0V8giu6#eB=6|FU;9KkZ)vs_Rhq#n4 zdCXNflTHND8p=G*=m@mVmrn;j?Vp|@e{5cc9c8>G;c~Pl-U?Vxh#)alR7lfw^J|?z znX4fqCY8N+(X}!ZjA@?Etq#sK@}eHplroXGX?uMo>QK^5!a8}4_7POB0Hq~xH=ykz zs^JFS7MDQJnru8uxB)#$YW(EgKzk-Y)5}K=3-ZvYhGi$eLtBo461rkJGFCBtg&B8_ zfalH@a|Z|TT)RegcVU-%m7cwBVjjbUMZbi$+(SJtM>EO%*IT%kyZsxdN(fzt{D9_IlT0Bd?0%|I2xWaUnIn z0v^Dt@=dnoy1X%RY#xR=qI8awYs&eLlY6uBu3608Nhm!y%+fYB-{6vA%B5=VS6Db4 z>(qrRkeCSdy$e{4F*OT2+Lbl{{<~65*amr@0_2_G4=BM3_#-}P z@EF?Ii}%e<$`PNKb!e>Q;!f*^K8Unu{FyeAKEzm!l&KKQC~K#xOUUXte$m_YZ@C2# zzn}s~zbTtcspvyUN7-acTgGhZi@&#wcUP1;2@AGhOcaR_A$}Y>b*VU;eIKQ$0{XA0 zA1zd89xu#OmCBy-=Jl~kIgj;;2b|x}(__tjo%iA4u-DL~sy^zLVw|tzpYX7}A$vcB z*SEtNgk{f4tMQPB)NU~AVJ}5wQnHD@ru!bimLV)TNm>CQYIY@8OOKAQHp8{;(E0`Q z%>~~}U>e=Ca3*FFX{ZaPS9W)OIl?9$76{#y;tMf4ggPn>OIR0xToL0OgtNW^mmnP2 zyOirr{T8uN-$uGL%t0vc0Po%ib0*#gVS@*iMJR9J(5MxqbPK_i_H$O?p}uu~I3Hoj zp~!p%={-wWoW=I68cJ^GGgZ$`0}@fatGpCY6T&8mJ;!^=0)*spDMFszN9-WN>SS>S z;bNyGLqo-QlYxVikB}A7AT2z4+&A37@O5`_J6!5cWLO|Hu^tuV>`JNC%+3TEk68eR zmnoN-xa*?T6Rgu$)v^^-GPwD}G_X8Wv#@fpIOj5Fslr^{r4PdVF`OFaS5*(80&310 zPyyQ+4*)N$DngM$*8HlBA&ZT8Anzs#gJ} zqQ>Fi2JF>!XYU4XdG3+Jg6hki3=Hcj>OKmF`Mr(9a+TIE?JJQTZWRX{ifGXDd$0fX zrdXyj!;KNIr{C`%+(o25#lB~AzE;RCldn&)2f8rdid?H6k{G(O6w65$Q>qVmklH~B zx1^2TM5hfOgNH+uSi?qyl?6Q0Z_C#@*3g+-9ep@54)i58+wJx&2$NbgZUM1(+e#-4 zX;`utn%z~+wSXps6~T7{WuNlOnEBYlS~aZit=aa&8CaHqH-86H#&uYSby$aWxI_4# Q00030|8|yKu>hg~0GhIslK=n! diff --git a/charts/apisix/charts/apisix-dashboard-0.7.0.tgz b/charts/apisix/charts/apisix-dashboard-0.7.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..0b05dd23461e851699ca49e4cab9a317a599d7f9 GIT binary patch literal 6981 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 literal 0 HcmV?d00001 diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml index ad9bcde1..873c4cb9 100644 --- a/charts/apisix/templates/configmap.yaml +++ b/charts/apisix/templates/configmap.yaml @@ -14,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- $isBeta := (semverCompare ">=2.99.0-0" .Values.apisix.image.tag) }} - {{- if .Values.apisix.enabled }} apiVersion: v1 kind: ConfigMap @@ -89,7 +87,6 @@ data: # disk_path: "/tmp/disk_cache_two" # cache_levels: "1:2" - {{- if not $isBeta }} config_center: etcd # etcd: use etcd to store the config value # yaml: fetch the config value from local yaml file `/your_path/conf/apisix.yaml` allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow @@ -121,7 +118,6 @@ data: - name: "viewer" key: {{ .Values.admin.credentials.viewer }} role: viewer - {{- end }} router: http: {{ .Values.apisix.httpRouter }} # radixtree_uri: match route by uri(base on radixtree) @@ -225,7 +221,6 @@ data: stream_configuration_snippet: {{- toYaml .Values.configurationSnippet.stream | indent 6 }} {{- end }} - {{- if not $isBeta }} etcd: {{- if .Values.etcd.enabled }} host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster. @@ -255,7 +250,6 @@ data: sni: "{{ .Values.etcd.auth.tls.sni }}" {{- end }} {{- end }} - {{- end }} {{- if .Values.discovery.enabled }} discovery: @@ -310,69 +304,5 @@ data: {{- toYaml .Values.wasmPlugins.plugins | nindent 8 }} {{- end }} - {{- if $isBeta }} - deployment: - role: traditional - role_traditional: - config_provider: etcd - admin: - allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow - {{- if .Values.admin.allow.ipList }} - {{- range $ips := .Values.admin.allow.ipList }} - - {{ $ips }} - {{- end }} - {{- else }} - - 0.0.0.0/0 - {{- end}} - {{- if or (index .Values "ingress-controller" "enabled") .Values.dashboard.enabled }} - - 0.0.0.0/0 - {{- end}} - # - "::/64" - {{- if .Values.admin.enabled }} - admin_listen: - ip: 0.0.0.0 - port: {{ .Values.admin.port }} - {{- end }} - # Default token when use API to call for Admin API. - # *NOTE*: Highly recommended to modify this value to protect APISIX's Admin API. - # Disabling this configuration item means that the Admin API does not - # require any authentication. - admin_key: - # admin: can everything for configuration data - - name: "admin" - key: {{ .Values.admin.credentials.admin }} - role: admin - # viewer: only can view configuration data - - name: "viewer" - key: {{ .Values.admin.credentials.viewer }} - role: viewer - etcd: - {{- if .Values.etcd.enabled }} - host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster. - {{- if .Values.etcd.fullnameOverride }} - - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Values.etcd.fullnameOverride }}:{{ .Values.etcd.service.port }}" - {{- else }} - - "{{ include "apisix.etcd.auth.scheme" . }}://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }}:{{ .Values.etcd.service.port }}" - {{- end}} - {{- else }} - host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster. - {{- range $value := .Values.etcd.host }} - - "{{ $value }}" # multiple etcd address - {{- end}} - {{- end }} - prefix: {{ .Values.etcd.prefix | quote }} # configuration prefix in etcd - timeout: {{ .Values.etcd.timeout }} # 30 seconds - {{- if .Values.etcd.auth.rbac.create }} - user: {{ .Values.etcd.auth.rbac.user | quote }} - password: {{ .Values.etcd.auth.rbac.password | quote }} - {{- end }} - {{- if .Values.etcd.auth.tls.enabled }} - tls: - cert: "/etcd-ssl/{{ .Values.etcd.auth.tls.certFilename }}" - key: "/etcd-ssl/{{ .Values.etcd.auth.tls.certKeyFilename }}" - verify: {{ .Values.etcd.auth.tls.verify }} - sni: "{{ .Values.etcd.auth.tls.sni }}" - {{- end }} - {{- end }} {{- end }} {{- end }} diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index df11f772..6ebabd7f 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -81,7 +81,7 @@ apisix: pullPolicy: IfNotPresent # -- Apache APISIX image tag # Overrides the image tag whose default is the chart appVersion. - tag: 3.1.0-debian + tag: 2.15.1-debian # -- Use a `DaemonSet` or `Deployment` kind: Deployment @@ -532,6 +532,9 @@ dashboard: ingress-controller: enabled: false + config: + apisix: + adminAPIVersion: "v2" vault: # -- Enable or disable the vault integration