diff options
author | Chris Baumbauer <cab@cabnetworks.net> | 2018-10-24 15:13:33 -0700 |
---|---|---|
committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-10-24 15:13:33 -0700 |
commit | 661fd213de41d06ebdbecb92f37668f0009c838d (patch) | |
tree | 0275b558ea9bce9856a73930203f09aecace6d30 /app/models/clusters | |
parent | 742f8d64547c3e922afd8cb9bd2e5e64ae155924 (diff) | |
download | gitlab-ce-661fd213de41d06ebdbecb92f37668f0009c838d.tar.gz |
Update helm version 1.7.2 -> 2.11.0
Diffstat (limited to 'app/models/clusters')
-rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index e8e943872de..263b7d9d01e 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -25,6 +25,7 @@ module Clusters algorithm: 'aes-256-cbc' before_validation :enforce_namespace_to_lower_case + before_validation :enforce_ca_whitespace_trimming validates :namespace, allow_blank: true, @@ -191,6 +192,11 @@ module Clusters self.namespace = self.namespace&.downcase end + def enforce_ca_whitespace_trimming + self.ca_pem = self.ca_pem&.strip + self.token = self.token&.strip + end + def prevent_modification return unless managed? |