Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Setup-Manager
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Dmytro Bogatov
Setup-Manager
Commits
ae069301
Verified
Commit
ae069301
authored
Dec 05, 2018
by
Dmytro Bogatov
💕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dashboard.
parent
3685df90
Pipeline
#3223
passed with stage
in 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
8 deletions
+49
-8
infra/build-services.sh
infra/build-services.sh
+14
-7
infra/script.sh
infra/script.sh
+1
-1
infra/sources/dashboard/ingress.yaml
infra/sources/dashboard/ingress.yaml
+34
-0
No files found.
infra/build-services.sh
View file @
ae069301
...
...
@@ -168,19 +168,26 @@ else
echo "
Dashboard
auth configs...
"
rm -rf dashboard/
mkdir -p dashboard
/dashboard-auth
cp
sources/dashboard-auth/*.yaml dashboard/dashboard-auth/
mkdir -p dashboard
cp
./sources/dashboard/*.yaml ./dashboard
COOKIE_SECRET=
$(
dd
if
=
/dev/urandom
bs
=
16
count
=
1 2>/dev/null |
base64
)
# mkdir -p dashboard/dashboard-auth
# cp sources/dashboard-auth/*.yaml dashboard/dashboard-auth/
sed -i -e "
s
#__OAUTH2_PROXY_COOKIE_SECRET__#
$COOKIE_SECRET
#g
" dashboard/dashboard-auth/oauth2-proxy.yaml
sed -i -e "
s
#__OAUTH2_PROXY_CLIENT_SECRET__#
$OAUTH2_PROXY_CLIENT_SECRET
#g
" dashboard/dashboard-auth/oauth2-proxy.yaml
# COOKIE_SECRET=
$(
dd
if
=
/dev/urandom
bs
=
16
count
=
1 2>/dev/null |
base64
)
# sed -i -e "
s
#__OAUTH2_PROXY_COOKIE_SECRET__#
$COOKIE_SECRET
#g
" dashboard/dashboard-auth/oauth2-proxy.yaml
# sed -i -e "
s
#__OAUTH2_PROXY_CLIENT_SECRET__#
$OAUTH2_PROXY_CLIENT_SECRET
#g
" dashboard/dashboard-auth/oauth2-proxy.yaml
DASHBOARD_TOKEN=
$(
kubectl
-n
kube-system describe secret
$(
kubectl
-n
kube-system get secret |
grep
admin-user |
awk
'{print $1}'
)
|
grep
token:
)
DASHBOARD_TOKEN="
${
DASHBOARD_TOKEN
:7:
${#
DASHBOARD_TOKEN
}}
"
sed -i -e "
s
#__DASHBOARD_TOKEN__#
$DASHBOARD_TOKEN
#g
" dashboard/dashboard-auth/ingreses.yaml
sed -i -e "
s
#Bearer #Bearer #g
" dashboard/dashboard-auth/ingreses.yaml
# sed -i -e "
s
#__DASHBOARD_TOKEN__#
$DASHBOARD_TOKEN
#g
" dashboard/dashboard-auth/ingreses.yaml
# sed -i -e "
s
#Bearer #Bearer #g
" dashboard/dashboard-auth/ingreses.yaml
sed -i -e "
s
#__DASHBOARD_TOKEN__#
$DASHBOARD_TOKEN
#g
" dashboard/ingress.yaml
sed -i -e "
s
#Bearer #Bearer #g
" dashboard/ingress.yaml
else
echo "
~/.secrets/ does not exist. Probably running from CI. Skipping dashboard configs...
"
fi
...
...
infra/script.sh
View file @
ae069301
...
...
@@ -164,7 +164,7 @@ kubectl apply -R -f sources/nginx/
kubectl apply
-R
-f
services/
kubectl apply
-R
-f
dashboard/
kubectl apply
-R
-f
./
dashboard/
echo
"Deploying status site"
...
...
infra/sources/dashboard/ingress.yaml
0 → 100644
View file @
ae069301
apiVersion
:
extensions/v1beta1
kind
:
Ingress
metadata
:
annotations
:
kubernetes.io/ingress.class
:
"
public"
nginx.ingress.kubernetes.io/backend-protocol
:
"
HTTPS"
nginx.ingress.kubernetes.io/auth-secret
:
basic-auth
nginx.ingress.kubernetes.io/auth-realm
:
"
Authentication
Required!"
nginx.ingress.kubernetes.io/auth-type
:
basic
nginx.ingress.kubernetes.io/configuration-snippet
:
|
proxy_set_header Authorization "Bearer __DASHBOARD_TOKEN__";
name
:
dashboard
namespace
:
kube-system
spec
:
rules
:
-
host
:
dashboard-dbogatov-org.cluster.dbogatov.org
http
:
paths
:
-
backend
:
serviceName
:
kubernetes-dashboard
servicePort
:
443
path
:
/
-
host
:
dashboard.dbogatov.org
http
:
paths
:
-
backend
:
serviceName
:
kubernetes-dashboard
servicePort
:
443
path
:
/
tls
:
-
hosts
:
-
dashboard-dbogatov-org.cluster.dbogatov.org
-
dashboard.dbogatov.org
secretName
:
lets-encrypt
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment