chore: update helm chart

Author: dspo

.github/workflows/push-docker.yaml

@@ -2,7 +2,10 @@ name: push on dockerhub
 on: 
   release:
     types: [published]
-      
+  push:
+    branches:
+    - release-v2-dev
+  workflow_dispatch:
 jobs:
   docker:
     runs-on: ubuntu-20.04

Makefile

@@ -316,3 +316,9 @@ mv $(1) $(1)-$(3) ;\
 } ;\
 ln -sf $(1)-$(3) $(1)
 endef
+
+charts-crds:
+	@echo "build gateway-api standard crds"
+	$(KUSTOMIZE) build github.com/kubernetes-sigs/gateway-api/config/crd\?ref=${GATEAY_API_VERSION} > charts/crds/gwapi-crds.yaml
+	@echo "build apisix ic crds"
+	$(KUSTOMIZE) build config/crd > charts/crds/apisixic-crds.yaml

charts/crds/gateway.apisix.io_plugingconfig.yaml

@@ -13,7 +13,7 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - services
+  - namespaces
   verbs:
   - get
   - list
@@ -29,7 +29,68 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - namespaces
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - backendtrafficpolicies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - backendtrafficpolicies/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - consumers
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - consumers/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - gatewayproxies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - httproutepolicies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - httproutepolicies/status
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - pluginconfigs
   verbs:
   - get
   - list
@@ -102,12 +163,29 @@ rules:
   - get
   - update
 - apiGroups:
-  - apisix.apache.org
+  - networking.k8s.io
   resources:
-  - pluginconfigs
-  - pluginsconfigs/status
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
   verbs:
-  - '*'
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - update
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1

charts/templates/cluster_role.yaml

@@ -26,7 +26,16 @@ spec:
         {{- include "api7-ingress-controller-manager.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-      - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      - env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         volumeMounts:
         - name: {{ .Release.Name }}-ingress-config
           mountPath: /app/conf/config.yaml

charts/templates/deployment.yaml

@@ -1,4 +1,5 @@
 nameOverride: ""
+fullnameOverride: ""
 labelsOverride: {}
 annotations: {}
 podAnnotations: {}
@@ -35,3 +36,7 @@ image:
   repository: api7/api7-ingress-controller
   pullPolicy: IfNotPresent
   tag: "dev"
+
+autoscaling:
+  enabled: false
+  minReplicas: 1