Skip to content

Commit

Permalink
Version 1.0.0.pre.2
Browse files Browse the repository at this point in the history
- Release Version 1.0.0.pre.2
- Relax thor version in k8s-deploy gemspec
- Relax googleauth restriction to ~> 0.9
- Pin K8s 1.16 CI to 1.16.12
  • Loading branch information
Ryan Brushett committed Jul 27, 2020
1 parent c354f11 commit e2704a6
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 20 deletions.
12 changes: 0 additions & 12 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,3 @@ inherit_from:

AllCops:
TargetRubyVersion: 2.4

Naming/FileName:
Enabled: true
Exclude:
- lib/kubernetes-deploy.rb

Sorbet/ConstantsFromStrings:
Enabled: false

Layout/Tab:
Exclude:
- test/integration/krane_deploy_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ steps:
- label: Lint
timeout: 5m
run:
- bundle: ~
- bundle exec rubocop
dependencies:
- bundler
- label: 'Run Test Suite (:kubernetes: 1.16-latest)'
- label: 'Run Test Suite (:kubernetes: 1.16.12)'
command: bin/ci
agents:
queue: k8s-ci
env:
LOGGING_LEVEL: "4"
KUBERNETES_VERSION: v1.16-latest
KUBERNETES_VERSION: v1.16.12
- label: 'Run Test Suite (:kubernetes: 1.15-latest)'
command: bin/ci
agents:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
*Important!*
- The next release will be 1.0.0, which means that master will contain breaking changes.

## 1.0.0.pre.2

*Enhancements*
- Relax thor version requirement. ([#731](https://github.com/Shopify/krane/pull/731))
- Relax googleauth restriction. ([#731](https://github.com/Shopify/krane/pull/731))

## 1.0.0.pre.1

*Important!*
Expand Down
4 changes: 2 additions & 2 deletions kubernetes-deploy.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.4.0'
spec.add_dependency("activesupport", ">= 5.0")
spec.add_dependency("kubeclient", "~> 4.3")
spec.add_dependency("googleauth", "~> 0.8.0")
spec.add_dependency("googleauth", "~> 0.8")
spec.add_dependency("ejson", "~> 1.0")
spec.add_dependency("colorize", "~> 0.8")
spec.add_dependency("statsd-instrument", ['>= 2.8', "< 3.1"])
spec.add_dependency("oj", "~> 3.0")
spec.add_dependency("concurrent-ruby", "~> 1.1")
spec.add_dependency("jsonpath", "~> 0.9.6")
spec.add_dependency("thor", "~> 0.20.3")
spec.add_dependency("thor", [">= 0.20", "< 2.0"])

spec.add_development_dependency("bundler")
spec.add_development_dependency("rake", "~> 10.0")
Expand Down
2 changes: 1 addition & 1 deletion lib/krane/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Krane
VERSION = "1.0.0.pre.1"
VERSION = "1.0.0.pre.2"
end
2 changes: 1 addition & 1 deletion test/unit/krane/resource_deployer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_predeploy_priority_resources_respects_empty_pre_deploy_list

private

def resource_deployer(kubectl_times: 2, prune_whitelist: [])
def resource_deployer(kubectl_times: 1, prune_whitelist: [])
unless kubectl_times == 0
Krane::Kubectl.expects(:new).returns(build_runless_kubectl).times(kubectl_times)
end
Expand Down

0 comments on commit e2704a6

Please sign in to comment.