From 206f6747ec9ff97a4b6c77d7a2e0bc6bdd52732d Mon Sep 17 00:00:00 2001
From: Amit Rathi <amit@hypertrack.io>
Date: Tue, 13 Nov 2018 16:57:49 +0530
Subject: [PATCH] Updated logging
---
db/schema.rb | 2 +-
lib/gitlab/kubernetes/helm/api.rb | 2 ++
lib/gitlab/kubernetes/helm/pod.rb | 10 ++++++++--
vendor/jupyter/values.yaml | 10 +++++++---
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/db/schema.rb b/db/schema.rb
index c3296dcaccaf4..865ef04b95bb0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -846,8 +846,8 @@
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
diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb
index 63f3d863c61b7..9e441f760e903 100644
--- a/lib/gitlab/kubernetes/helm/api.rb
+++ b/lib/gitlab/kubernetes/helm/api.rb
@@ -9,6 +9,8 @@ def initialize(kubeclient)
def install(command)
begin
+ Gitlab::AppLogger.info("---INSTALLING---------")
+ Gitlab::AppLogger.info(command)
namespace.ensure_exists!
create_service_account(command)
diff --git a/lib/gitlab/kubernetes/helm/pod.rb b/lib/gitlab/kubernetes/helm/pod.rb
index e9c621d96f04f..008e1232b730b 100644
--- a/lib/gitlab/kubernetes/helm/pod.rb
+++ b/lib/gitlab/kubernetes/helm/pod.rb
@@ -14,7 +14,9 @@ def generate
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 @@ def metadata
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
diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml
index 24136a7aca5e6..2077ac3f0a34e 100644
--- a/vendor/jupyter/values.yaml
+++ b/vendor/jupyter/values.yaml
@@ -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"
--
GitLab