|
|
@@ -1,24 +1,24 @@
|
|
|
package cn.seecoder.web.core.pipeline.handler;
|
|
|
|
|
|
-import cn.seecoder.web.infra.ApplicationProperties;
|
|
|
-import cn.seecoder.web.infra.k8s.DeploymentApi;
|
|
|
-import cn.seecoder.web.infra.k8s.IngressApi;
|
|
|
-import cn.seecoder.web.infra.k8s.K8sConstants;
|
|
|
-import cn.seecoder.web.infra.k8s.LimitRangeApi;
|
|
|
-import cn.seecoder.web.infra.k8s.NamespaceApi;
|
|
|
-import cn.seecoder.web.infra.k8s.SecretApi;
|
|
|
-import cn.seecoder.web.infra.k8s.ServiceApi;
|
|
|
-import cn.seecoder.web.infra.k8s.exception.K8sApiException;
|
|
|
-import cn.seecoder.web.infra.k8s.model.Container;
|
|
|
-import cn.seecoder.web.infra.k8s.model.ContainerPort;
|
|
|
-import cn.seecoder.web.infra.k8s.model.Deployment;
|
|
|
-import cn.seecoder.web.infra.k8s.model.Ingress;
|
|
|
-import cn.seecoder.web.infra.k8s.model.K8sObjectRequest;
|
|
|
-import cn.seecoder.web.infra.k8s.model.LimitRange;
|
|
|
-import cn.seecoder.web.infra.k8s.model.Namespace;
|
|
|
-import cn.seecoder.web.infra.k8s.model.Service;
|
|
|
-import cn.seecoder.web.infra.k8s.model.ServicePort;
|
|
|
-import cn.seecoder.web.infra.k8s.vo.SecretVO;
|
|
|
+import cn.seecoder.web.infrastructure.config.DevcloudProperties;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.DeploymentApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.IngressApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.K8sConstants;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.LimitRangeApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.NamespaceApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.SecretApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.ServiceApi;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.exception.K8sApiException;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.Container;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.ContainerPort;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.Deployment;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.Ingress;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.K8sObjectRequest;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.LimitRange;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.Namespace;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.Service;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.model.ServicePort;
|
|
|
+import cn.seecoder.web.infrastructure.external.k8s.vo.SecretVO;
|
|
|
import cn.seecoder.common.util.SpringUtil;
|
|
|
import cn.seecoder.web.core.pipeline.Context;
|
|
|
import cn.seecoder.web.core.pipeline.PipelineException;
|
|
|
@@ -39,7 +39,7 @@ public class DeployHandler extends AbstractHandler {
|
|
|
private final static String DEFAULT_IMAGE_PULL_SECRET_NAME = "seecoder-devcloud-image-pull-secret";
|
|
|
private final SecretApi secretApi;
|
|
|
private final DeploymentApi deploymentApi;
|
|
|
- private final ApplicationProperties applicationProperties;
|
|
|
+ private final DevcloudProperties applicationProperties;
|
|
|
private final NamespaceApi namespaceApi;
|
|
|
private final ServiceApi serviceApi;
|
|
|
private final IngressApi ingressApi;
|
|
|
@@ -48,7 +48,7 @@ public class DeployHandler extends AbstractHandler {
|
|
|
|
|
|
public DeployHandler() {
|
|
|
this.limitRangeApi = SpringUtil.getBean(LimitRangeApi.class);
|
|
|
- this.applicationProperties = SpringUtil.getBean(ApplicationProperties.class);
|
|
|
+ this.applicationProperties = SpringUtil.getBean(DevcloudProperties.class);
|
|
|
secretApi = SpringUtil.getBean(SecretApi.class);
|
|
|
deploymentApi = SpringUtil.getBean(DeploymentApi.class);
|
|
|
namespaceApi = SpringUtil.getBean(NamespaceApi.class);
|