istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert circleci config from 2.1 back to 2 (#2776) 

* Revert circleci config from 2.1 back to 2

* fix lint errors
This commit is contained in:
Frank Budinsky 2018-10-16 14:45:10 -04:00 committed by GitHub
parent 3f17c5c194
commit 33c5428fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -1,4 +1,4 @@
version: 2.1
version: 2
jobs:
build:
docker:

2
content/docs/setup/kubernetes/platform-setup/aws/index.md
View File

@ -64,6 +64,7 @@ Nevertheless, you must update the list of admission controllers.
1. Review the output:
Kubernetes up to 1.9:
{{< text plain >}}
[...]
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,
@ -74,6 +75,7 @@ Nevertheless, you must update the list of admission controllers.
{{< /text >}}
Kubernetes 1.10+:
{{< text plain >}}
[...]
--enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,

2
content_zh/docs/setup/kubernetes/platform-setup/aws/index.md
View File

@ -63,6 +63,7 @@ keywords: [platform-setup,aws]
1. 查看输出内容：
Kubernetes up to 1.9:
{{< text plain >}}
[...]
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,
@ -73,6 +74,7 @@ keywords: [platform-setup,aws]
{{< /text >}}
Kubernetes 1.10+:
{{< text plain >}}
[...]
--enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,