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

Version 1.0.0.pre.2 #731

Merged
merged 1 commit into from
Jul 28, 2020
Merged

Version 1.0.0.pre.2 #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .rubocop.yml
View file
Open in desktop
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
7 changes: 3 additions & 4 deletions .shopify-build/kubernetes-deploy.yml → .shopify-build/krane.yml
View file
Open in desktop
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
View file
Open in desktop
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
RyanBrushett marked this conversation as resolved.
Show resolved Hide resolved

*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
View file
Open in desktop
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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dirceu I made a slight adjustment to match the googleauth dependency restriction with Krane's latest. You still 👍 ?

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
View file
Open in desktop
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
View file
Open in desktop
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