summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-21 19:14:44 +1300
committerThong Kuah <tkuah@gitlab.com>2018-11-27 10:52:10 +1300
commit685218c4230f3eb75278b16f00544b7adaf5e596 (patch)
tree38152fb2490a397af6206e3e1ea238aaf9d73cc1
parentdeaf3af7e5f357f3e8d91f7f2d49ad3ce001ba68 (diff)
downloadgitlab-ce-685218c4230f3eb75278b16f00544b7adaf5e596.tar.gz
Upgrade kubeclient to 4.0.0
Bumps kubeclient and its dependencies from 3.1.0 to 4.0.0.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
-rw-r--r--Gemfile.rails4.lock12
-rw-r--r--changelogs/unreleased/upgrade_kubeclient_400.yml5
4 files changed, 18 insertions, 13 deletions
diff --git a/Gemfile b/Gemfile
index 3fa1989afb9..aa6f39f5968 100644
--- a/Gemfile
+++ b/Gemfile
@@ -235,7 +235,7 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 3.1.0'
+gem 'kubeclient', '~> 4.0.0'
# Sanitize user input
gem 'sanitize', '~> 4.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 20231696795..a64d51c9dad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -367,14 +367,14 @@ GEM
html2text (0.2.0)
nokogiri (~> 1.6)
htmlentities (4.3.4)
- http (2.2.2)
+ http (3.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
+ http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- http-form_data (1.0.3)
+ http-form_data (2.1.1)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
@@ -418,8 +418,8 @@ GEM
kgio (2.10.0)
knapsack (1.17.0)
rake
- kubeclient (3.1.0)
- http (~> 2.2.2)
+ kubeclient (4.0.0)
+ http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
@@ -1042,7 +1042,7 @@ DEPENDENCIES
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 3.1.0)
+ kubeclient (~> 4.0.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
licensee (~> 8.9)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index caaa886987b..cb25b8af72e 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -364,14 +364,14 @@ GEM
html2text (0.2.0)
nokogiri (~> 1.6)
htmlentities (4.3.4)
- http (2.2.2)
+ http (3.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
+ http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- http-form_data (1.0.3)
+ http-form_data (2.1.1)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
@@ -415,8 +415,8 @@ GEM
kgio (2.10.0)
knapsack (1.17.0)
rake
- kubeclient (3.1.0)
- http (~> 2.2.2)
+ kubeclient (4.0.0)
+ http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
@@ -1033,7 +1033,7 @@ DEPENDENCIES
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 3.1.0)
+ kubeclient (~> 4.0.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
licensee (~> 8.9)
diff --git a/changelogs/unreleased/upgrade_kubeclient_400.yml b/changelogs/unreleased/upgrade_kubeclient_400.yml
new file mode 100644
index 00000000000..edb38710e6a
--- /dev/null
+++ b/changelogs/unreleased/upgrade_kubeclient_400.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade kubeclient to 4.0.0
+merge_request: 23261
+author: Praveen Arimbrathodiyil @pravi
+type: other