feat: add initContainer for apisix-ingress-controller (#143)

Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com>
Co-authored-by: Alex Zhang <tokers@apache.org>

Author: 3 people

.github/workflows/release.yaml

@@ -36,3 +36,4 @@ jobs:
           charts_dir: .
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_SKIP_EXISTING: true

charts/apisix-ingress-controller/templates/configmap.yaml

@@ -35,7 +35,7 @@ data:
       ingress_version: {{ .Values.config.kubernetes.ingressVersion | quote }}
       apisix_route_version: {{ .Values.config.kubernetes.apisixRouteVersion | quote }}
     apisix:
-      base_url: {{ .Values.config.apisix.baseURL | quote }}
+      base_url: http://{{ .Values.config.apisix.serviceName }}.{{ .Values.config.apisix.serviceNamespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.apisix.servicePort }}/apisix/admin
       admin_key: {{ .Values.config.apisix.adminKey | quote }}
 kind: ConfigMap
 metadata:

charts/apisix-ingress-controller/templates/deployment.yaml

@@ -46,6 +46,10 @@ spec:
             items:
               - key: config.yaml
                 path: config.yaml
+      initContainers:
+        - name: wait-apisix-admin
+          image: {{ .Values.initContainer.image }}:{{ .Values.initContainer.tag }}
+          command: ['sh', '-c', "until nc -z {{ .Values.config.apisix.serviceName }}.{{ .Values.config.apisix.serviceNamespace }}.svc.{{ .Values.clusterDomain }} {{ .Values.config.apisix.servicePort }} ; do echo waiting for apisix-admin; sleep 2; done;"]
       containers:
         - name: {{ .Chart.Name }}
           command:

charts/apisix-ingress-controller/values.yaml

@@ -45,6 +45,7 @@ image:
   tag: "1.3.0"
 
 imagePullSecrets: []
+clusterDomain: cluster.local
 
 service:
   port: 80
@@ -96,11 +97,17 @@ config:
     apisixRouteVersion: "apisix.apache.org/v2beta1"
   # APISIX related configurations.
   apisix:
-    baseURL: "http://apisix-admin:9180/apisix/admin"
+    serviceName: apisix-admin
+    serviceNamespace: ingress-apisix
+    servicePort: 9180
     adminKey: "edd1c9f034335f136f87ad84b625c8f1"
 
 resources: {}
 
+initContainer:
+  image: busybox
+  tag: 1.28
+
 autoscaling:
   enabled: false
   minReplicas: 1