Merge pull request #37 from cybozu-go/support-repl-of-mb-and-pvc-objects

support replication of MantleBackup and PVC objects
cybozu-go · Sep 12, 2024 · ced1d71 · ced1d71
2 parents a18b772 + 17ea4f2
commit ced1d71
Show file tree

Hide file tree

Showing 14 changed files with 468 additions and 87 deletions.
diff --git a/api/v1/mantlebackup_types.go b/api/v1/mantlebackup_types.go
@@ -38,7 +38,7 @@ type MantleBackupStatus struct {
 	PVManifest string `json:"pvManifest,omitempty"`
 
 	// 'snapID' indicates SNAPID of `rbd snap ls`
-	SnapID int `json:"snapID,omitempty"`
+	SnapID *int `json:"snapID,omitempty"`
 }
 
 const (

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/charts/mantle/templates/service.yaml b/charts/mantle/templates/service.yaml
@@ -0,0 +1,16 @@
+{{- if eq .Values.controller.role "secondary" }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "mantle.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ .Values.secondaryService.type }}
+  ports:
+  - port: {{ .Values.secondaryService.port }}
+    targetPort: {{ .Values.secondaryService.targetPort }}
+    protocol: TCP
+    name: grpc
+  selector:
+    {{- include "mantle.selectorLabels" . | nindent 4 }}
+{{ end }}
diff --git a/charts/mantle/values.yaml b/charts/mantle/values.yaml
@@ -25,3 +25,8 @@ affinity: {}
 controller:
   role: standalone
   ports: []
+
+secondaryService:
+  # type:
+  # port:
+  # targetPort:
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -198,7 +198,7 @@ func setupSecondary(ctx context.Context, mgr manager.Manager, wg *sync.WaitGroup
 		),
 	))
 
-	proto.RegisterMantleServiceServer(serv, &controller.SecondaryServer{})
+	proto.RegisterMantleServiceServer(serv, controller.NewSecondaryServer(mgr.GetClient(), mgr.GetAPIReader()))
 
 	l, err := net.Listen("tcp", mantleServiceEndpoint)
 	if err != nil {