diff --git a/.rubocop.yml b/.rubocop.yml index 24ce65be4..c0a558201 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -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 diff --git a/.shopify-build/kubernetes-deploy.yml b/.shopify-build/krane.yml similarity index 89% rename from .shopify-build/kubernetes-deploy.yml rename to .shopify-build/krane.yml index 37eb9628b..ca1ef5f84 100644 --- a/.shopify-build/kubernetes-deploy.yml +++ b/.shopify-build/krane.yml @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f0d1e058..fc866c6be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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!* diff --git a/kubernetes-deploy.gemspec b/kubernetes-deploy.gemspec index 2766f9002..94b7ae04b 100644 --- a/kubernetes-deploy.gemspec +++ b/kubernetes-deploy.gemspec @@ -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") diff --git a/lib/krane/version.rb b/lib/krane/version.rb index a70ec4f99..4a7551255 100644 --- a/lib/krane/version.rb +++ b/lib/krane/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Krane - VERSION = "1.0.0.pre.1" + VERSION = "1.0.0.pre.2" end diff --git a/test/unit/krane/resource_deployer_test.rb b/test/unit/krane/resource_deployer_test.rb index 531cbe268..6cf1f41d8 100644 --- a/test/unit/krane/resource_deployer_test.rb +++ b/test/unit/krane/resource_deployer_test.rb @@ -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