Merge release 1.14 into 1.15. (#16439)
1. Confirm the document content is similar as en version.
2. Merge the zh release-1.14 version into 1.15 version
3. add the 1.14 all sample into 1.15 for template work. The build looks fine.
- docs
- concepts
- architecture
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
7c47a2e7c4
commit
c87a30450a
@@ -0,0 +1,17 @@
|
||||
注意:这些测试是从 kubernetes 导入的代码实际上并不打算在存储库之外使用。
|
||||
这就导致了供应商依赖问题。因此,我们必须在 travis 配置这些行:
|
||||
<!--
|
||||
Note: These tests are importing code from kubernetes that isn't really
|
||||
meant to be used outside the repo. This causes vendoring problems. As
|
||||
a result, we have to work around those with these lines in the travis
|
||||
config:
|
||||
-->
|
||||
|
||||
```
|
||||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
|
||||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
|
||||
- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
|
||||
- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
|
||||
- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
|
||||
- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
|
||||
```
|
||||
Reference in New Issue
Block a user