feat: release Ingress Controller 2.0.0-rc5 (#891)

Author: AlinsRan

charts/apisix-ingress-controller/Chart.yaml

@@ -24,8 +24,8 @@ keywords:
   - nginx
   - crd
 type: application
-version: 1.0.5
-appVersion: 2.0.0-rc4
+version: 1.0.6
+appVersion: 2.0.0-rc5
 sources:
   - https://github.com/apache/apisix-helm-chart
 

charts/apisix-ingress-controller/README.md

@@ -127,15 +127,15 @@ The same for container level, you need to set:
 | config.provider.syncPeriod | string | `"1m"` |  |
 | config.provider.type | string | `"apisix"` |  |
 | config.secureMetrics | bool | `false` |  |
-| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.21.0"}}` | Set adc sidecar container configuration |
+| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.21.2"}}` | Set adc sidecar container configuration |
 | deployment.affinity | object | `{}` |  |
 | deployment.annotations | object | `{}` | Add annotations to Apache APISIX ingress controller resource |
 | deployment.image.pullPolicy | string | `"IfNotPresent"` |  |
 | deployment.image.repository | string | `"apache/apisix-ingress-controller"` |  |
-| deployment.image.tag | string | `"2.0.0-rc4"` |  |
+| deployment.image.tag | string | `"2.0.0-rc5"` |  |
 | deployment.nodeSelector | object | `{}` |  |
 | deployment.podAnnotations | object | `{}` |  |
-| deployment.podSecurityContext | object | `{}` |  |
+| deployment.podSecurityContext | object | `{"fsGroup":2000}` | Set security context for the pod fsGroup: 2000 ensures containers can share Unix socket files via a common group. |
 | deployment.replicas | int | `1` |  |
 | deployment.resources | object | `{}` | Set pod resource requests & limits |
 | deployment.tolerations | list | `[]` |  |

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

@@ -52,6 +52,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: ADC_SERVER_URL
+          value: "unix:/sockets/adc.sock"
         image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}"
         imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
         ports:
@@ -67,6 +69,8 @@ spec:
         - name: {{ .Release.Name }}-ingress-config
           mountPath: /app/conf/config.yaml
           subPath: config.yaml
+        - name: socket-volume
+          mountPath: /sockets
         {{- if .Values.webhook.enabled }}
         - name: webhook-certs
           mountPath: /certs
@@ -88,14 +92,14 @@ spec:
         resources:
           {{- toYaml .Values.deployment.resources | nindent 10 }}
         securityContext:
-          {{- toYaml .Values.deployment.podSecurityContext | nindent 10 }}
+          {{- toYaml .Values.deployment.securityContext | nindent 10 }}
       - name: adc-server
         image: "{{ .Values.deployment.adcContainer.image.repository }}:{{ .Values.deployment.adcContainer.image.tag }}"
         imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
         args:
         - "server"
         - "--listen"
-        - "http://127.0.0.1:3000"
+        - "unix:/sockets/adc.sock"
         - "--listen-status"
         - "3001"
         env:
@@ -122,10 +126,13 @@ spec:
             port: 3001
           initialDelaySeconds: 5
           periodSeconds: 5
+        volumeMounts:
+          - name: socket-volume
+            mountPath: /sockets
         resources:
           {{- toYaml .Values.deployment.resources | nindent 10 }}
         securityContext:
-          {{- toYaml .Values.deployment.podSecurityContext | nindent 10 }}
+          {{- toYaml .Values.deployment.securityContext | nindent 10 }}
       {{- with .Values.deployment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -146,12 +153,14 @@ spec:
       - name: {{ .Release.Name }}-ingress-config
         configMap:
           name: {{ .Release.Name }}-ingress-config
+      - name: socket-volume
+        emptyDir: {}
       {{- if .Values.webhook.enabled }}
       - name: webhook-certs
         secret:
           secretName: {{ include "apisix-ingress-controller-manager.webhook.secretName" . }}
       {{- end }}
       securityContext:
-        runAsNonRoot: false
+        {{- toYaml .Values.deployment.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ .Release.Name }}
       terminationGracePeriodSeconds: 10

charts/apisix-ingress-controller/values.yaml

@@ -52,23 +52,27 @@ deployment:
   nodeSelector: {}
   tolerations: []
   affinity: {}
-  podSecurityContext: {}
-    # fsGroup: 2000
+
+  # -- Set security context for the pod
+  # fsGroup: 2000 ensures containers can share Unix socket files via a common group.
+  podSecurityContext:
+    fsGroup: 2000
+
   # -- Topology Spread Constraints for pod assignment spread across your cluster among failure-domains
   # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
   topologySpreadConstraints: []
   image:
     repository: apache/apisix-ingress-controller
     pullPolicy: IfNotPresent
-    tag: "2.0.0-rc4"
+    tag: "2.0.0-rc5"
   # -- Set pod resource requests & limits
   resources: {}
 
   # -- Set adc sidecar container configuration
   adcContainer:
     image:
       repository: ghcr.io/api7/adc
-      tag: "0.21.0"
+      tag: "0.21.2"
     config:
       logLevel: "info"