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 a2b4685 fixed issues;
a2b4685 is described below
commit a2b4685419da81c66982cddae9b6a3ead5031650
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Aug 6 19:05:31 2019 +0300
fixed issues;
---
.../main/dlab-ui-chart/templates/NOTES.txt | 14 +++----
.../dlab-ui-chart/templates/configmap-ui-conf.yaml | 16 ++++----
.../main/dlab-ui-chart/templates/deployment.yaml | 23 ++---------
.../main/dlab-ui-chart/templates/ingress.yaml | 12 +++---
.../main/dlab-ui-chart/templates/service.yaml | 10 ++---
.../ssn-helm-charts/main/dlab-ui-chart/values.yaml | 47 ++++++++++------------
.../main/files/configure_keycloak.sh | 3 +-
7 files changed, 54 insertions(+), 71 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
index 3d3445a..9481026 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
+++
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/NOTES.txt
@@ -20,22 +20,22 @@
#
******************************************************************************
1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
+{{- if .Values.ui.ingress.enabled }}
+{{- range $host := .Values.ui.ingress.hosts }}
{{- range .paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+ http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
{{- end }}
{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- else if contains "NodePort" .Values.ui.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 }}
+{{- else if contains "LoadBalancer" .Values.ui.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 }}
+ echo http://$SERVICE_IP:{{ .Values.ui.service.http_port }}
+{{- else if contains "ClusterIP" .Values.ui.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
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
index e11c632..759fff1 100644
---
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
@@ -43,16 +43,16 @@ data:
devMode: ${DEV_MODE}
mongo:
- host: {{ .Values.dlab_ui.mongo.host }}
- port: {{ .Values.dlab_ui.mongo.port }}
- username: {{ .Values.dlab_ui.mongo.username }}
+ host: {{ .Values.ui.mongo.host }}
+ port: {{ .Values.ui.mongo.port }}
+ username: {{ .Values.ui.mongo.username }}
password: ${MONGO_DB_PASSWORD}
- database: {{ .Values.dlab_ui.mongo.db_name }}
+ database: {{ .Values.ui.mongo.db_name }}
selfService:
protocol: https
host: localhost
- port: {{ .Values.service.https_port }}
+ port: {{ .Values.ui.service.https_port }}
jerseyClient:
timeout: 3s
connectionTimeout: 3s
@@ -67,7 +67,7 @@ data:
provisioningService:
protocol: https
- host: {{ .Values.dlab_ui.provisionService.host }}
+ host: {{ .Values.ui.provisionService.host }}
port: 8084
jerseyClient:
timeout: 3s
@@ -135,9 +135,9 @@ data:
rootPath: "/api"
applicationConnectors:
- type: http
- port: {{ .Values.service.http_port }}
+ port: {{ .Values.ui.service.http_port }}
- type: https
- port: {{ .Values.service.https_port }}
+ port: {{ .Values.ui.service.https_port }}
certAlias: dlab
validateCerts: true
keyStorePath: ${KEY_STORE_PATH}
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 8bc7267..bd06092 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
@@ -39,14 +39,10 @@ spec:
app.kubernetes.io/name: {{ include "dlab-ui.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
containers:
- name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}"
+ imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
env:
- name: MONGO_DB_PASSWORD
valueFrom:
@@ -64,24 +60,13 @@ spec:
name: keycloak-client-secret
key: client_secret
- name: SSN_BUCKET_NAME
- value: {{ .Values.bucketName }}
+ value: {{ .Values.ui.bucketName }}
- name: KEYCLOAK_AUTH_URL
- value: {{ .Values.dlab_ui.keycloak.auth_server_url }}
+ value: {{ .Values.ui.keycloak.auth_server_url }}
ports:
-# - name: https
-# containerPort: 443
-# protocol: TCP
- name: http
containerPort: 80
protocol: TCP
-# livenessProbe:
-# httpGet:
-# path: /
-# port: http
-# readinessProbe:
-# httpGet:
-# path: /
-# port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
index 9fbd6f7..22d70a0 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
+++
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/ingress.yaml
@@ -21,10 +21,10 @@
#
******************************************************************************
*/ -}}
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.ui.ingress.enabled -}}
{{- $fullName := include "dlab-ui.fullname" . -}}
-{{ $servicePort := .Values.service.http_port }}
-{{ $host := .Values.ingress.host }}
+{{ $servicePort := .Values.keycloak_gatekeeper.service.http_port }}
+{{ $host := .Values.ui.ingress.host }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -32,13 +32,13 @@ metadata:
labels:
{{ include "dlab-ui.labels" . | indent 4 }}
annotations:
-{{- with .Values.ingress.annotations }}
+{{- with .Values.ui.ingress.annotations }}
{{ toYaml . | indent 4 }}
{{- end }}
spec:
-{{- if .Values.ingress.tls }}
+{{- if .Values.ui.ingress.tls }}
tls:
- {{- range .Values.ingress.tls }}
+ {{- range .Values.ui.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
index 8a2dc27..87fb9a8 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
+++
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/service.yaml
@@ -28,14 +28,14 @@ metadata:
labels:
{{ include "dlab-ui.labels" . | indent 4 }}
spec:
- type: {{ .Values.service.type }}
+ type: {{ .Values.ui.service.type }}
ports:
- - port: {{ .Values.service.http_port }}
- targetPort: {{ .Values.service.http_port }}
+ - port: {{ .Values.ui.service.http_port }}
+ targetPort: {{ .Values.ui.service.http_port }}
protocol: TCP
name: http
- - port: {{ .Values.service.https_port }}
- targetPort: {{ .Values.service.https_port }}
+ - port: {{ .Values.ui.service.https_port }}
+ targetPort: {{ .Values.ui.service.https_port }}
nodePort: 30433
protocol: TCP
name: https
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
index c3b9eed..26075e5 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
+++
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
@@ -24,33 +24,30 @@
# Declare variables to be passed into your templates.
replicaCount: 1
-bucketName: ${ssn_bucket_name}
-
-image:
- repository: epamdlab/ui
- tag: '0.1'
- pullPolicy: Always
-
-service:
- type: NodePort
-# port: 58443
- http_port: 58080
- https_port: 58443
-
-ingress:
- enabled: true
- host: ${ssn_k8s_alb_dns_name}
- annotations:
- kubernetes.io/ingress.class: nginx
- nginx.ingress.kubernetes.io/ssl-redirect: "false"
-
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
labels: {}
-dlab_ui:
+ui:
+ bucketName: ${ssn_bucket_name}
+ image:
+ repository: epamdlab/ui
+ tag: '0.1'
+ pullPolicy: Always
+ service:
+ type: NodePort
+ # port: 58443
+ http_port: 58080
+ https_port: 58443
+ ingress:
+ enabled: true
+ host: ${ssn_k8s_alb_dns_name}
+ annotations:
+ kubernetes.io/ingress.class: nginx
+ nginx.ingress.kubernetes.io/ssl-redirect: "false"
+
+ tls: []
+ # - secretName: chart-example-tls
+ # hosts:
+ # - chart-example.local
mongo:
host: ${mongo_service_name}
port: ${mongo_port}
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
index c8644f8..e37fc0d 100644
---
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
+++
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
@@ -31,7 +31,8 @@
}
configure_keycloak () {
# Create Realm
- /opt/jboss/keycloak/bin/kcadm.sh create realms -s realm=dlab -s
enabled=true -s loginTheme=dlab
+ /opt/jboss/keycloak/bin/kcadm.sh create realms -s realm=dlab -s
enabled=true -s loginTheme=dlab \
+ -s sslRequired=none
# Get realm ID
dlab_realm_id=$(/opt/jboss/keycloak/bin/kcadm.sh get realms/dlab |
/usr/bin/jq -r '.id')
# Create user federation
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]