This is an automated email from the ASF dual-hosted git repository.
kvn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new ba0b70d Bump apisix-ingress version to v1.1.0 (#125)
ba0b70d is described below
commit ba0b70d5cc4e43d04b20cc86c3e8b2f60af1b3db
Author: Jintao Zhang <[email protected]>
AuthorDate: Thu Aug 5 10:06:16 2021 +0800
Bump apisix-ingress version to v1.1.0 (#125)
Signed-off-by: Jintao Zhang <[email protected]>
---
.github/actions/chart-releaser-action | 2 +-
.github/actions/setup-helm | 1 -
.github/workflows/release.yaml | 7 ++--
.gitmodules | 3 --
charts/apisix-ingress-controller/Chart.yaml | 4 +-
.../crds/customresourcedefinitions.yaml | 46 ++++++++++++++++++++++
.../apisix-ingress-controller/templates/rbac.yaml | 8 ++++
charts/apisix-ingress-controller/values.yaml | 8 ++--
8 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/.github/actions/chart-releaser-action
b/.github/actions/chart-releaser-action
index 6eec360..c25b74a 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 feeafa6..0000000
--- 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 834f6fb..aba75a2 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 "[email protected]"
- 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 07d6be6..3cfd39c 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 1cabdf6..eae4b65 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 421c7ca..a69458c 100644
--- a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml
+++ b/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml
@@ -44,8 +44,12 @@ spec:
- name: v1
served: true
storage: false
+ deprecated: true
- name: v2alpha1
served: true
+ storage: false
+ - name: v2beta1
+ served: true
storage: true
scope: Namespaced
names:
@@ -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 2456cf2..93e5078 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 4534110..7f79981 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";
