summaryrefslogtreecommitdiff
path: root/app/models/clusters
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-07-24 16:34:39 +0100
committerDylan Griffith <dyl.griffith@gmail.com>2018-07-30 13:08:31 +0000
commitcb21560b9174ed49d33cf974600bb2b5cf69fc62 (patch)
tree0ce9d092a5b4ab421df9ee21bf73b0f276f377e3 /app/models/clusters
parent039a8ebdd47d12b5f721a1e31825f079dd9e18d2 (diff)
downloadgitlab-ce-cb21560b9174ed49d33cf974600bb2b5cf69fc62.tar.gz
Ensure CA + Tiller cert never expire and Helm client cert expires quickly
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/helm.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index f08224e94c2..0004997e1a0 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -31,8 +31,7 @@ module Clusters
end
def issue_cert
- ca_cert_obj
- .issue
+ ca_cert_obj.issue
end
def set_initial_status
@@ -42,7 +41,8 @@ module Clusters
end
def install_command
- tiller_cert = issue_cert
+ tiller_cert = ca_cert_obj.issue(expires_in: Gitlab::Kubernetes::Helm::Certificate::INFINITE_EXPIRY)
+
Gitlab::Kubernetes::Helm::InitCommand.new(
name: name,
files: {