From 65957e2a080ce3ea4aa1e65f8c5c3ee27de6c30b Mon Sep 17 00:00:00 2001 From: duanmengkk Date: Thu, 16 May 2024 13:48:44 +0800 Subject: [PATCH] reactor code for e2e Signed-off-by: duanmengkk --- .github/workflows/ci.yml | 4 + .../kosmos.io_clusterpodconvertpolicies.yaml | 4 +- hack/cluster.sh | 70 +++++-- hack/local-cleanup-kosmos.sh | 19 +- hack/local-up-kosmos.sh | 4 +- hack/rune2e.sh | 10 +- hack/util.sh | 3 +- .../v1alpha1/clusterpodconvertpolicy_types.go | 1 - pkg/apis/kosmos/v1alpha1/knode_types.go | 66 ------- .../kosmos/v1alpha1/zz_generated.deepcopy.go | 105 ---------- .../kosmos/v1alpha1/zz_generated.register.go | 2 - .../typed/kosmos/v1alpha1/fake/fake_knode.go | 117 ------------ .../v1alpha1/fake/fake_kosmos_client.go | 4 - .../kosmos/v1alpha1/generated_expansion.go | 2 - .../versioned/typed/kosmos/v1alpha1/knode.go | 168 ---------------- .../typed/kosmos/v1alpha1/kosmos_client.go | 5 - .../informers/externalversions/generic.go | 2 - .../kosmos/v1alpha1/interface.go | 7 - .../externalversions/kosmos/v1alpha1/knode.go | 73 ------- .../kosmos/v1alpha1/expansion_generated.go | 4 - .../listers/kosmos/v1alpha1/knode.go | 52 ----- pkg/generated/openapi/zz_generated.openapi.go | 179 ------------------ test/e2e/deploy/cr/cluster-cr.yaml | 5 +- 23 files changed, 84 insertions(+), 822 deletions(-) delete mode 100644 pkg/apis/kosmos/v1alpha1/knode_types.go delete mode 100644 pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_knode.go delete mode 100644 pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/knode.go delete mode 100644 pkg/generated/informers/externalversions/kosmos/v1alpha1/knode.go delete mode 100644 pkg/generated/listers/kosmos/v1alpha1/knode.go diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5390f9dbe..ac5c259e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,10 @@ jobs: uses: actions/setup-go@v4 with: go-version: '1.20' + - name: Clear e2e env + env: + KIND_IMAGE: kindest/node:${{ matrix.k8s }} + run: hack/local-cleanup-kosmos.sh - name: Prepare e2e env env: KIND_IMAGE: kindest/node:${{ matrix.k8s }} diff --git a/deploy/crds/kosmos.io_clusterpodconvertpolicies.yaml b/deploy/crds/kosmos.io_clusterpodconvertpolicies.yaml index 77e0a52fd..2ac92e72f 100644 --- a/deploy/crds/kosmos.io_clusterpodconvertpolicies.yaml +++ b/deploy/crds/kosmos.io_clusterpodconvertpolicies.yaml @@ -12,10 +12,8 @@ spec: kind: ClusterPodConvertPolicy listKind: ClusterPodConvertPolicyList plural: clusterpodconvertpolicies - shortNames: - - cpcp singular: clusterpodconvertpolicy - scope: Namespaced + scope: Cluster versions: - name: v1alpha1 schema: diff --git a/hack/cluster.sh b/hack/cluster.sh index 1406104d6..8b4fd5046 100755 --- a/hack/cluster.sh +++ b/hack/cluster.sh @@ -10,7 +10,7 @@ ROOT=$(dirname "${BASH_SOURCE[0]}")/.. REUSE=${REUSE:-false} VERSION=${VERSION:-latest} -CN_ZONE=${CN_ZONE:-false} +CN_ZONE=${CN_ZONE:-true} source "$(dirname "${BASH_SOURCE[0]}")/util.sh" # default cert and key for node server https @@ -23,6 +23,32 @@ fi source "${ROOT}/hack/util.sh" +# pull e2e test image +function prepare_test_image() { + if [ "${CN_ZONE}" == false ]; then + docker pull bitpoke/mysql-operator-orchestrator:v0.6.3 + docker pull bitpoke/mysql-operator:v0.6.3 + docker pull bitpoke/mysql-operator-sidecar-5.7:v0.6.3 + docker pull nginx + docker pull percona:5.7 + docker pull prom/mysqld-exporter:v0.13.0 + else + docker pull docker.m.daocloud.io/bitpoke/mysql-operator-orchestrator:v0.6.3 + docker pull docker.m.daocloud.io/bitpoke/mysql-operator:v0.6.3 + docker pull docker.m.daocloud.io/bitpoke/mysql-operator-sidecar-5.7:v0.6.3 + docker pull docker.m.daocloud.io/nginx + docker pull docker.m.daocloud.io/percona:5.7 + docker pull docker.m.daocloud.io/prom/mysqld-exporter:v0.13.0 + + docker tag docker.m.daocloud.io/bitpoke/mysql-operator-orchestrator:v0.6.3 bitpoke/mysql-operator-orchestrator:v0.6.3 + docker tag docker.m.daocloud.io/bitpoke/mysql-operator:v0.6.3 bitpoke/mysql-operator:v0.6.3 + docker tag docker.m.daocloud.io/bitpoke/mysql-operator-sidecar-5.7:v0.6.3 bitpoke/mysql-operator-sidecar-5.7:v0.6.3 + docker tag docker.m.daocloud.io/nginx nginx + docker tag docker.m.daocloud.io/percona:5.7 percona:5.7 + docker tag docker.m.daocloud.io/prom/mysqld-exporter:v0.13.0 prom/mysqld-exporter:v0.13.0 + fi +} + # prepare e2e cluster function prepare_e2e_cluster() { local -r clustername=$1 @@ -60,16 +86,38 @@ function prepare_e2e_cluster() { # prepare docker image function prepare_docker_image() { - # pull calico image - docker pull calico/apiserver:v3.25.0 - docker pull calico/cni:v3.25.0 - docker pull calico/csi:v3.25.0 - docker pull calico/kube-controllers:v3.25.0 - docker pull calico/node-driver-registrar:v3.25.0 - docker pull calico/node:v3.25.0 - docker pull calico/pod2daemon-flexvol:v3.25.0 - docker pull calico/typha:v3.25.0 - docker pull quay.io/tigera/operator:v1.29.0 + if [ "${CN_ZONE}" == false ]; then + # pull calico image + docker pull calico/apiserver:v3.25.0 + docker pull calico/cni:v3.25.0 + docker pull calico/csi:v3.25.0 + docker pull calico/kube-controllers:v3.25.0 + docker pull calico/node-driver-registrar:v3.25.0 + docker pull calico/node:v3.25.0 + docker pull calico/pod2daemon-flexvol:v3.25.0 + docker pull calico/typha:v3.25.0 + docker pull quay.io/tigera/operator:v1.29.0 + else + docker pull quay.m.daocloud.io/tigera/operator:v1.29.0 + docker pull docker.m.daocloud.io/calico/apiserver:v3.25.0 + docker pull docker.m.daocloud.io/calico/cni:v3.25.0 + docker pull docker.m.daocloud.io/calico/csi:v3.25.0 + docker pull docker.m.daocloud.io/calico/kube-controllers:v3.25.0 + docker pull docker.m.daocloud.io/calico/node-driver-registrar:v3.25.0 + docker pull docker.m.daocloud.io/calico/node:v3.25.0 + docker pull docker.m.daocloud.io/calico/pod2daemon-flexvol:v3.25.0 + docker pull docker.m.daocloud.io/calico/typha:v3.25.0 + + docker tag quay.m.daocloud.io/tigera/operator:v1.29.0 quay.io/tigera/operator:v1.29.0 + docker tag docker.m.daocloud.io/calico/apiserver:v3.25.0 calico/apiserver:v3.25.0 + docker tag docker.m.daocloud.io/calico/cni:v3.25.0 calico/cni:v3.25.0 + docker tag docker.m.daocloud.io/calico/csi:v3.25.0 calico/csi:v3.25.0 + docker tag docker.m.daocloud.io/calico/kube-controllers:v3.25.0 calico/kube-controllers:v3.25.0 + docker tag docker.m.daocloud.io/calico/node-driver-registrar:v3.25.0 calico/node-driver-registrar:v3.25.0 + docker tag docker.m.daocloud.io/calico/node:v3.25.0 calico/node:v3.25.0 + docker tag docker.m.daocloud.io/calico/pod2daemon-flexvol:v3.25.0 calico/pod2daemon-flexvol:v3.25.0 + docker tag docker.m.daocloud.io/calico/typha:v3.25.0 calico/typha:v3.25.0 + fi } #clustername podcidr servicecidr diff --git a/hack/local-cleanup-kosmos.sh b/hack/local-cleanup-kosmos.sh index 400c30f8f..b3aebfffd 100755 --- a/hack/local-cleanup-kosmos.sh +++ b/hack/local-cleanup-kosmos.sh @@ -4,6 +4,8 @@ set -o errexit set -o nounset set -o pipefail +VERSION=${VERSION:-"latest"} + function usage() { echo "Usage:" echo " hack/local-down-kosmos.sh [-k] [-h]" @@ -57,17 +59,16 @@ echo "Remove cluster configs successfully." #step3. remove docker images echo -e "\nStart removing images" -version="v0.2.0" registry="ghcr.io/kosmos-io" images=( -"${registry}/clusterlink-network-manager:${version}" -"${registry}/clusterlink-controller-manager:${version}" -"${registry}/clusterlink-elector:${version}" -"${registry}/clusterlink-operator:${version}" -"${registry}/clusterlink-agent:${version}" -"${registry}/clusterlink-proxy:${version}" -"${registry}/clustertree-cluster-manager:${version}" -"${registry}/scheduler:${version}" +"${registry}/clusterlink-network-manager:${VERSION}" +"${registry}/clusterlink-controller-manager:${VERSION}" +"${registry}/clusterlink-elector:${VERSION}" +"${registry}/clusterlink-operator:${VERSION}" +"${registry}/clusterlink-agent:${VERSION}" +"${registry}/clusterlink-proxy:${VERSION}" +"${registry}/clustertree-cluster-manager:${VERSION}" +"${registry}/scheduler:${VERSION}" ) if [[ "${keep_images}" == "false" ]] ; then for ((i=0;i<${#images[*]};i++)); do diff --git a/hack/local-up-kosmos.sh b/hack/local-up-kosmos.sh index 7dbf93937..91e519fe2 100755 --- a/hack/local-up-kosmos.sh +++ b/hack/local-up-kosmos.sh @@ -49,7 +49,7 @@ MEMBER3_CLUSTER_POD_CIDR="10.236.64.0/18" MEMBER3_CLUSTER_SERVICE_CIDR="10.236.0.0/18" REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -export VERSION="latest" +VERSION=${VERSION:-"latest"} source "$(dirname "${BASH_SOURCE[0]}")/install_kind_kubectl.sh" source "$(dirname "${BASH_SOURCE[0]}")/cluster.sh" source "$(dirname "${BASH_SOURCE[0]}")/util.sh" @@ -60,7 +60,7 @@ if [[ -z "${HOST_IPADDRESS}" ]]; then util::get_macos_ipaddress # Adapt for macOS HOST_IPADDRESS=${MAC_NIC_IPADDRESS:-} fi -make images GOOS="linux" --directory="${REPO_ROOT}" +make images GOOS="linux" VERSION="$VERSION" --directory="${REPO_ROOT}" make kosmosctl os=$(go env GOOS) diff --git a/hack/rune2e.sh b/hack/rune2e.sh index 0bb5a54d1..8015ead73 100755 --- a/hack/rune2e.sh +++ b/hack/rune2e.sh @@ -21,12 +21,7 @@ source "${ROOT}/cluster.sh" mkdir -p "$ARTIFACTS_PATH" # pull e2e test image -docker pull bitpoke/mysql-operator-orchestrator:v0.6.3 -docker pull bitpoke/mysql-operator:v0.6.3 -docker pull bitpoke/mysql-operator-sidecar-5.7:v0.6.3 -docker pull nginx -docker pull percona:5.7 -docker pull prom/mysqld-exporter:v0.13.0 +prepare_test_image # prepare for e2e test prepare_e2e_cluster "${HOST_CLUSTER_NAME}" & @@ -71,9 +66,10 @@ util::wait_for_condition "mysql operator are ready" \ kubectl --kubeconfig "${REPO_ROOT}/environments/${HOST_CLUSTER_NAME}/kubeconfig" apply -f "${REPO_ROOT}"/test/e2e/deploy/cr util::wait_for_condition "mysql cr are ready" \ - "[ \$(kubectl --kubeconfig ${REPO_ROOT}/environments/${HOST_CLUSTER_NAME}/kubeconfig get pods -n kosmos-e2e --field-selector=status.phase=Running -l app.kubernetes.io/name=mysql --no-headers | wc -l) -eq 2 ]" \ + "[ \$(kubectl --kubeconfig ${REPO_ROOT}/environments/${HOST_CLUSTER_NAME}/kubeconfig get pods -n kosmos-e2e -l app.kubernetes.io/name=mysql |grep \"4/4\"| grep \"Running\" | wc -l) -eq 2 ]" \ 1200 + echo "E2e test of mysql-operator success" # Install ginkgo diff --git a/hack/util.sh b/hack/util.sh index e4ba7ec2e..8b1cafd07 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -8,7 +8,8 @@ set -o pipefail KOSMOS_GO_PACKAGE="github.com/kosmos.io/kosmos" - +REPO_ROOT="$(dirname "${BASH_SOURCE[0]}")/.." +HOST_CLUSTER_NAME="cluster-host" MIN_Go_VERSION=go1.19.0 diff --git a/pkg/apis/kosmos/v1alpha1/clusterpodconvertpolicy_types.go b/pkg/apis/kosmos/v1alpha1/clusterpodconvertpolicy_types.go index 8f21fcf43..836c1d590 100644 --- a/pkg/apis/kosmos/v1alpha1/clusterpodconvertpolicy_types.go +++ b/pkg/apis/kosmos/v1alpha1/clusterpodconvertpolicy_types.go @@ -8,7 +8,6 @@ import ( // +genclient:nonNamespaced // +kubebuilder:resource:scope="Cluster" // +kubebuilder:subresource:status -// +kubebuilder:resource:shortName=cpcp // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterPodConvertPolicy struct { diff --git a/pkg/apis/kosmos/v1alpha1/knode_types.go b/pkg/apis/kosmos/v1alpha1/knode_types.go deleted file mode 100644 index 7fb63db77..000000000 --- a/pkg/apis/kosmos/v1alpha1/knode_types.go +++ /dev/null @@ -1,66 +0,0 @@ -package v1alpha1 - -import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - -type AdapterType string - -const ( - K8sAdapter AdapterType = "k8s" -) - -// +genclient -// +genclient:nonNamespaced -// +kubebuilder:resource:scope="Cluster" -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type Knode struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - // +optional - Spec KnodeSpec `json:"spec,omitempty"` - - // +optional - Status KnodeStatus `json:"status,omitempty"` -} - -type KnodeSpec struct { - // +optional - Kubeconfig []byte `json:"kubeconfig,omitempty"` - - // +kubebuilder:default=100 - // +optional - KubeAPIBurst int `json:"kubeAPIBurst,omitempty"` - - // +required - NodeName string `json:"nodeName,omitempty"` - - // +kubebuilder:default=k8s - // +optional - Type AdapterType `json:"type,omitempty"` - - // +optional - DisableTaint bool `json:"disableTaint,omitempty"` -} - -type KnodeStatus struct { - // +optional - APIServer string `json:"apiserver,omitempty"` - - // +optional - Version string `json:"version,omitempty"` - - // +optional - Conditions []metav1.Condition `json:"conditions,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -type KnodeList struct { - metav1.TypeMeta `json:",inline"` - - // +optional - metav1.ListMeta `json:"metadata,omitempty"` - - Items []Knode `json:"items"` -} diff --git a/pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go index 9b8d031fb..3d142f88f 100644 --- a/pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go @@ -982,111 +982,6 @@ func (in *Iptables) DeepCopy() *Iptables { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Knode) DeepCopyInto(out *Knode) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Knode. -func (in *Knode) DeepCopy() *Knode { - if in == nil { - return nil - } - out := new(Knode) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Knode) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KnodeList) DeepCopyInto(out *KnodeList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Knode, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KnodeList. -func (in *KnodeList) DeepCopy() *KnodeList { - if in == nil { - return nil - } - out := new(KnodeList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *KnodeList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KnodeSpec) DeepCopyInto(out *KnodeSpec) { - *out = *in - if in.Kubeconfig != nil { - in, out := &in.Kubeconfig, &out.Kubeconfig - *out = make([]byte, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KnodeSpec. -func (in *KnodeSpec) DeepCopy() *KnodeSpec { - if in == nil { - return nil - } - out := new(KnodeSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KnodeStatus) DeepCopyInto(out *KnodeStatus) { - *out = *in - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]metav1.Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KnodeStatus. -func (in *KnodeStatus) DeepCopy() *KnodeStatus { - if in == nil { - return nil - } - out := new(KnodeStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LeafModel) DeepCopyInto(out *LeafModel) { *out = *in diff --git a/pkg/apis/kosmos/v1alpha1/zz_generated.register.go b/pkg/apis/kosmos/v1alpha1/zz_generated.register.go index 42e8b42cb..74cb04cd1 100644 --- a/pkg/apis/kosmos/v1alpha1/zz_generated.register.go +++ b/pkg/apis/kosmos/v1alpha1/zz_generated.register.go @@ -56,8 +56,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &DistributionPolicyList{}, &GlobalNode{}, &GlobalNodeList{}, - &Knode{}, - &KnodeList{}, &NodeConfig{}, &NodeConfigList{}, &PodConvertPolicy{}, diff --git a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_knode.go b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_knode.go deleted file mode 100644 index 73435dbcf..000000000 --- a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_knode.go +++ /dev/null @@ -1,117 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - "context" - - v1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" -) - -// FakeKnodes implements KnodeInterface -type FakeKnodes struct { - Fake *FakeKosmosV1alpha1 -} - -var knodesResource = schema.GroupVersionResource{Group: "kosmos.io", Version: "v1alpha1", Resource: "knodes"} - -var knodesKind = schema.GroupVersionKind{Group: "kosmos.io", Version: "v1alpha1", Kind: "Knode"} - -// Get takes name of the knode, and returns the corresponding knode object, and an error if there is any. -func (c *FakeKnodes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Knode, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootGetAction(knodesResource, name), &v1alpha1.Knode{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Knode), err -} - -// List takes label and field selectors, and returns the list of Knodes that match those selectors. -func (c *FakeKnodes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.KnodeList, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootListAction(knodesResource, knodesKind, opts), &v1alpha1.KnodeList{}) - if obj == nil { - return nil, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.KnodeList{ListMeta: obj.(*v1alpha1.KnodeList).ListMeta} - for _, item := range obj.(*v1alpha1.KnodeList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested knodes. -func (c *FakeKnodes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchAction(knodesResource, opts)) -} - -// Create takes the representation of a knode and creates it. Returns the server's representation of the knode, and an error, if there is any. -func (c *FakeKnodes) Create(ctx context.Context, knode *v1alpha1.Knode, opts v1.CreateOptions) (result *v1alpha1.Knode, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootCreateAction(knodesResource, knode), &v1alpha1.Knode{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Knode), err -} - -// Update takes the representation of a knode and updates it. Returns the server's representation of the knode, and an error, if there is any. -func (c *FakeKnodes) Update(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (result *v1alpha1.Knode, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateAction(knodesResource, knode), &v1alpha1.Knode{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Knode), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeKnodes) UpdateStatus(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (*v1alpha1.Knode, error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(knodesResource, "status", knode), &v1alpha1.Knode{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Knode), err -} - -// Delete takes name of the knode and deletes it. Returns an error if one occurs. -func (c *FakeKnodes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(knodesResource, name, opts), &v1alpha1.Knode{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeKnodes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionAction(knodesResource, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.KnodeList{}) - return err -} - -// Patch applies the patch and returns the patched knode. -func (c *FakeKnodes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Knode, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceAction(knodesResource, name, pt, data, subresources...), &v1alpha1.Knode{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Knode), err -} diff --git a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_kosmos_client.go b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_kosmos_client.go index cc8a3a6b0..6a1532b66 100644 --- a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_kosmos_client.go +++ b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/fake/fake_kosmos_client.go @@ -40,10 +40,6 @@ func (c *FakeKosmosV1alpha1) GlobalNodes() v1alpha1.GlobalNodeInterface { return &FakeGlobalNodes{c} } -func (c *FakeKosmosV1alpha1) Knodes() v1alpha1.KnodeInterface { - return &FakeKnodes{c} -} - func (c *FakeKosmosV1alpha1) NodeConfigs() v1alpha1.NodeConfigInterface { return &FakeNodeConfigs{c} } diff --git a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/generated_expansion.go index fb8e102e4..80e51964d 100644 --- a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/generated_expansion.go +++ b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/generated_expansion.go @@ -16,8 +16,6 @@ type DistributionPolicyExpansion interface{} type GlobalNodeExpansion interface{} -type KnodeExpansion interface{} - type NodeConfigExpansion interface{} type PodConvertPolicyExpansion interface{} diff --git a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/knode.go b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/knode.go deleted file mode 100644 index c987d78b3..000000000 --- a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/knode.go +++ /dev/null @@ -1,168 +0,0 @@ -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - "time" - - v1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" - scheme "github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// KnodesGetter has a method to return a KnodeInterface. -// A group's client should implement this interface. -type KnodesGetter interface { - Knodes() KnodeInterface -} - -// KnodeInterface has methods to work with Knode resources. -type KnodeInterface interface { - Create(ctx context.Context, knode *v1alpha1.Knode, opts v1.CreateOptions) (*v1alpha1.Knode, error) - Update(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (*v1alpha1.Knode, error) - UpdateStatus(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (*v1alpha1.Knode, error) - Delete(ctx context.Context, name string, opts v1.DeleteOptions) error - DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Knode, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.KnodeList, error) - Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Knode, err error) - KnodeExpansion -} - -// knodes implements KnodeInterface -type knodes struct { - client rest.Interface -} - -// newKnodes returns a Knodes -func newKnodes(c *KosmosV1alpha1Client) *knodes { - return &knodes{ - client: c.RESTClient(), - } -} - -// Get takes name of the knode, and returns the corresponding knode object, and an error if there is any. -func (c *knodes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Knode, err error) { - result = &v1alpha1.Knode{} - err = c.client.Get(). - Resource("knodes"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(ctx). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of Knodes that match those selectors. -func (c *knodes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.KnodeList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1alpha1.KnodeList{} - err = c.client.Get(). - Resource("knodes"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(ctx). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested knodes. -func (c *knodes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Resource("knodes"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch(ctx) -} - -// Create takes the representation of a knode and creates it. Returns the server's representation of the knode, and an error, if there is any. -func (c *knodes) Create(ctx context.Context, knode *v1alpha1.Knode, opts v1.CreateOptions) (result *v1alpha1.Knode, err error) { - result = &v1alpha1.Knode{} - err = c.client.Post(). - Resource("knodes"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(knode). - Do(ctx). - Into(result) - return -} - -// Update takes the representation of a knode and updates it. Returns the server's representation of the knode, and an error, if there is any. -func (c *knodes) Update(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (result *v1alpha1.Knode, err error) { - result = &v1alpha1.Knode{} - err = c.client.Put(). - Resource("knodes"). - Name(knode.Name). - VersionedParams(&opts, scheme.ParameterCodec). - Body(knode). - Do(ctx). - Into(result) - return -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *knodes) UpdateStatus(ctx context.Context, knode *v1alpha1.Knode, opts v1.UpdateOptions) (result *v1alpha1.Knode, err error) { - result = &v1alpha1.Knode{} - err = c.client.Put(). - Resource("knodes"). - Name(knode.Name). - SubResource("status"). - VersionedParams(&opts, scheme.ParameterCodec). - Body(knode). - Do(ctx). - Into(result) - return -} - -// Delete takes name of the knode and deletes it. Returns an error if one occurs. -func (c *knodes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - return c.client.Delete(). - Resource("knodes"). - Name(name). - Body(&opts). - Do(ctx). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *knodes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - var timeout time.Duration - if listOpts.TimeoutSeconds != nil { - timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Resource("knodes"). - VersionedParams(&listOpts, scheme.ParameterCodec). - Timeout(timeout). - Body(&opts). - Do(ctx). - Error() -} - -// Patch applies the patch and returns the patched knode. -func (c *knodes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Knode, err error) { - result = &v1alpha1.Knode{} - err = c.client.Patch(pt). - Resource("knodes"). - Name(name). - SubResource(subresources...). - VersionedParams(&opts, scheme.ParameterCodec). - Body(data). - Do(ctx). - Into(result) - return -} diff --git a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/kosmos_client.go b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/kosmos_client.go index bbb6aa9a1..0dc37053e 100644 --- a/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/kosmos_client.go +++ b/pkg/generated/clientset/versioned/typed/kosmos/v1alpha1/kosmos_client.go @@ -19,7 +19,6 @@ type KosmosV1alpha1Interface interface { DaemonSetsGetter DistributionPoliciesGetter GlobalNodesGetter - KnodesGetter NodeConfigsGetter PodConvertPoliciesGetter ShadowDaemonSetsGetter @@ -59,10 +58,6 @@ func (c *KosmosV1alpha1Client) GlobalNodes() GlobalNodeInterface { return newGlobalNodes(c) } -func (c *KosmosV1alpha1Client) Knodes() KnodeInterface { - return newKnodes(c) -} - func (c *KosmosV1alpha1Client) NodeConfigs() NodeConfigInterface { return newNodeConfigs(c) } diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index 84b081a3c..3cdfef6db 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -52,8 +52,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource return &genericInformer{resource: resource.GroupResource(), informer: f.Kosmos().V1alpha1().DistributionPolicies().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("globalnodes"): return &genericInformer{resource: resource.GroupResource(), informer: f.Kosmos().V1alpha1().GlobalNodes().Informer()}, nil - case v1alpha1.SchemeGroupVersion.WithResource("knodes"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Kosmos().V1alpha1().Knodes().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("nodeconfigs"): return &genericInformer{resource: resource.GroupResource(), informer: f.Kosmos().V1alpha1().NodeConfigs().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("podconvertpolicies"): diff --git a/pkg/generated/informers/externalversions/kosmos/v1alpha1/interface.go b/pkg/generated/informers/externalversions/kosmos/v1alpha1/interface.go index 5af1f3b5c..3aabd3c2b 100644 --- a/pkg/generated/informers/externalversions/kosmos/v1alpha1/interface.go +++ b/pkg/generated/informers/externalversions/kosmos/v1alpha1/interface.go @@ -22,8 +22,6 @@ type Interface interface { DistributionPolicies() DistributionPolicyInformer // GlobalNodes returns a GlobalNodeInformer. GlobalNodes() GlobalNodeInformer - // Knodes returns a KnodeInformer. - Knodes() KnodeInformer // NodeConfigs returns a NodeConfigInformer. NodeConfigs() NodeConfigInformer // PodConvertPolicies returns a PodConvertPolicyInformer. @@ -80,11 +78,6 @@ func (v *version) GlobalNodes() GlobalNodeInformer { return &globalNodeInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } -// Knodes returns a KnodeInformer. -func (v *version) Knodes() KnodeInformer { - return &knodeInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} -} - // NodeConfigs returns a NodeConfigInformer. func (v *version) NodeConfigs() NodeConfigInformer { return &nodeConfigInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} diff --git a/pkg/generated/informers/externalversions/kosmos/v1alpha1/knode.go b/pkg/generated/informers/externalversions/kosmos/v1alpha1/knode.go deleted file mode 100644 index 781202362..000000000 --- a/pkg/generated/informers/externalversions/kosmos/v1alpha1/knode.go +++ /dev/null @@ -1,73 +0,0 @@ -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - time "time" - - kosmosv1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" - versioned "github.com/kosmos.io/kosmos/pkg/generated/clientset/versioned" - internalinterfaces "github.com/kosmos.io/kosmos/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kosmos.io/kosmos/pkg/generated/listers/kosmos/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// KnodeInformer provides access to a shared informer and lister for -// Knodes. -type KnodeInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.KnodeLister -} - -type knodeInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// NewKnodeInformer constructs a new informer for Knode type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewKnodeInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredKnodeInformer(client, resyncPeriod, indexers, nil) -} - -// NewFilteredKnodeInformer constructs a new informer for Knode type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredKnodeInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KosmosV1alpha1().Knodes().List(context.TODO(), options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KosmosV1alpha1().Knodes().Watch(context.TODO(), options) - }, - }, - &kosmosv1alpha1.Knode{}, - resyncPeriod, - indexers, - ) -} - -func (f *knodeInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredKnodeInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *knodeInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kosmosv1alpha1.Knode{}, f.defaultInformer) -} - -func (f *knodeInformer) Lister() v1alpha1.KnodeLister { - return v1alpha1.NewKnodeLister(f.Informer().GetIndexer()) -} diff --git a/pkg/generated/listers/kosmos/v1alpha1/expansion_generated.go b/pkg/generated/listers/kosmos/v1alpha1/expansion_generated.go index 58bc0576a..66da5fa15 100644 --- a/pkg/generated/listers/kosmos/v1alpha1/expansion_generated.go +++ b/pkg/generated/listers/kosmos/v1alpha1/expansion_generated.go @@ -38,10 +38,6 @@ type DistributionPolicyNamespaceListerExpansion interface{} // GlobalNodeLister. type GlobalNodeListerExpansion interface{} -// KnodeListerExpansion allows custom methods to be added to -// KnodeLister. -type KnodeListerExpansion interface{} - // NodeConfigListerExpansion allows custom methods to be added to // NodeConfigLister. type NodeConfigListerExpansion interface{} diff --git a/pkg/generated/listers/kosmos/v1alpha1/knode.go b/pkg/generated/listers/kosmos/v1alpha1/knode.go deleted file mode 100644 index 8c6f014f0..000000000 --- a/pkg/generated/listers/kosmos/v1alpha1/knode.go +++ /dev/null @@ -1,52 +0,0 @@ -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// KnodeLister helps list Knodes. -// All objects returned here must be treated as read-only. -type KnodeLister interface { - // List lists all Knodes in the indexer. - // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1alpha1.Knode, err error) - // Get retrieves the Knode from the index for a given name. - // Objects returned here must be treated as read-only. - Get(name string) (*v1alpha1.Knode, error) - KnodeListerExpansion -} - -// knodeLister implements the KnodeLister interface. -type knodeLister struct { - indexer cache.Indexer -} - -// NewKnodeLister returns a new KnodeLister. -func NewKnodeLister(indexer cache.Indexer) KnodeLister { - return &knodeLister{indexer: indexer} -} - -// List lists all Knodes in the indexer. -func (s *knodeLister) List(selector labels.Selector) (ret []*v1alpha1.Knode, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.Knode)) - }) - return ret, err -} - -// Get retrieves the Knode from the index for a given name. -func (s *knodeLister) Get(name string) (*v1alpha1.Knode, error) { - obj, exists, err := s.indexer.GetByKey(name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("knode"), name) - } - return obj.(*v1alpha1.Knode), nil -} diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index b84111ba2..a8701b328 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -51,10 +51,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.GlobalNodeStatus": schema_pkg_apis_kosmos_v1alpha1_GlobalNodeStatus(ref), "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.HostAliasesConverter": schema_pkg_apis_kosmos_v1alpha1_HostAliasesConverter(ref), "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.Iptables": schema_pkg_apis_kosmos_v1alpha1_Iptables(ref), - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.Knode": schema_pkg_apis_kosmos_v1alpha1_Knode(ref), - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeList": schema_pkg_apis_kosmos_v1alpha1_KnodeList(ref), - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeSpec": schema_pkg_apis_kosmos_v1alpha1_KnodeSpec(ref), - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeStatus": schema_pkg_apis_kosmos_v1alpha1_KnodeStatus(ref), "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.LeafModel": schema_pkg_apis_kosmos_v1alpha1_LeafModel(ref), "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.LeafNodeItem": schema_pkg_apis_kosmos_v1alpha1_LeafNodeItem(ref), "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.NICNodeNames": schema_pkg_apis_kosmos_v1alpha1_NICNodeNames(ref), @@ -1792,181 +1788,6 @@ func schema_pkg_apis_kosmos_v1alpha1_Iptables(ref common.ReferenceCallback) comm } } -func schema_pkg_apis_kosmos_v1alpha1_Knode(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, - "spec": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeSpec"), - }, - }, - "status": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeStatus"), - }, - }, - }, - }, - }, - Dependencies: []string{ - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeSpec", "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.KnodeStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, - } -} - -func schema_pkg_apis_kosmos_v1alpha1_KnodeList(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), - }, - }, - "items": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.Knode"), - }, - }, - }, - }, - }, - }, - Required: []string{"items"}, - }, - }, - Dependencies: []string{ - "github.com/kosmos.io/kosmos/pkg/apis/kosmos/v1alpha1.Knode", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, - } -} - -func schema_pkg_apis_kosmos_v1alpha1_KnodeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "kubeconfig": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "byte", - }, - }, - "kubeAPIBurst": { - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "int32", - }, - }, - "nodeName": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "type": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "disableTaint": { - SchemaProps: spec.SchemaProps{ - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - }, - }, - } -} - -func schema_pkg_apis_kosmos_v1alpha1_KnodeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "apiserver": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "version": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "conditions": { - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Condition"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, - } -} - func schema_pkg_apis_kosmos_v1alpha1_LeafModel(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/test/e2e/deploy/cr/cluster-cr.yaml b/test/e2e/deploy/cr/cluster-cr.yaml index fb29e252a..117ab0abf 100644 --- a/test/e2e/deploy/cr/cluster-cr.yaml +++ b/test/e2e/deploy/cr/cluster-cr.yaml @@ -76,9 +76,10 @@ spec: nodeSelectorTerms: - matchExpressions: - key: kubernetes.io/hostname - operator: NotIn + operator: In values: - - cluster-host-control-plane + - kosmos-cluster-member1 + - kosmos-cluster-member2 podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: