Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
206f6747
Commit
206f6747
authored
Nov 13, 2018
by
Amit Rathi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated logging
parent
c2407dab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
6 deletions
+18
-6
db/schema.rb
db/schema.rb
+1
-1
lib/gitlab/kubernetes/helm/api.rb
lib/gitlab/kubernetes/helm/api.rb
+2
-0
lib/gitlab/kubernetes/helm/pod.rb
lib/gitlab/kubernetes/helm/pod.rb
+8
-2
vendor/jupyter/values.yaml
vendor/jupyter/values.yaml
+7
-3
No files found.
db/schema.rb
View file @
206f6747
...
...
@@ -846,8 +846,8 @@ ActiveRecord::Schema.define(version: 20181107054254) do
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
string
"on_stop"
t
.
integer
"status"
,
limit:
2
,
default:
2
,
null:
false
t
.
datetime_with_timezone
"finished_at"
t
.
integer
"status"
,
limit:
2
,
default:
2
,
null:
false
end
add_index
"deployments"
,
[
"created_at"
],
name:
"index_deployments_on_created_at"
,
using: :btree
...
...
lib/gitlab/kubernetes/helm/api.rb
View file @
206f6747
...
...
@@ -9,6 +9,8 @@ module Gitlab
def
install
(
command
)
begin
Gitlab
::
AppLogger
.
info
(
"---INSTALLING---------"
)
Gitlab
::
AppLogger
.
info
(
command
)
namespace
.
ensure_exists!
create_service_account
(
command
)
...
...
lib/gitlab/kubernetes/helm/pod.rb
View file @
206f6747
...
...
@@ -14,7 +14,9 @@ module Gitlab
spec
[
:volumes
]
=
volumes_specification
spec
[
:containers
][
0
][
:volumeMounts
]
=
volume_mounts_specification
spec
[
:serviceAccountName
]
=
service_account_name
if
service_account_name
Gitlab
::
AppLogger
.
info
(
'--- Generating Installation POD ----'
)
Gitlab
::
AppLogger
.
info
(
metadata
)
Gitlab
::
AppLogger
.
info
(
spec
)
::
Kubeclient
::
Resource
.
new
(
metadata:
metadata
,
spec:
spec
)
end
...
...
@@ -48,10 +50,14 @@ module Gitlab
end
def
generate_pod_env
(
command
)
sc
=
command
.
generate_script
Gitlab
::
AppLogger
.
info
(
'--- generate_pod_env and command is---*******----'
)
Gitlab
::
AppLogger
.
info
(
sc
)
Gitlab
::
AppLogger
.
info
(
'--------------------------------------------------------'
)
{
HELM_VERSION
:
Gitlab
::
Kubernetes
::
Helm
::
HELM_VERSION
,
TILLER_NAMESPACE
:
namespace_name
,
COMMAND_SCRIPT
:
command
.
generate_script
COMMAND_SCRIPT
:
sc
}.
map
{
|
key
,
value
|
{
name:
key
,
value:
value
}
}
end
...
...
vendor/jupyter/values.yaml
View file @
206f6747
...
...
@@ -19,6 +19,10 @@ singleuser:
command
:
[
"
sh"
,
"
-c"
,
"
git
clone
https://gitlab.com/gitlab-org/nurtch-demo.git
DevOps-Runbook-Demo
||
true"
]
ingress
:
enabled
:
true
annotations
:
kubernetes.io/ingress.class
:
"
nginx"
enabled
:
true
tls
:
-
hosts
:
secretName
:
test-app-tls-2
annotations
:
kubernetes.io/ingress.class
:
"
nginx"
kubernetes.io/tls-acme
:
"
true"
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