Commit 206f6747 authored by Amit Rathi's avatar Amit Rathi

Updated logging

parent c2407dab
...@@ -846,8 +846,8 @@ ActiveRecord::Schema.define(version: 20181107054254) do ...@@ -846,8 +846,8 @@ ActiveRecord::Schema.define(version: 20181107054254) do
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "on_stop" t.string "on_stop"
t.integer "status", limit: 2, default: 2, null: false
t.datetime_with_timezone "finished_at" t.datetime_with_timezone "finished_at"
t.integer "status", limit: 2, default: 2, null: false
end end
add_index "deployments", ["created_at"], name: "index_deployments_on_created_at", using: :btree add_index "deployments", ["created_at"], name: "index_deployments_on_created_at", using: :btree
......
...@@ -9,6 +9,8 @@ module Gitlab ...@@ -9,6 +9,8 @@ module Gitlab
def install(command) def install(command)
begin begin
Gitlab::AppLogger.info("---INSTALLING---------")
Gitlab::AppLogger.info(command)
namespace.ensure_exists! namespace.ensure_exists!
create_service_account(command) create_service_account(command)
......
...@@ -14,7 +14,9 @@ module Gitlab ...@@ -14,7 +14,9 @@ module Gitlab
spec[:volumes] = volumes_specification spec[:volumes] = volumes_specification
spec[:containers][0][:volumeMounts] = volume_mounts_specification spec[:containers][0][:volumeMounts] = volume_mounts_specification
spec[:serviceAccountName] = service_account_name if service_account_name 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) ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
end end
...@@ -48,10 +50,14 @@ module Gitlab ...@@ -48,10 +50,14 @@ module Gitlab
end end
def generate_pod_env(command) 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, HELM_VERSION: Gitlab::Kubernetes::Helm::HELM_VERSION,
TILLER_NAMESPACE: namespace_name, TILLER_NAMESPACE: namespace_name,
COMMAND_SCRIPT: command.generate_script COMMAND_SCRIPT: sc
}.map { |key, value| { name: key, value: value } } }.map { |key, value| { name: key, value: value } }
end end
......
...@@ -20,5 +20,9 @@ singleuser: ...@@ -20,5 +20,9 @@ singleuser:
ingress: ingress:
enabled: true enabled: true
tls:
- hosts:
secretName: test-app-tls-2
annotations: annotations:
kubernetes.io/ingress.class: "nginx" kubernetes.io/ingress.class: "nginx"
kubernetes.io/tls-acme: "true"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment