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 2019/07/25 14:39:19 UTC
[incubator-dlab] branch DLAB-terraform updated: [DLAB-941]: Added
one more conf file
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
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new d4ed97c [DLAB-941]: Added one more conf file
d4ed97c is described below
commit d4ed97cb421fa5adc1938341c13f777b0771d07a
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Jul 25 17:39:10 2019 +0300
[DLAB-941]: Added one more conf file
---
...illing-yml.yaml => configmap-billing-conf.yaml} | 2 +-
.../dlab-billing-chart/templates/deployment.yaml | 2 +-
.../dlab-ui-chart/templates/configmap-ssn-yml.yaml | 77 --------
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 219 +++++++++++++++++++++
.../main/dlab-ui-chart/templates/deployment.yaml | 13 +-
5 files changed, 231 insertions(+), 82 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-yml.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml
similarity index 98%
rename from infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-yml.yaml
rename to infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml
index 10d2144..bbf423b 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-yml.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/configmap-billing-conf.yaml
@@ -24,7 +24,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "dlab-billing.fullname" . }}-billing-yml
+ name: {{ include "dlab-billing.fullname" . }}-billing-conf
data:
billing.yml: |
# Specify the parameters enclosed in angle brackets.
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml
index a955911..fcd2785 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-billing-chart/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
volumes:
- name: billing-yml
configMap:
- name: {{ include "dlab-billing.fullname" . }}-billing-yml
+ name: {{ include "dlab-billing.fullname" . }}-billing-conf
defaultMode: 0644
items:
- key: billing.yml
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ssn-yml.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ssn-yml.yaml
deleted file mode 100644
index e726afe..0000000
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ssn-yml.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{- /*
-# *****************************************************************************
-#
-# 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
-kind: ConfigMap
-metadata:
- name: {{ include "dlab-ui.fullname" . }}-ssn-yml
-data:
- ssn.yml: |
- <#assign LOG_ROOT_DIR="/var/opt/dlab/log">
- <#assign KEYS_DIR="/root/keys">
- <#assign KEY_STORE_PATH="/root/keys/dlab.keystore.jks">
- <#assign KEY_STORE_PASSWORD="jhMDPlwgGb">
- <#assign TRUST_STORE_PATH="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/cacerts">
- <#assign TRUST_STORE_PASSWORD="changeit">
-
- # Available options are aws, azure, gcp
- <#assign CLOUD_TYPE="aws">
- cloudProvider: ${CLOUD_TYPE}
-
- #Switch on/off developer mode here
- <#assign DEV_MODE="false">
- devMode: ${DEV_MODE}
-
- mongo:
- host: {{ .Values.dlab_ui.mongo.host }}
- port: {{ .Values.dlab_ui.mongo.port }}
- username: {{ .Values.dlab_ui.mongo.username }}
- password: {{ .Values.dlab_ui.mongo.password }}
- database: {{ .Values.dlab_ui.mongo.db_name }}
-
- selfService:
- protocol: https
- host: 172.17.0.1
- port: 8443
- jerseyClient:
- timeout: 3s
- connectionTimeout: 3s
-
- securityService:
- protocol: https
- host: 172.17.0.1
- port: 8090
- jerseyClient:
- timeout: 20s
- connectionTimeout: 20s
-
- provisioningService:
- protocol: https
- host: 172.17.0.1
- port: 8084
- jerseyClient:
- timeout: 3s
- connectionTimeout: 3s
-
- # Log out user on inactivity
- inactiveUserTimeoutMillSec: 7200000
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
new file mode 100644
index 0000000..96be2af
--- /dev/null
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml
@@ -0,0 +1,219 @@
+{{- /*
+# *****************************************************************************
+#
+# 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
+kind: ConfigMap
+metadata:
+ name: {{ include "dlab-ui.fullname" . }}-ui-conf
+data:
+ ssn.yml: |
+ <#assign LOG_ROOT_DIR="/var/opt/dlab/log">
+ <#assign KEYS_DIR="/root/keys">
+ <#assign KEY_STORE_PATH="/root/keys/dlab.keystore.jks">
+ <#assign KEY_STORE_PASSWORD="jhMDPlwgGb">
+ <#assign TRUST_STORE_PATH="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/cacerts">
+ <#assign TRUST_STORE_PASSWORD="changeit">
+
+ # Available options are aws, azure, gcp
+ <#assign CLOUD_TYPE="aws">
+ cloudProvider: ${CLOUD_TYPE}
+
+ #Switch on/off developer mode here
+ <#assign DEV_MODE="false">
+ devMode: ${DEV_MODE}
+
+ mongo:
+ host: {{ .Values.dlab_ui.mongo.host }}
+ port: {{ .Values.dlab_ui.mongo.port }}
+ username: {{ .Values.dlab_ui.mongo.username }}
+ password: {{ .Values.dlab_ui.mongo.password }}
+ database: {{ .Values.dlab_ui.mongo.db_name }}
+
+ selfService:
+ protocol: https
+ host: 172.17.0.1
+ port: 8443
+ jerseyClient:
+ timeout: 3s
+ connectionTimeout: 3s
+
+ securityService:
+ protocol: https
+ host: 172.17.0.1
+ port: 8090
+ jerseyClient:
+ timeout: 20s
+ connectionTimeout: 20s
+
+ provisioningService:
+ protocol: https
+ host: 172.17.0.1
+ port: 8084
+ jerseyClient:
+ timeout: 3s
+ connectionTimeout: 3s
+
+ # Log out user on inactivity
+ inactiveUserTimeoutMillSec: 7200000
+
+ self-service.yml: |
+ <#include "/root/ssn.yml">
+
+ <#if CLOUD_TYPE == "aws">
+ # Minimum and maximum number of slave EMR instances than could be created
+ minEmrInstanceCount: 2
+ maxEmrInstanceCount: 14
+ # Minimum and maximum percentage cost for slave EMR spot instances biding
+ minEmrSpotInstanceBidPct: 20
+ maxEmrSpotInstanceBidPct: 90
+ </#if>
+
+ <#if CLOUD_TYPE == "gcp">
+ # Maximum length for gcp user name (due to gcp restrictions)
+ maxUserNameLength: 10
+ # Minimum and maximum number of slave Dataproc instances that could be created
+ minInstanceCount: 3
+ maxInstanceCount: 15
+ minDataprocPreemptibleCount: 0
+ gcpOuauth2AuthenticationEnabled: false
+ </#if>
+
+ # Boundaries for Spark cluster creation
+ minSparkInstanceCount: 2
+ maxSparkInstanceCount: 14
+
+ # Timeout for check the status of environment via provisioning service
+ checkEnvStatusTimeout: 5m
+
+ # Restrict access to DLab features using roles policy
+ rolePolicyEnabled: true
+ # Default access to DLab features using roles policy
+ roleDefaultAccess: true
+
+ # Set to true to enable the scheduler of billing report.
+ billingSchedulerEnabled: true
+ # Name of configuration file for billing report.
+ <#if DEV_MODE == "true">
+ billingConfFile: ${sys['user.dir']}/../billing/billing.yml
+ <#else>
+ billingConfFile: ${DLAB_CONF_DIR}/billing.yml
+ </#if>
+
+ <#if CLOUD_TYPE == "azure">
+ azureUseLdap: <LOGIN_USE_LDAP>
+ maxSessionDurabilityMilliseconds: 288000000
+ </#if>
+
+ server:
+ requestLog:
+ appenders:
+ - type: file
+ currentLogFilename: ${LOG_ROOT_DIR}/ssn/request-selfservice.log
+ archive: true
+ archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/request-selfservice-%d{yyyy-MM-dd}.log.gz
+ archivedFileCount: 10
+ rootPath: "/api"
+ applicationConnectors:
+ - type: http
+ port: 58080
+ - type: https
+ port: 58443
+ certAlias: dlab
+ validateCerts: true
+ keyStorePath: ${KEY_STORE_PATH}
+ keyStorePassword: ${KEY_STORE_PASSWORD}
+ trustStorePath: ${TRUST_STORE_PATH}
+ trustStorePassword: ${TRUST_STORE_PASSWORD}
+ adminConnectors:
+ # - type: http
+ # port: 8081
+ - type: https
+ port: 8444
+ certAlias: dlab
+ validateCerts: true
+ keyStorePath: ${KEY_STORE_PATH}
+ keyStorePassword: ${KEY_STORE_PASSWORD}
+ trustStorePath: ${TRUST_STORE_PATH}
+ trustStorePassword: ${TRUST_STORE_PASSWORD}
+
+ mongoMigrationEnabled: false
+
+ logging:
+ level: INFO
+ loggers:
+ com.epam: TRACE
+ com.novemberain: ERROR
+ appenders:
+ <#if DEV_MODE == "true">
+ - type: console
+ </#if>
+ - type: file
+ currentLogFilename: ${LOG_ROOT_DIR}/ssn/selfservice.log
+ archive: true
+ archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/selfservice-%d{yyyy-MM-dd}.log.gz
+ archivedFileCount: 10
+
+ swaggerConfiguration:
+ resourcePackage: com.epam.dlab.backendapi.resources
+ title: DLab API
+ description: Essential toolset for analytics. Deployed on ${CLOUD_TYPE} provider
+ schemes: [https, http]
+ version: 2.0
+ contact: DLab
+ contactUrl: http://dlab.opensource.epam.com/
+ license: Apache 2.0
+ licenseUrl: https://www.apache.org/licenses/LICENSE-2.0
+
+ mavenSearchService:
+ protocol: http
+ host: search.maven.org
+ port: 80
+ jerseyClient:
+ timeout: 5s
+ connectionTimeout: 5s
+
+ schedulers:
+ inactivity:
+ enabled: false
+ cron: "0 0 0/2 ? * * *"
+ startComputationalScheduler:
+ enabled: true
+ cron: "*/20 * * ? * * *"
+ stopComputationalScheduler:
+ enabled: true
+ cron: "*/20 * * ? * * *"
+ startExploratoryScheduler:
+ enabled: true
+ cron: "*/20 * * ? * * *"
+ stopExploratoryScheduler:
+ enabled: true
+ cron: "*/20 * * ? * * *"
+ terminateComputationalScheduler:
+ enabled: true
+ cron: "*/20 * * ? * * *"
+ checkQuoteScheduler:
+ enabled: true
+ cron: "0 0 * ? * * *"
+ checkUserQuoteScheduler:
+ enabled: true
+ cron: "0 0 * ? * * *"
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
index 1b87243..06df0ef 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/deployment.yaml
@@ -65,18 +65,25 @@ spec:
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- - name: ssn-yml
+ - name: ui-conf
mountPath: /root/ssn.yml
subPath: ssn
readOnly: true
+ - name: ui-conf
+ mountPath: /root/self-service.yml
+ subPath: self-service
+ readOnly: true
volumes:
- - name: ssn-yml
+ - name: ui-conf
configMap:
- name: {{ include "dlab-ui.fullname" . }}-ssn-yml
+ name: {{ include "dlab-ui.fullname" . }}-ui-conf
defaultMode: 0644
items:
- key: ssn.yml
path: ssn
+ - key: self-service.yml
+ path: self-service
+
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org