diff options
| -rw-r--r-- | db/schema.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/kubernetes/helm/api.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/kubernetes/helm/pod.rb | 10 | ||||
| -rw-r--r-- | vendor/jupyter/values.yaml | 10 |
4 files changed, 18 insertions, 6 deletions
diff --git a/db/schema.rb b/db/schema.rb index c3296dcacca..865ef04b95b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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 diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb index 63f3d863c61..9e441f760e9 100644 --- a/lib/gitlab/kubernetes/helm/api.rb +++ b/lib/gitlab/kubernetes/helm/api.rb @@ -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) diff --git a/lib/gitlab/kubernetes/helm/pod.rb b/lib/gitlab/kubernetes/helm/pod.rb index e9c621d96f0..008e1232b73 100644 --- a/lib/gitlab/kubernetes/helm/pod.rb +++ b/lib/gitlab/kubernetes/helm/pod.rb @@ -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 diff --git a/vendor/jupyter/values.yaml b/vendor/jupyter/values.yaml index 24136a7aca5..2077ac3f0a3 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" |