krane 2.3.1 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7f54da6a63441ed0e9478eae5fe7c93f2cdaf94e149c08d70557922aca753fe
-  data.tar.gz: b5a87622de42abbd3c9f6e7528faafc4f8efee53645b60d32783edc6d43321d6
+  metadata.gz: 87de5ec387037d29595e3de534aa73e5aa492769c58dbfda3788d8b70fe76097
+  data.tar.gz: 3fbf5ea0bb33034f6ef4fad075628c144bbf6cffc73e8969617330c9d6705d95
 SHA512:
-  metadata.gz: aacd21670e0b2bdba17321635e69150de7d44ef5dcfd87d959cb0a2fba428c11b326c2cc81b6e9d868a1efb7027b3e307445641bcd3b9364f3f7364d44b0190b
-  data.tar.gz: b6fbeb6e6aad2311be81cfdd69a459c57a1d679ca5ef6a45e23d1345c020d51d4a76a02cd94015721fdb6d2cf36a6a2ee000f9efbdb4edb74ea7f4e9d7e5bea5
+  metadata.gz: f24f15dc5733820c518c6636ddd2150c266166f836d366db72460e2a94dca3d81e52ea7e2ea2e143871bc2279f469ca1263cbb1993bad4c2ce972f3f57559c41
+  data.tar.gz: 0a49d8ea6a69b228991be2756ebbf93e2aa2c1b2f043aebb2f9a6b697b06c7eeb4ff5eab1ddfd3b40359e35e7ef5e73e8a6e8d9d8659c862bde0abbc8a218ee4

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @Shopify/krane
+* @Shopify/app-lifecycle

data/.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: Krane CI
+
+on: [push]
+
+jobs:
+  ruby-tests:
+    runs-on: ubuntu-latest
+
+    name: "Tests - Ruby ${{ matrix.ruby }} with k8s ${{ matrix.kubernetes_version }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '3.0' # With k8s 1.23
+        - '3.0' # With k8s 1.22
+        - '3.0' # With k8s 1.21
+        - '3.0' # With k8s 1.20
+        - '2.7' # With k8s 1.19
+        - '2.6.6' # With k8s 1.18
+        - '2.6.6' # With k8s 1.17
+        include:
+        # Match kind images with chosen version https://github.com/kubernetes-sigs/kind/releases
+        - ruby: '3.0'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.23.0'
+          kind_image: 'kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac'
+        - ruby: '3.0'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.22.0'
+          kind_image: 'kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047'
+        - ruby: '3.0'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.21.1'
+          kind_image: 'kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6'
+        - ruby: '3.0'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.20.7'
+          kind_image: 'kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9'
+        - ruby: '2.7'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.19.11'
+          kind_image: 'kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729'
+        - ruby: '2.6.6'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.18.19'
+          kind_image: '1.18: kindest/node:v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c'
+        - ruby: '2.6.6'
+          kind_version: 'v0.11.1'
+          kubernetes_version: '1.17.17'
+          kind_image: 'kindest/node:v1.17.17@sha256:66f1d0d91a88b8a001811e2f1054af60eef3b669a9a74f9b6db871f2f1eeed00'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Setup kubectl
+        run: |
+          mkdir -p "${GITHUB_WORKSPACE}/bin"
+          curl -o "${GITHUB_WORKSPACE}/bin/kubectl" -LO "https://dl.k8s.io/release/v${{ matrix.kubernetes_version }}/bin/linux/amd64/kubectl"
+          chmod +x "${GITHUB_WORKSPACE}/bin/kubectl"
+          echo "PATH=$GITHUB_WORKSPACE/bin:${PATH}" >> $GITHUB_ENV
+
+      - uses: engineerd/setup-kind@v0.5.0
+        with:
+          version: "${{ matrix.kind_version }}"
+          image: "${{ matrix.kind_image }}"
+
+      - name: Run tests
+        run: |
+          bin/test

data/.gitignore

@@ -15,3 +15,4 @@ dev/flamegraph.svg
 dev/profile
 dev/flamegraph.pl
 .local-context
+bin/kind

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## next
 
