Merge pull request #6 from IvorySQL/dev-srk

approved

Author: gaoxueyu

authcenter/src/main/java/com/highgo/cloud/auth/controller/AuthController.java

@@ -42,7 +42,7 @@
  */
 @RestController
 @Validated
-@RequestMapping("${common.request-path-prefix}/v1")
+@RequestMapping("${common.request-path-prefix}/${common.version}")
 @Api(tags = "授权管理")
 public class AuthController {
 

cloudnative/src/main/java/com/highgo/platform/apiserver/controller/WatcherController.java

@@ -29,7 +29,7 @@
 
 @Validated
 @RestController
-@RequestMapping("/${common.request-path-prefix}/${common.version}")
+@RequestMapping("${common.request-path-prefix}/${common.version}")
 public class WatcherController {
 
     @Autowired

cloudnative/src/main/java/com/highgo/platform/apiserver/service/BackupService.java

@@ -20,6 +20,7 @@
 import com.highgo.cloud.enums.BackupStatus;
 import com.highgo.cloud.model.PageInfo;
 import com.highgo.platform.apiserver.model.dto.BackupDTO;
+import com.highgo.platform.apiserver.model.po.BackupPO;
 import com.highgo.platform.apiserver.model.po.BackupPolicyPO;
 import com.highgo.platform.apiserver.model.vo.request.CreateBackupVO;
 import com.highgo.platform.apiserver.model.vo.request.ModifyAutoBackupSwitchVO;
@@ -141,4 +142,6 @@ public interface BackupService {
     public void updateBackupStatus(String backupId, BackupStatus backupStatus);
 
     public void updateBackupIsRestoring(String backupId, Boolean isRestoring);
+
+    BackupDTO createManualBackup(BackupPO backupPO);
 }

cloudnative/src/main/java/com/highgo/platform/apiserver/service/impl/BackupServiceImpl.java

@@ -474,4 +474,12 @@ public void updateBackupStatus(String backupId, BackupStatus backupStatus) {
     public void updateBackupIsRestoring(String backupId, Boolean isRestoring) {
         backupRepository.updateIsRestoring(backupId, CommonUtil.getUTCDate(), isRestoring);
     }
+
+    @Override
+    public BackupDTO createManualBackup(BackupPO backupPO) {
+        BackupDTO backupDTO = new BackupDTO();
+        BackupPO saved = backupRepository.save(backupPO);
+        BeanUtil.copyNotNullProperties(backupDTO, saved);
+        return backupDTO;
+    }
 }

cloudnative/src/main/java/com/highgo/platform/apiserver/service/impl/K8sClusterServiceImpl.java

@@ -17,26 +17,29 @@
 
 package com.highgo.platform.apiserver.service.impl;
 
+import cn.hutool.core.thread.ThreadUtil;
+import com.highgo.cloud.enums.InstanceStatus;
+import com.highgo.cloud.enums.InstanceType;
+import com.highgo.cloud.model.K8sClusterInfoDTO;
+import com.highgo.cloud.model.ServerConnectVO;
+import com.highgo.cloud.util.BeanUtil;
+import com.highgo.cloud.util.CommonUtil;
 import com.highgo.cloud.util.SshUtil;
 import com.highgo.platform.apiserver.model.dto.InstanceDTO;
-import com.highgo.cloud.model.K8sClusterInfoDTO;
 import com.highgo.platform.apiserver.model.po.InstancePO;
 import com.highgo.platform.apiserver.model.po.K8sClusterInfoPO;
 import com.highgo.platform.apiserver.model.vo.request.CreateClusterVO;
-import com.highgo.cloud.model.ServerConnectVO;
 import com.highgo.platform.apiserver.model.vo.response.ActionResponse;
 import com.highgo.platform.apiserver.model.vo.response.ClusterInfoVO;
 import com.highgo.platform.apiserver.model.vo.response.K8sResourceCountVO;
 import com.highgo.platform.apiserver.repository.InstanceRepository;
 import com.highgo.platform.apiserver.repository.K8sClusterInfoRepository;
 import com.highgo.platform.apiserver.service.K8sClusterService;
 import com.highgo.platform.configuration.K8sClientConfiguration;
-import com.highgo.cloud.enums.InstanceStatus;
-import com.highgo.cloud.enums.InstanceType;
 import com.highgo.platform.errorcode.ClusterError;
 import com.highgo.platform.exception.ClusterException;
-import com.highgo.cloud.util.BeanUtil;
-import com.highgo.cloud.util.CommonUtil;
+import com.highgo.platform.operator.ElectLeader;
+import com.highgo.platform.operator.watcher.WatcherFactory;
 import com.jcraft.jsch.JSchException;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
@@ -70,7 +73,13 @@ public class K8sClusterServiceImpl implements K8sClusterService {
 
     @Autowired
     K8sClientConfiguration k8sClientConfiguration;
+    @Autowired
+    private WatcherFactory watcherFactory;
 
+    @javax.annotation.Resource
+    private ElectLeader electLeader;
+    @Value("${common.namespace:ivory}")
+    private String namespace;
     // k8s 默认的命名空间
     private final List<String> kubeNamespaces =
             new ArrayList<>(Arrays.asList("kube-node-lease", "kube-flannel", "kube-public", "kube-system"));
@@ -262,6 +271,22 @@ public ClusterInfoVO insertCluster(CreateClusterVO createClusterVO) {
         ClusterInfoVO clusterInfoVO = new ClusterInfoVO();
         BeanUtil.copyNotNullProperties(k8sClusterInfoPO, clusterInfoVO);
         processingIps.remove(k8sClusterInfoDTO.getServerUrl());
+        // 异步执行 创建namespace及启动leader
+        ThreadUtil.execute(() -> {
+            List<Namespace> namespaces = getNamespace(clusterInfoVO.getClusterId());
+            if (!CommonUtil.isEmpty(namespaces)) {
+                Optional<Namespace> namespaceOptional =
+                        namespaces.stream().filter(item -> item.getMetadata().getName().equals(namespace)).findFirst();
+                if (!namespaceOptional.isPresent()) {
+                    createNamespace(clusterInfoVO.getClusterId(), namespace);
+                }
+            }
+            try {
+                electLeader.initLeaderElector();
+            } catch (Exception e) {
+                logger.error("Failed to init leader elector.The cluster id is: {}", k8sClusterInfoDTO.getClusterId());
+            }
+        });
         return clusterInfoVO;
     }
 
@@ -276,6 +301,7 @@ public ActionResponse delCluster(String clusterId) {
 
         Date now = CommonUtil.getUTCDate();
         k8sClusterInfoRepository.deleteByClusterId(clusterId, now);
+        watcherFactory.stopWatcherById(clusterId);
         return ActionResponse.actionSuccess();
     }
 

cloudnative/src/main/java/com/highgo/platform/operator/ElectLeader.java

@@ -32,8 +32,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 import java.net.InetAddress;
@@ -42,7 +40,7 @@
 import java.util.Map;
 
 @Component
-public class ElectLeader implements ApplicationRunner {
+public class ElectLeader {
 
     private static final Logger logger = LoggerFactory.getLogger(ElectLeader.class);
 
@@ -72,11 +70,9 @@ public class ElectLeader implements ApplicationRunner {
     /**
      * Callback used to run the bean.
      *
-     * @param args incoming application arguments
      * @throws Exception on error
      */
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void initLeaderElector() throws Exception {
 
         ApiClient client = Config.defaultClient();
         Configuration.setDefaultApiClient(client);

cloudnative/src/main/java/com/highgo/platform/operator/cr/bean/DatabaseClusterSpec.java

@@ -20,13 +20,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.highgo.platform.operator.cr.bean.backup.Backup;
 import com.highgo.platform.operator.cr.bean.backup.RestoreDatasource;
-import com.highgo.platform.operator.cr.bean.service.DatabaseService;
 import com.highgo.platform.operator.cr.bean.imagePullsecret.ImagePullSecret;
 import com.highgo.platform.operator.cr.bean.instance.Instance;
 import com.highgo.platform.operator.cr.bean.monitor.Monitor;
 import com.highgo.platform.operator.cr.bean.patroni.Patroni;
 import com.highgo.platform.operator.cr.bean.pgadmin.UserInterface;
+import com.highgo.platform.operator.cr.bean.service.DatabaseService;
 import com.highgo.platform.operator.cr.bean.user.User;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
 import lombok.*;
 
 import java.util.List;
@@ -88,4 +89,9 @@ public class DatabaseClusterSpec {
      */
     private RestoreDatasource dataSource;
 
+    /**
+     * metadata
+     */
+    private ObjectMeta metadata;
+
 }

cloudnative/src/main/java/com/highgo/platform/operator/cr/bean/backup/RestoreDatasource.java

@@ -32,5 +32,12 @@
 @Builder
 public class RestoreDatasource {
 
+    /**
+     * for ivoryCluster
+     */
+    private RestoreCluster ivoryCluster;
+    /**
+     * for highgoCluster
+     */
     private RestoreCluster postgresCluster;
 }

cloudnative/src/main/java/com/highgo/platform/operator/service/CrService.java

@@ -68,13 +68,6 @@ public interface CrService {
      */
     public boolean deleteCr(InstanceDTO instanceDTO);
 
-    /**
-     * 删除实例的所有pod(重启实例时，删除pod进行重启)
-     * @param instanceDTO
-     * @return
-     */
-    public boolean deleteAllPod(InstanceDTO instanceDTO);
-
     /**
      * @description 重启数据库实例
      *

cloudnative/src/main/java/com/highgo/platform/operator/service/OperatorBackupsService.java

@@ -54,5 +54,5 @@ public interface OperatorBackupsService {
     /**
      * 同步cr手动备份记录状态到数据库
      */
-    public void syncManualBackup(ManualBackupStatus newManualBackupStatus);
+    public void syncManualBackup(String instanceId, ManualBackupStatus newManualBackupStatus);
 }