Skip to content

Commit

Permalink
Merge pull request #21 from tas50/master
Browse files Browse the repository at this point in the history
Testing updates
  • Loading branch information
aespinosa authored Jan 22, 2018
2 parents 8d3d518 + 4424ee4 commit 5df8d1b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ pkg/
# policyfile
Policyfile.lock.json

# Berkshelf
.vagrant
/cookbooks
Berksfile.lock

# Bundler
Gemfile.lock
bin/*
Expand Down
4 changes: 1 addition & 3 deletions test/cookbooks/kube_test/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name 'kube_test'

depends 'chef-apt-docker', '>= 2.0.4'
depends 'chef-yum-docker', '>= 3.0'
depends 'docker'
depends 'docker', '>= 4.0'
depends 'etcd', '>= 5.0'
depends 'kube'
15 changes: 5 additions & 10 deletions test/cookbooks/kube_test/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
path '/usr/bin/kubectl'
mode '0755'
source 'https://storage.googleapis.com/kubernetes-release/release'\
'/v1.7.6/bin/linux/amd64/kubectl'
checksum '32d85c8f38aded3466a36f0d94906c5174eb4076a5f23b7187b8f77ecdd75834'
'/v1.9.2/bin/linux/amd64/kubectl'
checksum '455999c8232c57748f4cee4b5446ee39fe8af093434d732ddcd628a02f3d9118'
end

# Master
Expand Down Expand Up @@ -41,14 +41,6 @@
package 'apt-transport-https'

apt_update

include_recipe 'chef-apt-docker::default'
end

include_recipe 'chef-yum-docker::default' if platform_family?('rhel')

directory '/etc/kubernetes/manifests' do
recursive true
end

docker_service 'default' do
Expand All @@ -74,6 +66,9 @@
end

# test running a sample pod
directory '/etc/kubernetes/manifests' do
recursive true
end

t = template '/etc/kubernetes/manifests/busybox.yaml'

Expand Down

0 comments on commit 5df8d1b

Please sign in to comment.