+## 2.3.5
+
+- Psych 4 compatibility
+
+## 2.3.4
+
+- Fix for [CVE-2021-41817](https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/). See [ServicesDB action item here](https://services.shopify.io/action_items/definitions/isolated/59).
+
+## 2.3.3
+
+- Another Psych 4.0 compatibility fix [#844](https://github.com/Shopify/krane/pull/844)
+
+## 2.3.2
+
+- Fix compatibility with Psych 4.0 [#843](https://github.com/Shopify/krane/pull/843)
+
 ## 2.3.1
 
 - Fix a bug in RestartTask where a NoMethodError is thrown if any of the target resources do not have annotations [#841](https://github.com/Shopify/krane/pull/841)

data/Rakefile

@@ -7,6 +7,7 @@ Rake::TestTask.new(:integration_test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/integration/**/*_test.rb']
+  t.warning = !ENV.key?('CI')
 end
 
 desc("Run integration tests that CANNOT be run in parallel")
@@ -14,6 +15,7 @@ Rake::TestTask.new(:serial_integration_test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/integration-serial/**/*_test.rb']
+  t.warning = !ENV.key?('CI')
 end
 
 desc("Run unit tests")
@@ -21,6 +23,7 @@ Rake::TestTask.new(:unit_test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/unit/**/*_test.rb']
+  t.warning = !ENV.key?('CI')
 end
 
 desc("Run cli tests")
@@ -28,6 +31,7 @@ Rake::TestTask.new(:cli_test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/exe/**/*_test.rb']
+  t.warning = !ENV.key?('CI')
 end
 
 desc("Run all tests")

data/bin/test

@@ -27,9 +27,10 @@ if [[ ${PARALLELISM:=0} -lt 1 ]]; then
   fi
 fi
 
-if [[ ${CI:="0"} == "1" ]]; then
-  echo "--- :ruby: Bundle Install"
-  bundle install --jobs 4
+if [[ "${CI:-0}" != "0" ]]; then
+  SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+  echo "kind-kind" > "${SCRIPT_DIR}/../.local-context"
+  PARALLELISM=2
 fi
 
 print_header "Run CLI Tests"

data/dev.yml

@@ -3,20 +3,20 @@ name: krane
 up:
   - ruby: 2.6.6 # Matches gemspec
   - bundler
-  - homebrew:
-    - minikube
-    - hyperkit
   - custom:
-      name: Install the minikube fork of driver-hyperkit
-      met?: command -v docker-machine-driver-hyperkit
-      meet: curl -LO https://storage.googleapis.com/minikube/releases/latest/docker-machine-driver-hyperkit && sudo install -o root -g wheel -m 4755 docker-machine-driver-hyperkit /usr/local/bin/ && rm ./docker-machine-driver-hyperkit
+      name: Install Kubernetes in Docker (KinD)
+      met?: bin/kind version 2>&1 | grep -q v0.11.1
+      meet: |
+        mkdir -p bin
+        curl -sLo bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-darwin-amd64"
+        chmod +x bin/kind
   - custom:
-      name: Minikube Cluster
-      met?: test $(minikube status | grep Running | wc -l) -ge 2 && $(minikube status | grep -q 'Configured')
-      meet: minikube start --kubernetes-version=v1.18.18 --vm-driver=hyperkit
-      down: minikube stop
+      name: Create KinD Cluster
+      met?: bin/kind get clusters | grep -q krane
+      meet: bin/kind create cluster --name krane
+      down: |
+        ((bin/kind get clusters | grep -q krane) && bin/kind delete cluster --name krane) || true
 commands:
-  reset-minikube: minikube delete && rm -rf ~/.minikube
   test:
     run: bin/test
   tophat:

data/krane.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
 
   # Basics
   spec.add_development_dependency("bundler")
-  spec.add_development_dependency("rake", "~> 10.0")
+  spec.add_development_dependency("rake", "~> 13.0")
   spec.add_development_dependency("yard")
 
   # Test framework

data/lib/krane/common.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/slice'

data/lib/krane/kubernetes_resource.rb

@@ -584,7 +584,12 @@ module Krane
     # If the resource template uses generateName, validating with apply will fail
     def validate_with_local_dry_run(kubectl)
       verb = deploy_method == :apply ? "apply" : "create"
-      command = [verb, "-f", file_path, "--dry-run", "--output=name"]
+      command = if kubectl.client_version >= Gem::Version.new('1.18')
+        [verb, "-f", file_path, "--dry-run=client", "--output=name"]
+      else
+        [verb, "-f", file_path, "--dry-run", "--output=name"]
+      end
+
       kubectl.run(*command, log_failure: false, output_is_sensitive: sensitive_template_content?,
         retry_whitelist: [:client_timeout, :empty, :context_deadline], attempts: 3, use_namespace: !global?)
     end

data/lib/krane/render_task.rb

@@ -73,7 +73,7 @@ module Krane
       file_basename = File.basename(filename)
       @logger.info("Rendering #{file_basename}...")
       implicit = []
-      YAML.parse_stream(rendered_content, "<rendered> #{filename}") { |d| implicit << d.implicit }
+      YAML.parse_stream(rendered_content, filename: "<rendered> #{filename}") { |d| implicit << d.implicit }
       if rendered_content.present?
         stream.puts "---\n" if implicit.first
         stream.puts rendered_content

data/lib/krane/renderer.rb

@@ -58,7 +58,7 @@ module Krane
       template = File.read(partial_path)
       expanded_template = ERB.new(template, trim_mode: '-').result(erb_binding)
 
-      docs = Psych.parse_stream(expanded_template, partial_path)
+      docs = Psych.parse_stream(expanded_template, filename: partial_path)
       # If the partial contains multiple documents or has an explicit document header,
       # we know it cannot validly be indented in the parent, so return it immediately.
       return expanded_template unless docs.children.one? && docs.children.first.implicit

data/lib/krane/template_sets.rb

@@ -77,7 +77,7 @@ module Krane
       def templates(filename:, raw:)
         file_content = File.read(File.join(@template_dir, filename))
         rendered_content = @renderer ? @renderer.render_template(filename, file_content) : file_content
-        YAML.load_stream(rendered_content, "<rendered> #{filename}") do |doc|
+        YAML.load_stream(rendered_content, filename: "<rendered> #{filename}") do |doc|
           next if doc.blank?
           unless doc.is_a?(Hash)
             raise InvalidTemplateError.new("Template is not a valid Kubernetes manifest",

data/lib/krane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Krane
-  VERSION = "2.3.1"
+  VERSION = "2.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.5
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -416,11 +416,10 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/probots.yml"
 - ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml"
 - ".rubocop.yml"
-- ".shopify-build/VERSION"
-- ".shopify-build/krane.yml"
 - 1.0-Upgrade.md
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md

data/.shopify-build/VERSION

@@ -1 +0,0 @@
-v1

data/.shopify-build/krane.yml

@@ -1,48 +0,0 @@
-containers:
-  default:
-    docker: circleci/ruby:2.6.6
-
-steps:
-  - label: Lint
-    timeout: 5m
-    run:
-      - bundle: ~
-      - bundle exec rubocop
-  - label: 'Run Test Suite (:kubernetes: 1.21-latest :ruby: 3.0)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: "4"
-      KUBERNETES_VERSION: v1.21-latest
-      RUBY_VERSION: "3.0"
-  - label: 'Run Test Suite (:kubernetes: 1.20-latest :ruby: 3.0)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: "4"
-      KUBERNETES_VERSION: v1.20-latest
-      RUBY_VERSION: "3.0"
-  - label: 'Run Test Suite (:kubernetes: 1.19-latest :ruby: 2.7)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: "4"
-      KUBERNETES_VERSION: v1.19-latest
-      RUBY_VERSION: "2.7"
-  - label: 'Run Test Suite (:kubernetes: 1.18-latest)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: "4"
-      KUBERNETES_VERSION: v1.18-latest
-  - label: 'Run Test Suite (:kubernetes: 1.17-latest)'
-    command: bin/ci
-    agents:
-      queue: k8s-ci
-    env:
-      LOGGING_LEVEL: "4"
-      KUBERNETES_VERSION: v1.17-latest