Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump ipam to 0.2.2 #2030

Merged
merged 3 commits into from Mar 29, 2017
Merged

Bump ipam to 0.2.2 #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
172f7d5
bump ipam to 0.2.2
jnummelin Mar 29, 2017
284e35c
handle 409 zombie reponses in IpamClient
jnummelin Mar 29, 2017
e2a5ba9
let IpamClient raise error in case of 409 and weave actor rescue it i…
jnummelin Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/lib/kontena/launchers/ipam_plugin.rb
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ class IpamPlugin

IPAM_SERVICE_NAME = 'kontena-ipam-plugin'.freeze

IPAM_VERSION = ENV['IPAM_VERSION'] || '0.2.1'
IPAM_VERSION = ENV['IPAM_VERSION'] || '0.2.2'
IPAM_IMAGE = ENV['IPAM_IMAGE'] || 'kontena/ipam-plugin'

def initialize(autostart = true)
Expand Down
3 changes: 3 additions & 0 deletions agent/lib/kontena/network_adapters/weave.rb
View file
Open in desktop
Expand Up @@ -352,6 +352,9 @@ def remove_container(container_id, overlay_network, overlay_cidr)
info "Remove container=#{container_id} from network=#{overlay_network} at cidr=#{overlay_cidr}"

@ipam_client.release_address(overlay_network, overlay_cidr)
rescue IpamError => error
# Cleanup will take care of these later on
warn "Failed to release container=#{container_id} from network=#{overlay_network} at cidr=#{overlay_cidr}: #{error}"
end

private
Expand Down
2 changes: 1 addition & 1 deletion agent/spec/lib/kontena/network_adapters/ipam_client_spec.rb
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@

it 'handles error' do
expect(connection).to receive(:post)
.and_raise(Excon::Errors::HTTPStatusError.new('error'))
.and_raise(Excon::Errors::HTTPStatusError.new('error', double(:request), double(:response, :status => 400)))
expect(subject).to receive(:handle_error_response)
subject.release_address('kontena', '10.81.128.100')
end
Expand Down