[incubator-dlab] branch DLAB-terraform updated (4d64d2d -> d23c77f)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-terraform in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 4d64d2d Add copyright disclaimers add 5adb199 added Docker proxy repo add 6dc84b3 added Docker proxy repo add e320f8f [DLAB-765]:fixed issue with parameters add 04378a8 [DLAB-765]:fixed issue with parameters new d23c77f Merge pull request #138 from apache/DLAB-765 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../scripts/deploy_repository/templates/configureNexus.groovy| 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #138 from apache/DLAB-765
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch DLAB-terraform in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d23c77f537748a737239009eb19d9b38b321dfd4 Merge: 4d64d2d 04378a8 Author: Oleh Martushevskyi AuthorDate: Thu Jul 4 18:52:40 2019 +0300 Merge pull request #138 from apache/DLAB-765 [DLAB-456]: Added docker proxy repo to Nexus .../scripts/deploy_repository/templates/configureNexus.groovy| 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-765 deleted (was 04378a8)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-765 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 04378a8 [DLAB-765]:fixed issue with parameters The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform updated: Add copyright disclaimers
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch DLAB-terraform in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/DLAB-terraform by this push: new 4d64d2d Add copyright disclaimers 4d64d2d is described below commit 4d64d2de1fca6a08fdb7bcfddf2df415d2f4 Author: Oleksandr_Isniuk AuthorDate: Thu Jul 4 18:44:57 2019 +0300 Add copyright disclaimers --- .../aws/modules/dlab-ui/dlab-ui-chart/.helmignore | 21 + .../aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml | 21 + .../dlab-ui/dlab-ui-chart/templates/NOTES.txt | 21 + .../dlab-ui/dlab-ui-chart/templates/_helpers.tpl | 20 .../dlab-ui-chart/templates/deployment.yaml| 20 .../dlab-ui/dlab-ui-chart/templates/ingress.yaml | 22 +- .../dlab-ui/dlab-ui-chart/templates/service.yaml | 21 + .../aws/modules/dlab-ui/dlab-ui-chart/values.yaml | 21 + 8 files changed, 166 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore index 50af031..4976779 100644 --- a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore +++ b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore @@ -1,3 +1,24 @@ +# * +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ** + # Patterns to ignore when building packages. # This supports shell glob matching, relative path matching, and # negation (prefixed with !). Only one pattern per line. diff --git a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml index 0fe03fe..3e7800b 100644 --- a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml +++ b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml @@ -1,3 +1,24 @@ +# * +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# ** + apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes diff --git a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt index 27f3f3a..3d3445a 100644 --- a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt +++ b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt @@ -1,3 +1,24 @@ +# * +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache L
[incubator-dlab] branch DLAB-terraform updated: [DLAB-759] TF module for Mongo-HA [DLAB-836] TF module for nginx load balancer [DLAB-811] chart for dlab-ui
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 7733f96 [DLAB-759] TF module for Mongo-HA [DLAB-836] TF module for
nginx load balancer [DLAB-811] chart for dlab-ui
7733f96 is described below
commit 7733f9665cc05adf4ee3772109b549a1dc13686e
Author: Oleksandr_Isniuk
AuthorDate: Thu Jul 4 17:58:16 2019 +0300
[DLAB-759] TF module for Mongo-HA
[DLAB-836] TF module for nginx load balancer
[DLAB-811] chart for dlab-ui
---
.../aws/modules/dlab-ui/dlab-ui-chart/.helmignore | 22
.../aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml | 5 ++
.../dlab-ui/dlab-ui-chart/templates/NOTES.txt | 21
.../dlab-ui/dlab-ui-chart/templates/_helpers.tpl | 45
.../dlab-ui-chart/templates/deployment.yaml| 52 ++
.../dlab-ui/dlab-ui-chart/templates/ingress.yaml | 35 +
.../dlab-ui/dlab-ui-chart/templates/service.yaml | 16 ++
.../aws/modules/dlab-ui/dlab-ui-chart/values.yaml | 49 +
.../terraform/aws/modules/dlab-ui/dlab-ui.tf | 20 +++
.../terraform/aws/modules/mongo/mongo.tf | 61 ++
.../terraform/aws/modules/mongo/variables.tf | 40 ++
.../terraform/aws/modules/nginx/nginx.tf | 48 +
.../terraform/aws/modules/nginx/variables.tf | 28 ++
13 files changed, 442 insertions(+)
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore
new file mode 100644
index 000..50af031
--- /dev/null
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml
new file mode 100644
index 000..0fe03fe
--- /dev/null
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: dlab-ui
+version: 0.1.0
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt
new file mode 100644
index 000..27f3f3a
--- /dev/null
+++
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/NOTES.txt
@@ -0,0 +1,21 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+ {{- range .paths }}
+ http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+ {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o
jsonpath="{.spec.ports[0].nodePort}" services {{ include "dlab-ui.fullname" .
}})
+ export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o
jsonpath="{.items[0].status.addresses[0].address}")
+ echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get --namespace {{
.Release.Namespace }} svc -w {{ include "dlab-ui.fullname" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{
include "dlab-ui.fullname" . }} -o
jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l
"app.kubernetes.io/name={{ include "dlab-ui.name" .
}},app.kubernetes.io/instance={{ .Release.Name }}" -o
jsonpath="{.items[0].metadata.name}")
+ echo "Visit http://127.0.0.1:8080 to use your application"
+ kubectl port-forward $POD_NAME 8080:80
+{{- end }}
diff --git
a/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/_helpers.tpl
b/infrastructure-provisioning/terraform/aws/modules/dlab-ui/dlab-ui-chart/templates/_helpers.tpl
new file mode 100644
index 000..2686270
--- /dev/null
+++
b/infrastructure-provis
[incubator-dlab] branch feature/projects updated (63f36d4 -> d39532c)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 63f36d4 DLAB-840 fixed bug connected with computational creation
new ba71767 DLAB-841 modified API to return edge info per project
new d39532c DLAB-843 fixed bug connected with API for getting user env
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/scripts/aws/edge_configure.py | 1 +
.../java/com/epam/dlab/dto/base/edge/EdgeInfo.java | 32 +++--
.../dlab/dto/base/project/ProjectEdgeInfo.java | 28
.../epam/dlab/dto/base/project/ProjectResult.java | 3 +-
services/provisioning-service/provisioning.yml | 4 +-
.../response/handlers/ProjectCallbackHandler.java | 9 +-
.../service/impl/ProjectServiceImpl.java | 4 +-
.../mock_response/gcp/project_create.json | 3 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 4 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 4 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java| 22 ++-
.../resources/InfrastructureInfoResource.java | 5 +-
.../resources/callback/ProjectCallback.java| 2 +-
...ureInfo.java => ProjectInfrastructureInfo.java} | 4 +-
.../backendapi/resources/dto/UserResourceInfo.java | 7 +
.../epam/dlab/backendapi/service/EdgeService.java | 2 +
.../service/InfrastructureInfoService.java | 6 +-
.../backendapi/service/impl/EdgeServiceImpl.java | 8 ++
.../service/impl/EnvironmentServiceImpl.java | 25 ++--
.../impl/InfrastructureInfoServiceBase.java| 19 ++-
.../service/impl/ProjectServiceImpl.java | 6 +-
.../resources/InfrastructureInfoResourceTest.java | 45 +-
.../service/impl/EnvironmentServiceImplTest.java | 19 +--
.../impl/InfrastructureInfoServiceBaseTest.java| 155 -
24 files changed, 125 insertions(+), 292 deletions(-)
delete mode 100644
services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
rename
services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{InfrastructureInfo.java
=> ProjectInfrastructureInfo.java} (93%)
delete mode 100644
services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBaseTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: DLAB-843 fixed bug connected with API for getting user env
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d39532c34f0ab85c011e88ff7179a09a809b1904
Author: bhliva
AuthorDate: Thu Jul 4 16:35:26 2019 +0300
DLAB-843 fixed bug connected with API for getting user env
---
.../backendapi/resources/dto/UserResourceInfo.java | 7 ++
.../service/impl/EnvironmentServiceImpl.java | 25 +++---
.../service/impl/EnvironmentServiceImplTest.java | 19 +---
3 files changed, 30 insertions(+), 21 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
index bf0e4d4..8b4eeb6 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
@@ -48,6 +48,8 @@ public class UserResourceInfo {
@JsonProperty
private String user;
+ @JsonProperty
+ private String project;
@JsonProperty("public_ip")
private String ip;
@@ -87,4 +89,9 @@ public class UserResourceInfo {
setIp(ip);
return this;
}
+
+ public UserResourceInfo withProject(String project) {
+ setProject(project);
+ return this;
+ }
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
index 217d139..300b41f 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
@@ -25,15 +25,12 @@ import com.epam.dlab.backendapi.dao.EnvDAO;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.dao.KeyDAO;
import com.epam.dlab.backendapi.dao.UserSettingsDAO;
+import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.dto.UserDTO;
import com.epam.dlab.backendapi.resources.dto.UserResourceInfo;
-import com.epam.dlab.backendapi.service.ComputationalService;
-import com.epam.dlab.backendapi.service.EdgeService;
-import com.epam.dlab.backendapi.service.EnvironmentService;
-import com.epam.dlab.backendapi.service.ExploratoryService;
+import com.epam.dlab.backendapi.service.*;
import com.epam.dlab.dto.UserInstanceDTO;
import com.epam.dlab.dto.UserInstanceStatus;
-import com.epam.dlab.dto.base.edge.EdgeInfo;
import com.epam.dlab.exceptions.ResourceConflictException;
import com.epam.dlab.model.ResourceEnum;
import com.google.inject.Inject;
@@ -71,6 +68,8 @@ public class EnvironmentServiceImpl implements
EnvironmentService {
@Inject
private EdgeService edgeService;
@Inject
+ private ProjectService projectService;
+ @Inject
private UserSettingsDAO settingsDAO;
@Override
@@ -99,7 +98,7 @@ public class EnvironmentServiceImpl implements
EnvironmentService {
public List getAllEnv() {
log.debug("Getting all user's environment...");
List expList = exploratoryDAO.getInstances();
- return getUserNames().stream().map(user -> getUserEnv(user,
expList)).flatMap(Collection::stream)
+ return projectService.getProjects().stream().map(projectDTO ->
getProjectEnv(projectDTO, expList)).flatMap(Collection::stream)
.collect(toList());
}
@@ -225,14 +224,13 @@ public class EnvironmentServiceImpl implements
EnvironmentService {
computationalService.terminateComputational(userInfo,
exploratoryName, computationalName);
}
- private List getUserEnv(String user,
List allInstances) {
- EdgeInfo edgeInfo = keyDAO.getEdgeInfo(user);
+ private List getProjectEnv(ProjectDTO projectDTO,
List allInstances) {
UserResourceInfo edgeResource = new
UserResourceInfo().withResourceType(ResourceEnum.EDGE_NODE)
- .withResourceStatus(edgeInfo.getEdgeStatus())
- .withUser(user)
- .withIp(edgeInfo.getPublicIp());
+ .withResourceStatus("running")
+ .withProject(projectDTO.getName())
+ .withIp(projectDTO.getEdgeInfo().getPublicIp());
return Stream.concat(Stream.of(edgeResource),
allInstances.stream()
- .filter(instance ->
instance.getUser().equals(user)).map(this::toUserResourceInfo))
+
[incubator-dlab] 01/02: DLAB-841 modified API to return edge info per project
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ba717679e6dc810fd137c2dc93e21a9328c44fb2
Author: bhliva
AuthorDate: Thu Jul 4 15:48:09 2019 +0300
DLAB-841 modified API to return edge info per project
---
.../src/general/scripts/aws/edge_configure.py | 1 +
.../java/com/epam/dlab/dto/base/edge/EdgeInfo.java | 32 +++--
.../dlab/dto/base/project/ProjectEdgeInfo.java | 28
.../epam/dlab/dto/base/project/ProjectResult.java | 3 +-
services/provisioning-service/provisioning.yml | 4 +-
.../response/handlers/ProjectCallbackHandler.java | 9 +-
.../service/impl/ProjectServiceImpl.java | 4 +-
.../mock_response/gcp/project_create.json | 3 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 4 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 4 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java| 22 ++-
.../resources/InfrastructureInfoResource.java | 5 +-
.../resources/callback/ProjectCallback.java| 2 +-
...ureInfo.java => ProjectInfrastructureInfo.java} | 4 +-
.../epam/dlab/backendapi/service/EdgeService.java | 2 +
.../service/InfrastructureInfoService.java | 6 +-
.../backendapi/service/impl/EdgeServiceImpl.java | 8 ++
.../impl/InfrastructureInfoServiceBase.java| 19 ++-
.../service/impl/ProjectServiceImpl.java | 6 +-
.../resources/InfrastructureInfoResourceTest.java | 45 +-
.../impl/InfrastructureInfoServiceBaseTest.java| 155 -
21 files changed, 95 insertions(+), 271 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index c215fd2..294a27e 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -246,6 +246,7 @@ if __name__ == "__main__":
"notebook_subnet": edge_conf['private_subnet_cidr'],
"full_edge_conf": edge_conf,
"project_name": os.environ['project_name'],
+ "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp"
"Action": "Create new EDGE server"}
print(json.dumps(res))
result.write(json.dumps(res))
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java
index 19ae1cc..ddcf8c4 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/edge/EdgeInfo.java
@@ -22,47 +22,49 @@ package com.epam.dlab.dto.base.edge;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import lombok.Data;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
public class EdgeInfo {
-@JsonProperty("_id")
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-private String id;
+ @JsonProperty("_id")
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String id;
-@JsonProperty("instance_id")
-private String instanceId;
+ @JsonProperty("instance_id")
+ private String instanceId;
@JsonProperty
-private String hostname;
+ private String hostname;
@JsonProperty("public_ip")
-private String publicIp;
+ private String publicIp;
@JsonProperty
-private String ip;
+ private String ip;
@JsonProperty("key_name")
-private String keyName;
+ private String keyName;
@JsonProperty("tunnel_port")
-private String tunnelPort;
+ private String tunnelPort;
@JsonProperty("socks_port")
-private String socksPort;
+ private String socksPort;
@JsonProperty("notebook_sg")
-private String notebookSg;
+ private String notebookSg;
@JsonProperty("edge_sg")
-private String edgeSg;
+ private String edgeSg;
@JsonProperty("notebook_subnet")
-private String notebookSubnet;
+ private String notebookSubnet;
@JsonProperty("edge_status")
-private String edgeStatus;
+ private String edgeStatus;
@JsonProperty("reupload_key_required")
private boolean reuploadKeyRequired = false;
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
deleted file mode 100644
index 0bf1c20..000
---
a/services/dlab-model/
[incubator-dlab] branch DLAB-765 updated: [DLAB-765]:fixed issue with parameters
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-765
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-765 by this push:
new 04378a8 [DLAB-765]:fixed issue with parameters
04378a8 is described below
commit 04378a883c2405e1c73925ea123f469b968e1c02
Author: Oleh Martushevskyi
AuthorDate: Thu Jul 4 15:45:24 2019 +0300
[DLAB-765]:fixed issue with parameters
---
.../scripts/deploy_repository/templates/configureNexus.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index 7dc4e22..afe5e4b 100644
---
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -51,7 +51,7 @@ repository.createPyPiProxy('pypi','https://pypi.org/',
'packages_store', true)
repository.createMavenProxy('maven-central','https://repo1.maven.org/maven2/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createMavenProxy('maven-bintray','https://dl.bintray.com/michaelklishin/maven/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createDockerHosted('docker-internal', null, 8083, 'docker_store',
true, true)
-repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', null, null, 'docker_store', true, false)
+repository.createDockerProxy('docker_hub', 'https://registry-1.docker.io',
'HUB', null, null, null, 'docker_store', true, false)
repository.createRawProxy('docker','https://download.docker.com/linux/ubuntu',
'packages_store')
repository.createRawProxy('jenkins','http://pkg.jenkins.io/debian-stable',
'packages_store')
repository.createRawProxy('mongo','http://repo.mongodb.org/apt/ubuntu',
'packages_store')
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-765 updated: [DLAB-765]:fixed issue with parameters
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-765
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-765 by this push:
new e320f8f [DLAB-765]:fixed issue with parameters
e320f8f is described below
commit e320f8f38dc1d93334a7e7570e46f8a1c6c3d78e
Author: Oleh Martushevskyi
AuthorDate: Thu Jul 4 15:24:23 2019 +0300
[DLAB-765]:fixed issue with parameters
---
.../scripts/deploy_repository/templates/configureNexus.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index 6d1653e..7dc4e22 100644
---
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -51,7 +51,7 @@ repository.createPyPiProxy('pypi','https://pypi.org/',
'packages_store', true)
repository.createMavenProxy('maven-central','https://repo1.maven.org/maven2/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createMavenProxy('maven-bintray','https://dl.bintray.com/michaelklishin/maven/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createDockerHosted('docker-internal', null, 8083, 'docker_store',
true, true)
-repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', 0, 0, 'docker_store', true, false)
+repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', null, null, 'docker_store', true, false)
repository.createRawProxy('docker','https://download.docker.com/linux/ubuntu',
'packages_store')
repository.createRawProxy('jenkins','http://pkg.jenkins.io/debian-stable',
'packages_store')
repository.createRawProxy('mongo','http://repo.mongodb.org/apt/ubuntu',
'packages_store')
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-765 updated: added Docker proxy repo
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-765
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-765 by this push:
new 6dc84b3 added Docker proxy repo
6dc84b3 is described below
commit 6dc84b368a8dd32d0260e1eb0788bfa674390fcf
Author: Oleh Martushevskyi
AuthorDate: Thu Jul 4 15:03:44 2019 +0300
added Docker proxy repo
---
.../scripts/deploy_repository/templates/configureNexus.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index 826a879..6d1653e 100644
---
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -51,7 +51,7 @@ repository.createPyPiProxy('pypi','https://pypi.org/',
'packages_store', true)
repository.createMavenProxy('maven-central','https://repo1.maven.org/maven2/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createMavenProxy('maven-bintray','https://dl.bintray.com/michaelklishin/maven/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createDockerHosted('docker-internal', null, 8083, 'docker_store',
true, true)
-repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', '', '', 'docker_store', true, false)
+repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', 0, 0, 'docker_store', true, false)
repository.createRawProxy('docker','https://download.docker.com/linux/ubuntu',
'packages_store')
repository.createRawProxy('jenkins','http://pkg.jenkins.io/debian-stable',
'packages_store')
repository.createRawProxy('mongo','http://repo.mongodb.org/apt/ubuntu',
'packages_store')
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-765 created (now 5adb199)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-765 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 5adb199 added Docker proxy repo This branch includes the following new commits: new 5adb199 added Docker proxy repo The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: added Docker proxy repo
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-765
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5adb199e6b6d0c5defee60b9221267573f96cec2
Author: Oleh Martushevskyi
AuthorDate: Thu Jul 4 12:48:35 2019 +0300
added Docker proxy repo
---
.../scripts/deploy_repository/templates/configureNexus.groovy| 1 +
1 file changed, 1 insertion(+)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index f626a87..826a879 100644
---
a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++
b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -51,6 +51,7 @@ repository.createPyPiProxy('pypi','https://pypi.org/',
'packages_store', true)
repository.createMavenProxy('maven-central','https://repo1.maven.org/maven2/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createMavenProxy('maven-bintray','https://dl.bintray.com/michaelklishin/maven/',
'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
repository.createDockerHosted('docker-internal', null, 8083, 'docker_store',
true, true)
+repository.createDockerProxy('docker_hub','https://registry-1.docker.io',
'HUB', '', '', 'docker_store', true, false)
repository.createRawProxy('docker','https://download.docker.com/linux/ubuntu',
'packages_store')
repository.createRawProxy('jenkins','http://pkg.jenkins.io/debian-stable',
'packages_store')
repository.createRawProxy('mongo','http://repo.mongodb.org/apt/ubuntu',
'packages_store')
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-terraform-k8s deleted (was 17ce09b)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-terraform-k8s in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 17ce09b formatted code The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated: DLAB-840 fixed bug connected with computational creation
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new 63f36d4 DLAB-840 fixed bug connected with computational creation
63f36d4 is described below
commit 63f36d48a91e3824ca27d5ac577a3a079f8711e3
Author: bhliva
AuthorDate: Thu Jul 4 10:23:56 2019 +0300
DLAB-840 fixed bug connected with computational creation
---
.../main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java
index 6a329ea..dec60af 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/DockerCommands.java
@@ -35,6 +35,7 @@ public interface DockerCommands {
.pipe(UnixCommand.grep("base", "-v"))
.pipe(UnixCommand.grep("ssn", "-v"))
.pipe(UnixCommand.grep("edge", "-v"))
+.pipe(UnixCommand.grep("project", "-v"))
.toCMD();
String GET_RUNNING_CONTAINERS_FOR_USER = "docker ps --format
\"{{.Names}}\" -f name=%s";
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
