diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-03 08:57:12 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-03 08:57:12 +0000 |
| commit | b8e47d72637167be5a225fe20b5f893c43b9a885 (patch) | |
| tree | a86d35c1584fc415a64d993f70dbbe6d21dd7fef /lib | |
| parent | eddeeed3c056b0d6ea4bf9a5774b713ef730fd11 (diff) | |
| parent | 40c6128b398f62188e794fe97b4cb545b482e3da (diff) | |
| download | gitlab-ce-b8e47d72637167be5a225fe20b5f893c43b9a885.tar.gz | |
Merge branch 'fix-kubectl-180' into 'master'
Fix broken certificate-authority-data with kubectl >= 1.8.0
Closes #38685
See merge request gitlab-org/gitlab-ce!14635
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/kubernetes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes.rb b/lib/gitlab/kubernetes.rb index cdbdfa10d0e..da43bd0af4b 100644 --- a/lib/gitlab/kubernetes.rb +++ b/lib/gitlab/kubernetes.rb @@ -113,7 +113,7 @@ module Gitlab def kubeconfig_embed_ca_pem(config, ca_pem) cluster = config.dig(:clusters, 0, :cluster) - cluster[:'certificate-authority-data'] = Base64.encode64(ca_pem) + cluster[:'certificate-authority-data'] = Base64.strict_encode64(ca_pem) end end end |