Merge branch 'Shopify:main' into master

Author: strowi

.github/workflows/ci.yml

@@ -18,6 +18,8 @@ jobs:
           - "3.0.4"
           - "2.7.6"
         kubernetes_version:
+          - "1.33.1"
+          - "1.32.5"
           - "1.31.2"
           - "1.30.0"
           - "1.29.4"
@@ -30,6 +32,10 @@ jobs:
           - "serial_integration_test"
           - "integration_test"
         include:
+          - kubernetes_version: "1.33.1"
+            kind_image: "kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f"
+          - kubernetes_version: "1.32.5"
+            kind_image: "kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d"
           - kubernetes_version: "1.31.2"
             kind_image: "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"
           - kubernetes_version: "1.30.0"

CHANGELOG.md

@@ -1,5 +1,26 @@
 ## next
 
+## 3.9.0
+
+- Remove Elasticsearch specific logic that was introduced in 3.8.0
+- Remove check for observedGeneration.present? introduced in 3.8.1 because it was redundant
+
+## 3.8.1
+
+- check if observedGeneration is present before comparing with generation for custom resources
+
+## 3.8.0
+
+- Add Elasticsearch resource to the black list so it is not marked for deletion
+
+## 3.7.4
+
+- Handle bad encoding in container log output
+
+## 3.7.3
+
+- Test against k8s 1.32 and 1.33
+
 ## 3.7.2
 
 - Explicitly convert `current_generation` and `observed_generation` values to integers using `.to_i` to ensure consistentency during comparison

README.md

@@ -98,6 +98,8 @@ Krane provides support for official upstream supported versions [Kubernetes](htt
 |        1.29        | Yes               |                    --                    |
 |        1.30        | Yes               |                    --                    |
 |        1.31        | Yes               |                    --                    |
+|        1.32        | Yes               |                    --                    |
+|        1.33        | Yes               |                    --                    |
 
 ## Installation
 

dev.yml

@@ -6,7 +6,7 @@ up:
   - podman
   - kind:
       name: krane
-      image: kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e
+      image: kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d
 commands:
   test:
     run: bin/test unit_test && bin/test cli_test && bin/test serial_integration_test && bin/test integration_test

lib/krane/container_logs.rb

@@ -55,7 +55,7 @@ def fetch_latest
         "--tail=#{DEFAULT_LINE_LIMIT}"
       end
       out, _err, _st = kubectl.run(*cmd, log_failure: false)
-      out.split("\n")
+      out.encode('UTF-8', invalid: :replace, replace: '').split("\n")
     end
 
     def kubectl

lib/krane/version.rb

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

test/integration/runner_task_test.rb

@@ -300,6 +300,25 @@ def test_run_adds_custom_image_tag_provided_to_the_task_container
     assert_equal('busybox:latest', container.image, "Container image should have been upadted")
   end
 
+  def test_run_with_verify_result_succeeds_with_bad_output_encoding
+    deploy_task_template
+
+    task_runner = build_task_runner
+    assert_nil(task_runner.pod_name)
+    result = task_runner.run(
+      template: 'hello-cloud-template-runner',
+      command: ['/bin/sh', '-c'],
+      arguments: ['printf \'\xFF\xFE\x00\x01\''],
+      verify_result: true,
+    )
+
+    assert_task_run_success(result)
+
+    pods = kubeclient.get_pods(namespace: @namespace)
+    assert_equal(1, pods.length, "Expected 1 pod to exist, found #{pods.length}")
+    assert_equal(task_runner.pod_name, pods.first.metadata.name, "Pod name should be available after run")
+  end
+
   private
 
   def deploy_unschedulable_template