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 ab1dbe5 chore: add ci (#84)
ab1dbe5 is described below
commit ab1dbe50854de3ee6a6fb42d8e1b8c4b8eb09699
Author: Jintao Zhang <[email protected]>
AuthorDate: Mon May 24 09:28:47 2021 +0800
chore: add ci (#84)
---
.github/actions/setup-kind | 1 +
.github/workflows/ci.yaml | 70 ++++++++++++++++++++++++
.gitmodules | 4 ++
charts/apisix-dashboard/Chart.yaml | 3 +
charts/apisix-dashboard/charts/.gitkeep | 0
charts/apisix-ingress-controller/Chart.yaml | 3 +
charts/apisix-ingress-controller/charts/.gitkeep | 0
charts/apisix/Chart.yaml | 3 +
charts/apisix/values.yaml | 4 +-
test/e2e/kind.yaml | 16 ++++++
10 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/.github/actions/setup-kind b/.github/actions/setup-kind
new file mode 160000
index 0000000..aa272fe
--- /dev/null
+++ b/.github/actions/setup-kind
@@ -0,0 +1 @@
+Subproject commit aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..702068c
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,70 @@
+name: CI
+
+on:
+ pull_request:
+ branches:
+ - "*"
+
+ push:
+
+jobs:
+
+ helm:
+ name: Helm chart
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ k8s: [v1.14.10, v1.15.12, v1.16.15, v1.17.17, v1.18.19, v1.19.11,
v1.20.7, v1.21.1]
+
+ steps:
+
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: recursive
+
+ - name: Lint
+ run: |
+ docker run --rm --interactive --network host \
+ --name ct-lint \
+ --volume $PWD:/workdir \
+ --workdir /workdir/charts/apisix \
+ quay.io/helmpack/chart-testing:v3.4.0 sh -c 'helm dependency
update \
+ && cd ../.. \
+ && helm repo add bitnami https://charts.bitnami.com/bitnami \
+ && helm repo add apisix https://charts.apiseven.com \
+ && ct lint \
+ --charts charts/apisix \
+ --charts charts/apisix-dashboard \
+ --charts charts/apisix-ingress-controller'
+
+ - name: fix permissions
+ run: |
+ sudo mkdir -p $HOME/.kube
+ sudo chmod -R 777 $HOME/.kube
+
+ - name: Create Kubernetes ${{ matrix.k8s }} cluster
+ id: kind
+ uses: ./.github/actions/setup-kind
+ with:
+ version: v0.11.0
+ config: test/e2e/kind.yaml
+ image: kindest/node:${{ matrix.k8s }}
+
+ - name: Test
+ env:
+ KIND_CLUSTER_NAME: kind
+ SKIP_CLUSTER_CREATION: true
+ run: |
+ kind get kubeconfig > $HOME/.kube/kind-config-kind
+ docker run --rm --interactive --network host \
+ --name ct \
+ --volume $HOME/.kube/kind-config-kind:/root/.kube/config \
+ --volume $PWD:/workdir \
+ --workdir /workdir/charts/apisix \
+ quay.io/helmpack/chart-testing:v3.4.0 sh -c 'helm dependency
update \
+ && cd ../.. \
+ && helm repo add bitnami https://charts.bitnami.com/bitnami \
+ && helm repo add apisix https://charts.apiseven.com \
+ && ct install \
+ --charts charts/apisix'
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..320e730
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule ".github/actions/setup-kind"]
+ path = .github/actions/setup-kind
+ url = https://github.com/engineerd/setup-kind.git
+ branch = v0.5.0
diff --git a/charts/apisix-dashboard/Chart.yaml
b/charts/apisix-dashboard/Chart.yaml
index f78c7ad..e98b7c8 100644
--- a/charts/apisix-dashboard/Chart.yaml
+++ b/charts/apisix-dashboard/Chart.yaml
@@ -37,3 +37,6 @@ version: 0.1.3
# incremented each time you make changes to the application. Versions are not
expected to
# follow Semantic Versioning. They should reflect the version the application
is using.
appVersion: 2.5.0
+
+maintainers:
+ - name: tao12345666333
diff --git a/charts/apisix-dashboard/charts/.gitkeep
b/charts/apisix-dashboard/charts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/charts/apisix-ingress-controller/Chart.yaml
b/charts/apisix-ingress-controller/Chart.yaml
index cfbad70..dba8984 100644
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ b/charts/apisix-ingress-controller/Chart.yaml
@@ -26,3 +26,6 @@ keywords:
type: application
version: 0.4.1
appVersion: 0.5.0
+
+maintainers:
+ - name: tao12345666333
diff --git a/charts/apisix-ingress-controller/charts/.gitkeep
b/charts/apisix-ingress-controller/charts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 1ac5cd7..bac331a 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -53,3 +53,6 @@ dependencies:
repository: https://charts.apiseven.com
condition: ingress-controller.enabled
alias: ingress-controller
+
+maintainers:
+ - name: tao12345666333
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 81ce5bf..f656ee7 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -81,7 +81,7 @@ gateway:
containerPort: 9443
http2:
enabled: true
- stream: # L4 proxy (TCP/UDP)
+ stream: # L4 proxy (TCP/UDP)
enabled: false
tcp: []
udp: []
@@ -195,7 +195,7 @@ etcd:
# install etcd(v3) by default, set false if do not want to install etcd(v3)
together
enabled: true
host:
- - http://etcd.host:2379 # host or ip e.g. http://172.20.128.89:2379
+ - http://etcd.host:2379 # host or ip e.g. http://172.20.128.89:2379
prefix: "/apisix"
timeout: 30
diff --git a/test/e2e/kind.yaml b/test/e2e/kind.yaml
new file mode 100644
index 0000000..6fddba4
--- /dev/null
+++ b/test/e2e/kind.yaml
@@ -0,0 +1,16 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
+kubeadmConfigPatches:
+- |
+ kind: ClusterConfiguration
+ metadata:
+ name: config
+ controllerManager:
+ extraArgs:
+ namespace-sync-period: 10s
+ concurrent-deployment-syncs: "30"
+ deployment-controller-sync-period: 10s
