Aviator Service 기능 연동 (#22)

* NCP Service CRUD 기능 Reconcile func 연동 * refactor: ProvisonSpec 필드 추상화, Status에 ProvisionPhase 추가 * refactor: ncpService Reconciler 객체에 포함시켜 초기화, Verb에서 Provision Status Phase 필드 기반으로 Action 수행하도록 수정 * fix: typo --------- Co-authored-by: 희승 <heeseung@huiseung-ui-MacBookPro.local>
cloud-club · Dec 31, 2023 · 5b2f898 · 5b2f898
1 parent 27ebdd1
commit 5b2f898
Show file tree

Hide file tree

Showing 12 changed files with 635 additions and 32 deletions.
diff --git a/api/v1/provision_types.go b/api/v1/provision_types.go
@@ -20,22 +20,68 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+type Server struct {
+	CreateCount      int    `json:"serverCreateCount,omitempty"`
+	CreateStartNo    int    `json:"serverCreateStartNo,omitempty"`
+	Description      string `json:"serverDescription,omitempty"`
+	ImageNo          string `json:"serverImageNo,omitempty"`
+	ImageProductCode string `json:"serverImageProductCode,omitempty"`
+	Name             string `json:"serverName,omitempty"`
+	ProductCode      string `json:"serverProductCode,omitempty"`
+	SpecCode         string `json:"serverSpecCode,omitempty"`
+}
+
+type BlockStorageMapping struct {
+	BlockStorageName           string `json:"blockStorageMappingBlockStorageName,omitempty"`
+	BlockStorageSize           string `json:"blockStorageMappingBlockStorageSize,omitempty"`
+	BlockStorageVolumeTypeCode string `json:"blockStorageMappingBlockStorageVolumeTypeCode,omitempty"`
+	Encrypted                  string `json:"blockStorageMappingEncrypted,omitempty"`
+	Order                      int    `json:"blockStorageMappingList,omitempty"`
+	SnapshotInstanceNo         string `json:"blockStorageMappingSnapshotInstanceNo,omitempty"`
+}
+
+type NetworkInterface struct {
+	IP       string `json:"networkInterfaceIp,omitempty"`
+	No       string `json:"networkInterfaceNo,omitempty"`
+	Order    int    `json:"networkInterfaceList,omitempty"`
+	SubnetNo string `json:"networkInterfaceSubnetNo,omitempty"`
+}
 
 // ProvisionSpec defines the desired state of Provision
 type ProvisionSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
-	// Foo is an example field of Provision. Edit provision_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
+	AccessControlGroupNoListN         string              `json:"accessControlGroupNoList,omitempty"`
+	AssociateWithPublicIp             bool                `json:"associateWithPublicIp,omitempty"`
+	BlockDevicePartitionMountPoint    string              `json:"blockDevicePartitionMountPoint,omitempty"`
+	BlockDevicePartitionSize          string              `json:"blockDevicePartitionSize,omitempty"`
+	FeeSystemTypeCode                 string              `json:"feeSystemTypeCode,omitempty"`
+	InitScriptNo                      string              `json:"initScriptNo,omitempty"`
+	IsEncryptedBaseBlockStorageVolume bool                `json:"isEncryptedBaseBlockStorageVolume,omitempty"`
+	IsProtectServerTermination        bool                `json:"isProtectServerTermination,omitempty"`
+	LoginKeyName                      string              `json:"loginKeyName,omitempty"`
+	MemberServerImageInstanceNo       string              `json:"memberServerImageInstanceNo,omitempty"`
+	PlacementGroupNo                  string              `json:"placementGroupNo,omitempty"`
+	RAIDTypeName                      string              `json:"raidTypeName,omitempty"`
+	ResponseFormatType                string              `json:"responseFormatType,omitempty"`
+	SubnetNo                          string              `json:"subnetNo,omitempty"`
+	VpcNo                             string              `json:"vpcNo,omitempty"`
+	Server                            Server              `json:"server,omitempty"`
+	BlockStorageMapping               BlockStorageMapping `json:"blockStorageMapping,omitempty"`
+	NetworkInterface                  NetworkInterface    `json:"networkInterface,omitempty"`
 }
 
+type ProvisionPhase string
+
+const (
+	ProvisionPhaseCreate ProvisionPhase = "Create"
+	ProvisionPhaseUpdate ProvisionPhase = "Update"
+	ProvisionPhaseStop   ProvisionPhase = "Stop"
+	ProvisionPhaseDelete ProvisionPhase = "Delete"
+	ProvisionPhaseGet    ProvisionPhase = "Get"
+)
+
 // ProvisionStatus defines the observed state of Provision
 type ProvisionStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	Phase ProvisionPhase `json:"phase,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/vm.cloudclub.io_data.yaml b/config/crd/bases/vm.cloudclub.io_data.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.13.0
+  name: data.vm.cloudclub.io
+spec:
+  group: vm.cloudclub.io
+  names:
+    kind: Data
+    listKind: DataList
+    plural: data
+    singular: data
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Data is the Schema for the data API
+        properties:
+          apiVersion:
+            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
+          kind:
+            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
+          metadata:
+            type: object
+          spec:
+            description: DataSpec defines the desired state of Data
+            properties:
+              foo:
+                description: Foo is an example field of Data. Edit data_types.go to
+                  remove/update
+                type: string
+            type: object
+          status:
+            description: DataStatus defines the observed state of Data
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/config/crd/bases/vm.cloudclub.io_operatingsystems.yaml b/config/crd/bases/vm.cloudclub.io_operatingsystems.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.13.0
+  name: operatingsystems.vm.cloudclub.io
+spec:
+  group: vm.cloudclub.io
+  names:
+    kind: Operatingsystems
+    listKind: OperatingsystemsList
+    plural: operatingsystems
+    singular: operatingsystems
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Operatingsystems is the Schema for the operatingsystems API
+        properties:
+          apiVersion:
+            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
+          kind:
+            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
+          metadata:
+            type: object
+          spec:
+            description: OperatingsystemsSpec defines the desired state of Operatingsystems
+            properties:
+              foo:
+                description: Foo is an example field of Operatingsystems. Edit operatingsystems_types.go
+                  to remove/update
+                type: string
+            type: object
+          status:
+            description: OperatingsystemsStatus defines the observed state of Operatingsystems
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/config/crd/bases/vm.cloudclub.io_plans.yaml b/config/crd/bases/vm.cloudclub.io_plans.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.13.0
+  name: plans.vm.cloudclub.io
+spec:
+  group: vm.cloudclub.io
+  names:
+    kind: Plan
+    listKind: PlanList
+    plural: plans
+    singular: plan
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Plan is the Schema for the plans API
+        properties:
+          apiVersion:
+            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
+          kind:
+            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
+          metadata:
+            type: object
+          spec:
+            description: PlanSpec defines the desired state of Plan
+            properties:
+              foo:
+                description: Foo is an example field of Plan. Edit plan_types.go to
+                  remove/update
+                type: string
+            type: object
+          status:
+            description: PlanStatus defines the observed state of Plan
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}