diff --git a/.github/actions/chart-releaser-action b/.github/actions/chart-releaser-action index 6eec3608..c25b74a9 160000 --- a/.github/actions/chart-releaser-action +++ b/.github/actions/chart-releaser-action @@ -1 +1 @@ -Subproject commit 6eec360873ca10c8e462c87ad50c38d1a4332638 +Subproject commit c25b74a986eb925b398320414b576227f375f946 diff --git a/.github/actions/setup-helm b/.github/actions/setup-helm deleted file mode 160000 index feeafa61..00000000 --- a/.github/actions/setup-helm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit feeafa615201d17b5efbb26af053541ebb8c3677 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 834f6fbd..aba75a2f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,6 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: + submodules: recursive fetch-depth: 0 - name: Configure Git @@ -20,9 +21,9 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install Helm - uses: ./.github/actions/setup-helm - with: - version: v3.4.0 + run: | + echo "installing helm 3..." + curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash - name: Add Helm repo run: | diff --git a/.gitmodules b/.gitmodules index 07d6be61..3cfd39c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,9 +2,6 @@ path = .github/actions/setup-kind url = https://github.com/engineerd/setup-kind.git branch = v0.5.0 -[submodule ".github/actions/setup-helm"] - path = .github/actions/setup-helm - url = https://github.com/Azure/setup-helm.git [submodule ".github/actions/chart-releaser-action"] path = .github/actions/chart-releaser-action url = https://github.com/helm/chart-releaser-action.git diff --git a/charts/apisix-ingress-controller/Chart.yaml b/charts/apisix-ingress-controller/Chart.yaml index 1cabdf63..eae4b651 100644 --- a/charts/apisix-ingress-controller/Chart.yaml +++ b/charts/apisix-ingress-controller/Chart.yaml @@ -24,8 +24,8 @@ keywords: - nginx - crd type: application -version: 0.5.0 -appVersion: 1.0.0 +version: 0.6.0 +appVersion: 1.1.0 maintainers: - name: tao12345666333 diff --git a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml b/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml index 421c7ca7..a69458c8 100644 --- a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml +++ b/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml @@ -44,7 +44,11 @@ spec: - name: v1 served: true storage: false + deprecated: true - name: v2alpha1 + served: true + storage: false + - name: v2beta1 served: true storage: true scope: Namespaced @@ -66,6 +70,7 @@ spec: anyOf: - required: ["http"] - required: ["tcp"] + - required: ["stream"] properties: http: type: array @@ -262,6 +267,47 @@ spec: required: - serviceName - servicePort + stream: + type: array + minItems: 1 + items: + type: object + required: [ "name", "match", "backend", "protocol" ] + properties: + "protocol": + type: string + enum: [ "TCP", "UDP" ] + name: + type: string + minLength: 1 + match: + type: object + properties: + ingressPort: + type: integer + minimum: 1 + maximum: 65535 + required: + - ingressPort + backend: + type: object + properties: + serviceName: + type: string + minLength: 1 + servicePort: + type: integer + minimum: 1 + maximum: 65535 + resolveGranualrity: + type: string + enum: [ "endpoint", "service" ] + subset: + type: string + required: + - serviceName + - servicePort + --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/charts/apisix-ingress-controller/templates/rbac.yaml b/charts/apisix-ingress-controller/templates/rbac.yaml index 2456cf20..93e50789 100644 --- a/charts/apisix-ingress-controller/templates/rbac.yaml +++ b/charts/apisix-ingress-controller/templates/rbac.yaml @@ -155,6 +155,14 @@ rules: - leases verbs: - '*' + - apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/charts/apisix-ingress-controller/values.yaml b/charts/apisix-ingress-controller/values.yaml index 45341100..7f799813 100644 --- a/charts/apisix-ingress-controller/values.yaml +++ b/charts/apisix-ingress-controller/values.yaml @@ -42,7 +42,7 @@ replicaCount: 1 image: repository: apache/apisix-ingress-controller pullPolicy: IfNotPresent - tag: "1.0.0" + tag: "1.1.0" imagePullSecrets: [] @@ -75,7 +75,7 @@ config: kubeconfig: "" # how long should apisix-ingress-controller re-synchronizes with Kubernetes, # default is 6h, - resyncInterval: "60s" + resyncInterval: "6h" # namespace list that controller will watch for resources, # by default all namespaces (represented by "*") are watched. appNamespaces: ["*"] @@ -92,8 +92,8 @@ config: # "extensions/v1beta1", default is "networking/v1". ingressVersion: "networking/v1" # the supported apisixroute api group version, can be "apisix.apache.org/v1" - # or "apisix.apache.org/v2alpha1", - apisixRouteVersion: "apisix.apache.org/v2alpha1" + # "apisix.apache.org/v2alpha1" or "apisix.apache.org/v2beta1" + apisixRouteVersion: "apisix.apache.org/v2beta1" # APISIX related configurations. apisix: baseURL: "http://apisix-admin:9180/apisix/admin"