Merge pull request #9 from cybozu-go/implement-restore-2

Implement the reconciler for MantleRestore

Author: satoru-takeuchi

Diff for: Dockerfile

@@ -13,7 +13,7 @@ RUN go mod download
 COPY main.go main.go
 COPY cmd/ cmd/
 COPY api/ api/
-COPY internal/controller/ internal/controller/
+COPY internal/ internal/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

Diff for: Makefile

@@ -47,6 +47,7 @@ help: ## Display this help.
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	cp -a config/crd/bases/mantle.cybozu.io_mantlebackups.yaml charts/mantle-cluster-wide/templates/
+	cp -a config/crd/bases/mantle.cybozu.io_mantlerestores.yaml charts/mantle-cluster-wide/templates/
 	cat config/rbac/role.yaml | yq '.metadata.name = "mantle-controller"' > charts/mantle-cluster-wide/templates/clusterrole.yaml
 
 .PHONY: generate
@@ -61,8 +62,12 @@ fmt: ## Run go fmt against code.
 vet: ## Run go vet against code.
 	go vet ./...
 
+.PHONY: mock
+mock: mockgen
+	$(MOCKGEN) -source=internal/ceph/command.go -destination=internal/ceph/command_mock.go -package=ceph
+
 .PHONY: test
-test: manifests generate fmt vet envtest ## Run tests.
+test: manifests generate fmt vet envtest mock ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_KUBERNETES_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./... -coverprofile cover.out
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
@@ -155,6 +160,7 @@ KUBECTL ?= $(LOCALBIN)/kubectl
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
+MOCKGEN ?= $(LOCALBIN)/mockgen
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
@@ -181,3 +187,8 @@ kubectl: $(KUBECTL) # Download kubectl if necessary.
 $(KUBECTL): $(LOCALBIN)
 	curl https://storage.googleapis.com/kubernetes-release/release/v$(KUBERNETES_VERSION)/bin/linux/amd64/kubectl -o $(KUBECTL)
 	chmod 755 $(KUBECTL)
+
+.PHONY: mockgen
+mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
+$(MOCKGEN): $(LOCALBIN)
+	GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen@$(MOCKGEN_VERSION)

Diff for: PROJECT

@@ -17,4 +17,13 @@ resources:
   kind: MantleBackup
   path: github.com/cybozu-go/mantle/api/v1
   version: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: cybozu.io
+  group: backup
+  kind: MantleRestore
+  path: github.com/cybozu-go/mantle/api/v1
+  version: v1
 version: "3"

Diff for: api/v1/mantlebackup_types.go

@@ -31,6 +31,11 @@ type MantleBackupStatus struct {
 
 	// 'conditions' specifies current backup conditions
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	// 'pvcManifest' saving backup target PVC manifests
+	PVCManifest string `json:"pvcManifest,omitempty"`
+	// 'pvManifest' saving backup target PV manifest
+	PVManifest string `json:"pvManifest,omitempty"`
 }
 
 const (

Diff for: api/v1/mantlerestore_types.go

@@ -0,0 +1,62 @@
+package v1
+
+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.
+
+// MantleRestoreSpec defines the desired state of MantleRestore
+type MantleRestoreSpec struct {
+	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// 'backup' specifies restore target backup resource name
+	// +kubebuilder:validation:Required
+	Backup string `json:"backup,omitempty"`
+}
+
+// MantleRestoreStatus defines the observed state of MantleRestore
+type MantleRestoreStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// 'conditions' specifies current restore conditions
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	// 'clusterID' specifies the Ceph cluster ID the source PV/PVC belongs to
+	ClusterID string `json:"clusterID,omitempty"`
+
+	// 'pool' specifies pool name the volumes are restored to
+	Pool string `json:"pool,omitempty"`
+}
+
+const (
+	RestoreConditionReadyToUse = "ReadyToUse"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+
+// MantleRestore is the Schema for the mantlerestores API
+type MantleRestore struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   MantleRestoreSpec   `json:"spec,omitempty"`
+	Status MantleRestoreStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// MantleRestoreList contains a list of MantleRestore
+type MantleRestoreList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []MantleRestore `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&MantleRestore{}, &MantleRestoreList{})
+}

Diff for: api/v1/zz_generated.deepcopy.go

@@ -9,16 +9,24 @@ rules:
     resources:
       - persistentvolumeclaims
     verbs:
+      - create
+      - delete
       - get
       - list
+      - patch
+      - update
       - watch
   - apiGroups:
       - ""
     resources:
       - persistentvolumes
     verbs:
+      - create
+      - delete
       - get
       - list
+      - patch
+      - update
       - watch
   - apiGroups:
       - ""
@@ -62,6 +70,40 @@ rules:
       - get
       - patch
       - update
+  - apiGroups:
+      - mantle.cybozu.io
+    resources:
+      - mantlerbackup
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - mantle.cybozu.io
+    resources:
+      - mantlerestores
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - mantle.cybozu.io
+    resources:
+      - mantlerestores/finalizers
+    verbs:
+      - update
+  - apiGroups:
+      - mantle.cybozu.io
+    resources:
+      - mantlerestores/status
+    verbs:
+      - get
+      - patch
+      - update
   - apiGroups:
       - storage.k8s.io
     resources:

Diff for: charts/mantle-cluster-wide/templates/clusterrole.yaml

@@ -123,6 +123,12 @@ spec:
                 description: '''createdAt'' specifies the creation date and time'
                 format: date-time
                 type: string
+              pvManifest:
+                description: '''pvManifest'' saving backup target PV manifest'
+                type: string
+              pvcManifest:
+                description: '''pvcManifest'' saving backup target PVC manifests'
+                type: string
             type: object
         type: object
     served: true