diff --git a/adaptor/container_api_adaptor/huawei/cmd/main.go b/adaptor/container_api_adaptor/huawei/cmd/main.go index 691ae332..48fffe35 100644 --- a/adaptor/container_api_adaptor/huawei/cmd/main.go +++ b/adaptor/container_api_adaptor/huawei/cmd/main.go @@ -1,7 +1,7 @@ package main import ( - "PCM/adaptor/container_api_adaptor/huawei/demos/pod" + "PCM/adaptor/container_api_adaptor/huawei/demos/namespace" "PCM/adaptor/container_api_adaptor/huawei/pkg/auth/aksk" "fmt" ) @@ -16,12 +16,12 @@ func main() { } //创建命名空间 - //fmt.Println("start to namespace created") - //_, err = namespace.CreateNamespace(cs) - //if err != nil { - // panic(err) - //} - //fmt.Println("namespace created") + fmt.Println("start to namespace created") + _, err = namespace.CreateNamespace(cs) + if err != nil { + panic(err) + } + fmt.Println("namespace created") //创建网络 //fmt.Println("start to network created") @@ -39,12 +39,12 @@ func main() { //fmt.Println("deployment created") //创建pod - fmt.Println("start to create pod") - _, err = pod.CreatePod(cs) - if err != nil { - panic(err) - } - fmt.Println("pod created") + //fmt.Println("start to create pod") + //_, err = pod.CreatePod(cs) + //if err != nil { + // panic(err) + //} + //fmt.Println("pod created") //删除deployment //fmt.Println("start to delete deployment") diff --git a/adaptor/container_api_adaptor/huawei/hack/update-codegen.sh b/adaptor/container_api_adaptor/huawei/hack/update-codegen.sh index 4fb2823f..2ce88699 100644 --- a/adaptor/container_api_adaptor/huawei/hack/update-codegen.sh +++ b/adaptor/container_api_adaptor/huawei/hack/update-codegen.sh @@ -29,7 +29,7 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code- export CLIENTSET_PKG_NAME=networking.cci.io export CLIENTSET_NAME_VERSIONED=v1beta1 "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client" \ - PCM/huawei/pkg/client PCM/huawei/pkg/apis \ + PCM/adaptor/container_api_adaptor/huawei/pkg/client PCM/adaptor/container_api_adaptor/huawei/pkg/apis \ networking.cci.io:v1beta1 \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/clientset_generated.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/clientset_generated.go index 705b134c..354797ad 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/clientset_generated.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "PCM/huawei/pkg/client/networking.cci.io/v1beta1" - networkingcciv1beta1 "PCM/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1" - fakenetworkingcciv1beta1 "PCM/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake" + clientset "PCM/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1" + networkingcciv1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1" + fakenetworkingcciv1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/register.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/register.go index 09bd6d0c..ffcc0318 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/register.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - networkingcciv1beta1 "PCM/huawei/pkg/apis/networking.cci.io/v1beta1" + networkingcciv1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/apis/networking.cci.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/scheme/register.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/scheme/register.go index f7f2f0e8..736cdbbb 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/scheme/register.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - networkingcciv1beta1 "PCM/huawei/pkg/apis/networking.cci.io/v1beta1" + networkingcciv1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/apis/networking.cci.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_network.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_network.go index 3ca0c1a0..d1e37800 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_network.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_network.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1beta1 "PCM/huawei/pkg/apis/networking.cci.io/v1beta1" + v1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/apis/networking.cci.io/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_networking.cci.io_client.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_networking.cci.io_client.go index e33bc532..4ae98046 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_networking.cci.io_client.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/fake/fake_networking.cci.io_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1beta1 "PCM/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1" + v1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/network.go b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/network.go index bfa9b341..a1449c81 100644 --- a/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/network.go +++ b/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/typed/networking.cci.io/v1beta1/network.go @@ -21,8 +21,8 @@ package v1beta1 import ( "time" - v1beta1 "PCM/huawei/pkg/apis/networking.cci.io/v1beta1" - scheme "PCM/huawei/pkg/client/networking.cci.io/v1beta1/scheme" + v1beta1 "PCM/adaptor/container_api_adaptor/huawei/pkg/apis/networking.cci.io/v1beta1" + scheme "PCM/adaptor/container_api_adaptor/huawei/pkg/client/networking.cci.io/v1beta1/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch"