Skip to content

Commit

Permalink
K8S-496 globals for ingress value
Browse files Browse the repository at this point in the history
  • Loading branch information
dfateyev committed Mar 15, 2021
1 parent 3c189db commit 5bb967a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions manifest.jps
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ actions:
helm install monitoring-grafana --namespace kubernetes-monitoring --set 'grafana\.ini'.server.root_url=${env.url}grafana -f ${baseUrl}/addons/monitoring/jelastic-values.yaml grafana/.
wait-deployment.sh monitoring-grafana kubernetes-monitoring 1 720
grafana_secret=$(kubectl get secret --namespace kubernetes-monitoring monitoring-grafana -o jsonpath='{.data.admin-password}' | base64 --decode ; echo)
[ "${settings.ingress-controller}" == "HAProxy" ] && crypt_option="-1" || crypt_option="-apr1"
[ "${globals.ingress-dir}" == "haproxy" ] && crypt_option="-1" || crypt_option="-apr1"
kubectl create secret generic monitoring-prometheus --from-literal=auth="admin:$(openssl passwd ${crypt_option} ${grafana_secret})" --namespace=kubernetes-monitoring
kubectl create -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/prometheus-ingress.yaml
kubectl create -f ${baseUrl}/addons/monitoring/${globals.ingress-dir}/alert-ingress.yaml
Expand Down Expand Up @@ -416,7 +416,7 @@ actions:
kubectl create -f ${baseUrl}/addons/jaeger/role.yaml
kubectl create -f ${baseUrl}/addons/jaeger/role_binding.yaml
kubectl create -f ${baseUrl}/addons/jaeger/operator.yaml
[ "${settings.ingress-controller}" == "HAProxy" ] && crypt_option="-1" || crypt_option="-apr1"
[ "${globals.ingress-dir}" == "haproxy" ] && crypt_option="-1" || crypt_option="-apr1"
jaeger_secret=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
kubectl create secret generic observability-jaeger-plain --from-literal=auth="${jaeger_secret}" --namespace=observability
kubectl create secret generic observability-jaeger --from-literal=auth="admin:$(openssl passwd ${crypt_option} ${jaeger_secret})" --namespace=observability
Expand Down

0 comments on commit 5bb967a

Please sign in to comment.