You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by kv...@apache.org on 2021/09/29 10:54:30 UTC
[apisix-ingress-controller] branch master updated: feat: upgrade
admission apiversion to v1 (#697)
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-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 736aba3 feat: upgrade admission apiversion to v1 (#697)
736aba3 is described below
commit 736aba38f7de1fef03b6b818aa93e343b1666c95
Author: Jintao Zhang <zh...@gmail.com>
AuthorDate: Wed Sep 29 18:54:26 2021 +0800
feat: upgrade admission apiversion to v1 (#697)
Signed-off-by: Jintao Zhang <zh...@gmail.com>
---
Makefile | 2 +-
docs/en/latest/practices/the-hard-way.md | 2 +-
samples/deploy/admission/webhook-registration.yaml | 4 +++-
samples/deploy/{ => crd}/kustomization.yaml | 6 +-----
samples/deploy/kustomization.yaml | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 477a313..8bc8c6a 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ unit-test:
### e2e-test: Run e2e test cases (kind is required)
.PHONY: e2e-test
e2e-test: ginkgo-check push-images-to-kind
- kubectl apply -k $(PWD)/samples/deploy/crd/v1
+ kubectl apply -k $(PWD)/samples/deploy/crd
cd test/e2e && ginkgo -cover -coverprofile=coverage.txt -r --randomizeSuites --randomizeAllSpecs --trace -p --nodes=$(E2E_CONCURRENCY)
.PHONY: ginkgo-check
diff --git a/docs/en/latest/practices/the-hard-way.md b/docs/en/latest/practices/the-hard-way.md
index 1440ae1..5b2a6ca 100644
--- a/docs/en/latest/practices/the-hard-way.md
+++ b/docs/en/latest/practices/the-hard-way.md
@@ -602,7 +602,7 @@ subjects:
Then, we need to create ApisixRoute CRD:
```bash
-kubectl apply -k samples/deploy/crd/v1
+kubectl apply -k samples/deploy/crd
```
Please refer to [samples](http://github.com/apache/apisix-ingress-controller/blob/master/samples/deploy/crd) for details.
diff --git a/samples/deploy/admission/webhook-registration.yaml b/samples/deploy/admission/webhook-registration.yaml
index 1b33dbd..a7aebcd 100644
--- a/samples/deploy/admission/webhook-registration.yaml
+++ b/samples/deploy/admission/webhook-registration.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: apisix-validations
@@ -38,3 +38,5 @@ webhooks:
resources: ["apisixroutes"]
timeoutSeconds: 30
failurePolicy: Ignore
+ sideEffects: None
+ admissionReviewVersions: ["v1", "v1beta1"]
diff --git a/samples/deploy/kustomization.yaml b/samples/deploy/crd/kustomization.yaml
similarity index 92%
copy from samples/deploy/kustomization.yaml
copy to samples/deploy/crd/kustomization.yaml
index c175a05..6dd1584 100644
--- a/samples/deploy/kustomization.yaml
+++ b/samples/deploy/crd/kustomization.yaml
@@ -21,8 +21,4 @@ namespace: ingress-apisix
commonLabels:
apisix.apache.org/app: ingress-apisix
bases:
- - ./configmap
- - ./admission
- - ./deployment
- - ./rbac
- - ./crd/v1
+ - ./v1
diff --git a/samples/deploy/kustomization.yaml b/samples/deploy/kustomization.yaml
index c175a05..e413f6e 100644
--- a/samples/deploy/kustomization.yaml
+++ b/samples/deploy/kustomization.yaml
@@ -25,4 +25,4 @@ bases:
- ./admission
- ./deployment
- ./rbac
- - ./crd/v1
+ - ./crd