adapt code to new crds

Signed-off-by: hang.jiang <[email protected]>

Author: hang.jiang

.github/workflows/call-offline-build.yaml

@@ -37,8 +37,8 @@ jobs:
         KUBEAN_TAG: ${{ github.ref_name }}
         KUBESPRAY_TAG: ${{ env.SPRAY_SHA_SHORT }}
       run: |
-        bash artifacts/manage_version_cr.sh create_infomanifest
-        bash artifacts/manage_version_cr.sh create_offlineversion
+        bash artifacts/manage_version_cr.sh create_manifest
+        bash artifacts/manage_version_cr.sh create_localartifactset
 
         echo "kubeanofflineversion cr output:"
         cat ${KUBEAN_TAG}/kubeanofflineversion.cr.yaml

README.md

@@ -17,7 +17,7 @@ helm install kubean kubean-io/kubean --create-namespace -n kubean-system
 
 Then check kubean-operator status by `kubectl get pods -n kubean-system | grep 'kubean'`.
 
-## Start KuBeanClusterOps for cluster.yml playbook
+## Start ClusterOperation for cluster.yml playbook
 
 We cloud use the example in folder `artifacts/demo` which uses online resources to install k8s cluster.
 

api/apis/cluster/v1alpha1/types.go

@@ -53,7 +53,7 @@ const (
 )
 
 type ClusterCondition struct {
-	// ClusterOps refers to the name of KuBeanClusterOps.
+	// ClusterOps refers to the name of ClusterOperation.
 	// +required
 	ClusterOps string `json:"clusterOps"`
 	// +optional
@@ -77,6 +77,6 @@ type ClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	// Items holds a list of KuBeanCluster.
+	// Items holds a list of Cluster.
 	Items []Cluster `json:"items"`
 }

api/apis/clusteroperation/v1alpha1/types.go

@@ -34,9 +34,9 @@ const (
 
 // Spec defines the desired state of a member cluster.
 type Spec struct {
-	// KuBeanCluster the name of KuBeanCluster.
+	// Cluster the name of Cluster.kubean.io.
 	// +required
-	KuBeanCluster string `json:"kuBeanCluster"`
+	Cluster string `json:"cluster"`
 	// HostsConfRef will be filled by operator when it performs backup.
 	// +optional
 	HostsConfRef *apis.ConfigMapRef `json:"hostsConfRef"`
@@ -114,6 +114,6 @@ type ClusterOperationList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	// Items holds a list of KuBeanClusterOps.
+	// Items holds a list of ClusterOperation.
 	Items []ClusterOperation `json:"items"`
 }

api/apis/localartifactset/v1alpha1/types.go

@@ -42,7 +42,7 @@ type LocalArtifactSetList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	// Items holds a list of KuBeanClusterOps.
+	// Items holds a list of ClusterOperation.
 	Items []LocalArtifactSet `json:"items"`
 }
 

api/charts/crds/kubean.io_clusteroperations.yaml

@@ -47,6 +47,9 @@ spec:
                 type: string
               backoffLimit:
                 type: integer
+              cluster:
+                description: Cluster the name of Cluster.kubean.io.
+                type: string
               entrypointSHRef:
                 description: EntrypointSHRef will be filled by operator when it renders
                   entrypoint.sh.
@@ -75,9 +78,6 @@ spec:
                 type: object
               image:
                 type: string
-              kuBeanCluster:
-                description: KuBeanCluster the name of KuBeanCluster.
-                type: string
               postHook:
                 items:
                   properties:
@@ -134,8 +134,8 @@ spec:
             - action
             - actionType
             - backoffLimit
+            - cluster
             - image
-            - kuBeanCluster
             type: object
           status:
             description: Status contains information about the current status of a

api/charts/crds/kubean.io_clusters.yaml

@@ -97,7 +97,7 @@ spec:
                 items:
                   properties:
                     clusterOps:
-                      description: ClusterOps refers to the name of KuBeanClusterOps.
+                      description: ClusterOps refers to the name of ClusterOperation.
                       type: string
                     endTime:
                       format: date-time

api/constants/constants.go

@@ -1,6 +1,6 @@
 package constants
 
-const InfoManifestGlobal = "infomanifest-global"
+const InfoManifestGlobal = "manifest-global"
 
 const KubeanClusterLabelKey = "clusterName"
 

api/hack/update-codegen.sh

@@ -39,16 +39,14 @@ client-gen \
   --input-base="" \
   --input=kubean.io/api/apis/$SubDirName/v1alpha1 \
   --output-package=kubean.io/api/generated/$SubDirName/clientset \
-  --clientset-name=versioned \
-  --plural-exceptions="KuBeanClusterOps:KuBeanClusterOps"
+  --clientset-name=versioned
 
 echo "Generating with lister-gen"
 GO111MODULE=on go install k8s.io/code-generator/cmd/lister-gen
 lister-gen \
   --go-header-file hack/boilerplate/boilerplate.go.txt \
   --input-dirs=kubean.io/api/apis/$SubDirName/v1alpha1 \
-  --output-package=kubean.io/api/generated/$SubDirName/listers \
-  --plural-exceptions="KuBeanClusterOps:KuBeanClusterOps"
+  --output-package=kubean.io/api/generated/$SubDirName/listers
 
 echo "Generating with informer-gen"
 GO111MODULE=on go install k8s.io/code-generator/cmd/informer-gen
@@ -57,8 +55,7 @@ informer-gen \
   --input-dirs=kubean.io/api/apis/$SubDirName/v1alpha1 \
   --versioned-clientset-package=kubean.io/api/generated/$SubDirName/clientset/versioned \
   --listers-package=kubean.io/api/generated/$SubDirName/listers \
-  --output-package=kubean.io/api/generated/$SubDirName/informers \
-  --plural-exceptions="KuBeanClusterOps:KuBeanClusterOps"
+  --output-package=kubean.io/api/generated/$SubDirName/informers
 
 if ls "$GOPATH"/src | grep kubean.io; then
   cp -r "$GOPATH"/src/kubean.io/api/apis/$SubDirName/v1alpha1/*.go apis/$SubDirName/v1alpha1/

artifacts/demo/kubeanCluster.yml

@@ -1,5 +1,5 @@
 apiVersion: kubean.io/v1alpha1
-kind: KuBeanCluster
+kind: Cluster
 metadata:
   name: cluster1-demo
   labels: