You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2020/01/20 11:47:27 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1158
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 26a8ced6589a0889af9c9ce4e7d9d22b0ec0168a
Merge: 1e5388d c587d80
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Jan 20 13:46:56 2020 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158
Conflicts:
infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
infrastructure-provisioning/src/general/conf/dlab.ini
infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
LICENSE | 26 +---
README.md | 30 +++-
RELEASE_NOTES.md | 94 ++++-------
build.properties | 2 +-
.../scripts/deploy_repository/deploy_repository.py | 16 +-
.../src/general/conf/dlab.ini | 16 +-
.../files/aws/dataengine-service_description.json | 4 +-
.../src/general/files/aws/jupyter_description.json | 4 +-
.../src/general/files/aws/rstudio_description.json | 4 +-
.../general/files/aws/zeppelin_description.json | 4 +-
.../general/files/azure/jupyter_description.json | 4 +-
.../general/files/azure/rstudio_description.json | 4 +-
.../general/files/azure/zeppelin_description.json | 4 +-
.../files/gcp/dataengine-service_description.json | 4 +-
.../src/general/files/gcp/jupyter_description.json | 4 +-
.../src/general/files/gcp/rstudio_description.json | 4 +-
.../general/files/gcp/zeppelin_description.json | 4 +-
.../src/general/lib/azure/actions_lib.py | 12 +-
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../src/general/lib/gcp/meta_lib.py | 11 ++
.../src/general/lib/os/debian/edge_lib.py | 1 -
.../src/general/lib/os/debian/notebook_lib.py | 2 +-
.../src/general/lib/os/debian/ssn_lib.py | 2 +-
.../src/general/lib/os/fab.py | 79 +++-------
.../src/general/lib/os/redhat/notebook_lib.py | 2 +-
.../scripts/aws/dataengine-service_jars_parser.py | 27 +++-
.../jupyter_dataengine-service_create_configs.py | 21 +--
.../jupyter_install_dataengine-service_kernels.py | 7 +-
.../general/scripts/aws/jupyterlab_configure.py | 20 +++
.../src/general/scripts/aws/project_prepare.py | 32 ++--
.../src/general/scripts/azure/edge_configure.py | 2 +-
.../src/general/scripts/azure/project_prepare.py | 2 +-
.../scripts/gcp/dataengine-service_jars_parser.py | 20 ++-
.../scripts/gcp/dataengine-service_prepare.py | 9 +-
.../jupyter_dataengine-service_create_configs.py | 4 +-
.../jupyter_install_dataengine-service_kernels.py | 8 +-
.../general/scripts/gcp/jupyterlab_configure.py | 21 +++
.../src/general/scripts/gcp/superset_configure.py | 65 +++++++-
...iner_start.py => configure_proxy_for_docker.py} | 42 +++--
.../os/jupyter_dataengine_create_configs.py | 2 +-
.../scripts/os/jupyterlab_container_start.py | 4 +-
...terlab_container_start.py => superset_start.py} | 27 ++--
.../general/templates/aws/interpreter_livy.json | 2 +-
.../general/templates/aws/interpreter_spark.json | 2 +-
.../general/templates/azure/interpreter_livy.json | 2 +-
.../general/templates/azure/interpreter_spark.json | 2 +-
.../general/templates/gcp/interpreter_livy.json | 2 +-
.../general/templates/gcp/interpreter_spark.json | 2 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 3 +-
.../src/jupyterlab/Dockerfile_jupyterlab | 8 +-
.../scripts/configure_jupyterlab_node.py | 2 +-
.../src/project/templates/conf.d/proxy.conf | 2 -
.../src/ssn/scripts/configure_docker.py | 9 +-
.../superset/scripts/configure_superset_node.py | 2 +-
.../src/superset/templates/id_provider.json | 10 +-
.../src/superset/templates/superset_config.py | 2 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 1 +
.../com/epam/dlab/dto/aws/AwsCloudSettings.java | 2 -
.../aws/computational/ComputationalCreateAws.java | 15 ++
.../computational/SparkComputationalCreateAws.java | 7 +
.../epam/dlab/dto/azure/AzureCloudSettings.java | 2 -
.../SparkComputationalCreateAzure.java | 7 +
.../dlab/dto/exploratory/ExploratoryCreateDTO.java | 15 ++
.../com/epam/dlab/dto/gcp/GcpCloudSettings.java | 2 -
.../gcp/computational/ComputationalCreateGcp.java | 15 ++
.../computational/SparkComputationalCreateGcp.java | 7 +
.../epam/dlab/dto/project/ProjectCreateDTO.java | 2 -
services/provisioning-service/provisioning.yml | 1 -
.../epam/dlab/backendapi/CloudConfiguration.java | 1 -
.../backendapi/ProvisioningServiceApplication.java | 3 +
.../backendapi/core/commands/CommandBuilder.java | 3 -
.../healthcheck/ProvisioningHealthCheck.java} | 27 ++--
.../ProvisioningHealthCheckResource.java} | 42 +++--
services/self-service/self-service.yml | 3 +
.../com/epam/dlab/backendapi/dao/EndpointDAO.java | 24 +++
.../epam/dlab/backendapi/dao/EndpointDAOImpl.java | 39 ++++-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 30 +++-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +
.../dlab/backendapi/domain/CreateProjectDTO.java | 3 +
.../epam/dlab/backendapi/domain/EndpointDTO.java | 31 +++-
.../backendapi/domain/EndpointResourcesDTO.java} | 34 ++--
.../epam/dlab/backendapi/domain/ProjectDTO.java | 6 +-
.../dlab/backendapi/domain/UpdateProjectDTO.java | 4 +-
.../backendapi/resources/EndpointResource.java | 57 ++++++-
.../dlab/backendapi/resources/ProjectResource.java | 21 ++-
.../resources/dto/ProjectActionFormDTO.java | 7 +-
.../endpoint/CheckEndpointStatusScheduler.java | 60 +++++++
.../dlab/backendapi/service/EndpointService.java | 18 ++-
.../dlab/backendapi/service/ProjectService.java | 10 ++
.../service/impl/ComputationalServiceImpl.java | 23 +--
.../service/impl/EndpointServiceImpl.java | 93 ++++++++++-
.../service/impl/ExploratoryServiceImpl.java | 7 +-
.../impl/InfrastructureTemplateServiceBase.java | 6 +-
.../service/impl/ProjectServiceImpl.java | 60 +++++--
.../epam/dlab/backendapi/util/RequestBuilder.java | 24 +--
.../src/main/resources/webapp/angular.json | 8 +-
.../src/main/resources/webapp/package-lock.json | 75 ++++-----
.../src/main/resources/webapp/package.json | 5 +-
.../management/endpoints/endpoints.component.html | 42 +++--
.../management/endpoints/endpoints.component.scss | 108 +++++++------
.../management/endpoints/endpoints.component.ts | 161 +++++++++++++++++--
.../src/app/administration/management/index.ts | 9 +-
.../manage-environment-dilog.component.html | 24 ++-
.../manage-environment-dilog.component.scss | 7 +-
.../manage-environment-dilog.component.ts | 26 +++-
.../management-grid/management-grid.component.html | 2 +-
.../management-grid/management-grid.component.scss | 10 +-
.../management-grid/management-grid.component.ts | 12 +-
.../management/management.component.scss | 2 +-
.../webapp/src/app/administration/project/index.ts | 6 +-
.../project-form/project-form.component.html | 17 +-
.../project/project-form/project-form.component.ts | 10 +-
.../project-list/project-list.component.html | 75 +++++----
.../project-list/project-list.component.scss | 60 ++++++-
.../project/project-list/project-list.component.ts | 81 ++++++++--
.../administration/project/project.component.ts | 29 ++--
.../app/administration/roles/roles.component.html | 6 +-
.../app/administration/roles/roles.component.ts | 15 +-
.../main/resources/webapp/src/app/app.module.ts | 2 +
.../resources/webapp/src/app/app.routing.module.ts | 5 +
.../src/app/core/directives/scrollTo.directive.ts | 2 +-
.../services/applicationServiceFacade.service.ts | 14 ++
.../src/app/core/services/endpoint.service.ts | 16 ++
.../src/app/core/services/progress-bar.service.ts | 19 +++
.../webapp/src/app/core/util/checkUtils.ts | 8 +
.../resources/webapp/src/app/core/util/patterns.ts | 5 +-
.../src/app/reporting/reporting.component.ts | 9 +-
.../app/reporting/toolbar/toolbar.component.html | 5 +-
...oolbar.component.css => toolbar.component.scss} | 115 ++++++++------
.../src/app/reporting/toolbar/toolbar.component.ts | 22 +--
.../cluster-details/cluster-details.component.html | 2 +-
...utational-resource-create-dialog.component.html | 19 +--
...mputational-resource-create-dialog.component.ts | 2 +-
.../create-environment.component.html | 15 +-
.../create-environment.component.scss | 2 +-
.../detail-dialog/detail-dialog.component.html | 2 +-
.../install-libraries/filter-libs.model.ts} | 35 ++---
.../install-libraries.component.html | 115 ++++++++++++--
.../install-libraries.component.scss | 112 ++++++++++---
.../install-libraries.component.ts | 53 ++++++-
.../resources-grid/resources-grid.component.html | 11 +-
.../resources-grid/resources-grid.component.scss | 4 +-
.../resources-grid/resources-grid.component.ts | 14 +-
.../src/app/shared/bubble/bubble.component.css | 2 +-
.../shared/form-controls/dropdowns.component.scss | 4 +-
.../multi-select-dropdown.component.html | 2 +-
.../webapp/src/app/shared/material.module.ts | 6 +-
.../edge-action-dialog.component.ts | 73 +++++++++
.../index.ts | 16 +-
.../modal-dialog/notification-dialog/index.ts | 3 +-
.../notification-dialog.component.ts | 173 +++++++++++++--------
.../webapp/src/app/shared/navbar/index.ts | 4 +-
.../src/app/shared/navbar/navbar.component.html | 68 +++++---
.../src/app/shared/navbar/navbar.component.scss | 32 +++-
.../src/app/shared/navbar/navbar.component.ts | 16 +-
.../management.component.scss => swagger/index.ts} | 33 ++--
.../webapp/src/app/swagger/swagger.component.html | 20 +++
.../swagger.component.scss} | 19 ---
.../webapp/src/app/swagger/swagger.component.ts | 63 ++++++++
.../webapp/src/assets/styles/_dialogs.scss | 16 +-
.../webapp/src/assets/styles/_general.scss | 5 +-
.../resources/webapp/src/assets/styles/_reset.scss | 2 +-
.../resources/webapp/src/assets/styles/_theme.scss | 33 ++++
.../webapp/src/assets/styles/app-loading.scss | 5 +
.../webapp/src/assets/svg/swagger-logo.svg | 8 +
.../src/main/resources/webapp/src/styles.scss | 4 +
.../service/impl/ComputationalServiceImplTest.java | 58 +++++--
.../service/impl/EnvironmentServiceImplTest.java | 2 +-
.../service/impl/ExploratoryServiceImplTest.java | 37 +++--
.../service/impl/GitCredentialServiceImplTest.java | 2 +-
.../impl/ImageExploratoryServiceImplTest.java | 2 +-
.../InfrastructureTemplateServiceBaseTest.java | 15 +-
.../service/impl/LibraryServiceImplTest.java | 2 +-
.../service/impl/UserGroupServiceImplTest.java | 8 +-
175 files changed, 2523 insertions(+), 1031 deletions(-)
diff --cc infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index fcb31a5,0d169de..2c283f5
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@@ -1173,21 -1173,21 +1173,21 @@@ def download_packages()
configuration['notebook_spark_version'], configuration['notebook_hadoop_version']),
'https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-aws/{0}/hadoop-aws-{0}.jar'.format('2.7.4'),
'https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk/{0}/aws-java-sdk-{0}.jar'.format('1.7.4'),
- #'https://maven.twttr.com/com/hadoop/gplcompression/hadoop-lzo/{0}/hadoop-lzo-{0}.jar'.format('0.4.20'),
+ # 'https://maven.twttr.com/com/hadoop/gplcompression/hadoop-lzo/{0}/hadoop-lzo-{0}.jar'.format('0.4.20'),
- 'http://central.maven.org/maven2/org/scalanlp/breeze_{0}/{1}/breeze_{0}-{1}.jar'.format('2.11', '0.12'),
- 'http://central.maven.org/maven2/org/scalanlp/breeze-natives_{0}/{1}/breeze-natives_{0}-{1}.jar'.format(
+ 'https://repo1.maven.org/maven2/org/scalanlp/breeze_{0}/{1}/breeze_{0}-{1}.jar'.format('2.11', '0.12'),
+ 'https://repo1.maven.org/maven2/org/scalanlp/breeze-natives_{0}/{1}/breeze-natives_{0}-{1}.jar'.format(
'2.11', '0.12'),
- 'http://central.maven.org/maven2/org/scalanlp/breeze-viz_{0}/{1}/breeze-viz_{0}-{1}.jar'.format(
+ 'https://repo1.maven.org/maven2/org/scalanlp/breeze-viz_{0}/{1}/breeze-viz_{0}-{1}.jar'.format(
'2.11', '0.12'),
- 'http://central.maven.org/maven2/org/scalanlp/breeze-macros_{0}/{1}/breeze-macros_{0}-{1}.jar'.format(
+ 'https://repo1.maven.org/maven2/org/scalanlp/breeze-macros_{0}/{1}/breeze-macros_{0}-{1}.jar'.format(
'2.11', '0.12'),
- 'http://central.maven.org/maven2/org/scalanlp/breeze-parent_{0}/{1}/breeze-parent_{0}-{1}.jar'.format(
+ 'https://repo1.maven.org/maven2/org/scalanlp/breeze-parent_{0}/{1}/breeze-parent_{0}-{1}.jar'.format(
'2.11', '0.12'),
- 'http://central.maven.org/maven2/org/jfree/jfreechart/{0}/jfreechart-{0}.jar'.format('1.0.19'),
- 'http://central.maven.org/maven2/org/jfree/jcommon/{0}/jcommon-{0}.jar'.format('1.0.24'),
+ 'https://repo1.maven.org/maven2/org/jfree/jfreechart/{0}/jfreechart-{0}.jar'.format('1.0.19'),
+ 'https://repo1.maven.org/maven2/org/jfree/jcommon/{0}/jcommon-{0}.jar'.format('1.0.24'),
'--no-check-certificate https://brunelvis.org/jar/spark-kernel-brunel-all-{0}.jar'.format('2.3'),
'http://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree-pip/toree-0.2.0.tar.gz',
- 'https://download2.rstudio.org/rstudio-server-{}-amd64.deb'.format(
+ 'https://download2.rstudio.org/server/trusty/amd64/rstudio-server-{}-amd64.deb'.format(
configuration['notebook_rstudio_version']),
'http://us.download.nvidia.com/XFree86/Linux-x86_64/{0}/NVIDIA-Linux-x86_64-{0}.run'.format(
configuration['notebook_nvidia_version']),
diff --cc infrastructure-provisioning/src/general/conf/dlab.ini
index 782f2a4,1d0a172..e2055e0
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@@ -44,10 -44,10 +44,10 @@@ lifecycle_stage = de
pypi_mirror = pypi.doubanio.com
### Name of own GitLab SSL certificate
gitlab_certfile = dlab-gitlab.crt
-###Enable or Disable creating image at first time
+### Enable or Disable creating image at first time
- # image_enabled =
- ### Enable or Disable shared images
- # shared_image_enabled =
+ image_enabled = true
+ ###Enable or Disable shared images
+ shared_image_enabled = true
### CIDR of VPC
vpc_cidr = '172.31.0.0/16'
### CIDR of second VPC
diff --cc infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
index 104da8c,49557d2..c59fea1
--- a/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
+++ b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
@@@ -59,7 -42,5 +59,5 @@@ server
end
';
- include locations/*.conf;
+ include locations/*.conf;
-
-
}
diff --cc services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
index 2e617ec,cdc1212..1903f30
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
@@@ -70,26 -70,6 +70,24 @@@ public class AwsCloudSettings extends C
protected String confKeyDir;
@JsonProperty("conf_image_enabled")
private String imageEnabled;
- @JsonProperty("conf_shared_image_enabled")
- private String sharedImageEnabled;
+ @JsonProperty("conf_stepcerts_enabled")
+ private String stepCertsEnabled;
+ @JsonProperty("conf_stepcerts_root_ca")
+ private String stepCertsRootCA;
+ @JsonProperty("conf_stepcerts_kid")
+ private String stepCertsKid;
+ @JsonProperty("conf_stepcerts_kid_password")
+ private String stepCertsKidPassword;
+ @JsonProperty("conf_stepcerts_ca_url")
+ private String stepCertsCAURL;
+ @JsonProperty("keycloak_auth_server_url")
+ private String keycloakAuthServerUrl;
+ @JsonProperty("keycloak_realm_name")
+ private String keycloakRealmName;
+ @JsonProperty("keycloak_user")
+ private String keycloakUser;
+ @JsonProperty("keycloak_user_password")
+ private String keycloakUserPassword;
@Override
@JsonIgnore
diff --cc services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
index 6be0a9d,b8d4f5c..3c6a166
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
@@@ -48,26 -48,6 +48,24 @@@ public class AzureCloudSettings extend
protected String confKeyDir;
@JsonProperty("conf_image_enabled")
private String imageEnabled;
- @JsonProperty("conf_shared_image_enabled")
- private String sharedImageEnabled;
+ @JsonProperty("conf_stepcerts_enabled")
+ private String stepCertsEnabled;
+ @JsonProperty("conf_stepcerts_root_ca")
+ private String stepCertsRootCA;
+ @JsonProperty("conf_stepcerts_kid")
+ private String stepCertsKid;
+ @JsonProperty("conf_stepcerts_kid_password")
+ private String stepCertsKidPassword;
+ @JsonProperty("conf_stepcerts_ca_url")
+ private String stepCertsCAURL;
+ @JsonProperty("keycloak_auth_server_url")
+ private String keycloakAuthServerUrl;
+ @JsonProperty("keycloak_realm_name")
+ private String keycloakRealmName;
+ @JsonProperty("keycloak_user")
+ private String keycloakUser;
+ @JsonProperty("keycloak_user_password")
+ private String keycloakUserPassword;
@Override
@JsonIgnore
diff --cc services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
index e7881a7,ce6f1b7..c12c39a
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
@@@ -64,26 -64,6 +64,24 @@@ public class GcpCloudSettings extends C
protected String region;
@JsonProperty("conf_image_enabled")
private String imageEnabled;
- @JsonProperty("conf_shared_image_enabled")
- private String sharedImageEnabled;
+ @JsonProperty("conf_stepcerts_enabled")
+ private String stepCertsEnabled;
+ @JsonProperty("conf_stepcerts_root_ca")
+ private String stepCertsRootCA;
+ @JsonProperty("conf_stepcerts_kid")
+ private String stepCertsKid;
+ @JsonProperty("conf_stepcerts_kid_password")
+ private String stepCertsKidPassword;
+ @JsonProperty("conf_stepcerts_ca_url")
+ private String stepCertsCAURL;
+ @JsonProperty("keycloak_auth_server_url")
+ private String keycloakAuthServerUrl;
+ @JsonProperty("keycloak_realm_name")
+ private String keycloakRealmName;
+ @JsonProperty("keycloak_user")
+ private String keycloakUser;
+ @JsonProperty("keycloak_user_password")
+ private String keycloakUserPassword;
@Override
@JsonIgnore
diff --cc services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
index b6f8d40,58caf23..94ed162
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/CloudConfiguration.java
@@@ -46,11 -46,8 +46,10 @@@ public class CloudConfiguration
private final String peeringId;
private final String gcpProjectId;
private final boolean imageEnabled;
- private final boolean sharedImageEnabled;
@JsonProperty("ldap")
private final LdapConfig ldapConfig;
+ private final StepCerts stepCerts;
+ private final Keycloak keycloak;
@Data
public static class LdapConfig {
diff --cc services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
index dc4a4fa,123c96f..3d0bcf8
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
@@@ -94,16 -90,6 +94,15 @@@ public class CommandBuilder
.confKeyDir(cloudConfiguration.getConfKeyDir())
.azureIamUser(settings.getIamUser())
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
- .sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+ .stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
+ .stepCertsRootCA(stepCerts.getRootCA())
+ .stepCertsKid(stepCerts.getKid())
+ .stepCertsKidPassword(stepCerts.getKidPassword())
+ .stepCertsCAURL(stepCerts.getCaURL())
+ .keycloakAuthServerUrl(keycloak.getAuthServerUrl())
+ .keycloakRealmName(keycloak.getRealmName())
+ .keycloakUser(keycloak.getUser())
+ .keycloakUserPassword(keycloak.getUserPassword())
.build();
}
@@@ -128,16 -112,6 +127,15 @@@
.confKeyDir(cloudConfiguration.getConfKeyDir())
.gcpIamUser(settings.getIamUser())
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
- .sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+ .stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
+ .stepCertsRootCA(stepCerts.getRootCA())
+ .stepCertsKid(stepCerts.getKid())
+ .stepCertsKidPassword(stepCerts.getKidPassword())
+ .stepCertsCAURL(stepCerts.getCaURL())
+ .keycloakAuthServerUrl(keycloak.getAuthServerUrl())
+ .keycloakRealmName(keycloak.getRealmName())
+ .keycloakUser(keycloak.getUser())
+ .keycloakUserPassword(keycloak.getUserPassword())
.build();
}
@@@ -165,16 -137,6 +163,15 @@@
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
- .sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+ .stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
+ .stepCertsRootCA(stepCerts.getRootCA())
+ .stepCertsKid(stepCerts.getKid())
+ .stepCertsKidPassword(stepCerts.getKidPassword())
+ .stepCertsCAURL(stepCerts.getCaURL())
+ .keycloakAuthServerUrl(keycloak.getAuthServerUrl())
+ .keycloakRealmName(keycloak.getRealmName())
+ .keycloakUser(keycloak.getUser())
+ .keycloakUserPassword(keycloak.getUserPassword())
.build();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org