stash

Author: timothysmith0609

lib/krane/kubernetes_resource/pod.rb

@@ -235,7 +235,7 @@ def doom_reason
           # to too many pods referencing the same secret/configmap: https://github.com/kubernetes/kubernetes/pull/74755
           # Error message format source: https://github.com/kubernetes/kubernetes/pull/75260
         elsif limbo_reason == "CreateContainerConfigError" && !limbo_message.match("failed to sync (.*?) cache")
-          "Failed to generate container configuration: #{limbo_message}"
+ container configuration: #{limbo_message}"
         elsif @status.dig("lastState", "terminated", "reason") == "ContainerCannotRun"
           # ref: https://github.com/kubernetes/kubernetes/blob/562e721ece8a16e05c7e7d6bdd6334c910733ab2/pkg/kubelet/dockershim/docker_container.go#L353
           exit_code = @status.dig('lastState', 'terminated', 'exitCode')

lib/krane/resource_deployer.rb

@@ -116,20 +116,19 @@ def deploy_resources(resources, prune: false, verify:, record_summary: true)
           # Fail Fast! This is a programmer mistake.
           raise ArgumentError, "Unexpected deploy method! (#{individual_resource.deploy_method.inspect})"
         end
-        applyables += updated_individuals.select { |r| pruneable_types.include?(r.type) && !r.deploy_method_override }
-
         next if status.success?
 
         raise FatalDeploymentError, <<~MSG
-          Failed to replace or create resource: #{individual_resource.id}
-          #{individual_resource.sensitive_template_content? ? '<suppressed sensitive output>' : err}
+        Failed to replace or create resource: #{individual_resource.id}
+        #{individual_resource.sensitive_template_content? ? '<suppressed sensitive output>' : err}
         MSG
       end
 
+      applyables += updated_individuals.select { |r| pruneable_types.include?(r.type) && !r.deploy_method_override }
       apply_all(applyables, prune)
-
+      watchables = ((applyables + updated_individuals)).uniq
       if verify
-        watcher = Krane::ResourceWatcher.new(resources: resources, deploy_started_at: deploy_started_at,
+        watcher = Krane::ResourceWatcher.new(resources: watchables, deploy_started_at: deploy_started_at,
           timeout: @global_timeout, task_config: @task_config, sha: @current_sha)
         watcher.run(record_summary: record_summary)
       end
@@ -258,10 +257,15 @@ def create_resource(resource)
         output: 'json', output_is_sensitive: resource.sensitive_template_content?,
         use_namespace: !resource.global?)
 
+      updated_resource_hash = JSON.parse(updated_resource_definition)
+      updated_resource_hash.delete("status")
+      updated_resource_hash["metadata"].delete("resourceVersion")
+      updated_resource_hash["metadata"].delete("generateName")
+
       updated_resource = KubernetesResource.build(
         namespace: @task_config.namespace,
         context: @task_config.context,
-        definition: updated_resource_definition,
+        definition: updated_resource_hash,
         logger:,
         statsd_tags:,
         crd: resource.is_a?(CustomResource) ? resource.crd : nil,

lib/krane/version.rb

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

tophat/configmap-data.yml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hello-cloud-configmap-data
+  labels:
+    name: hello-cloud-configmap-data
+    app: hello-cloud
+data:
+  datapoint1: value1
+  datapoint2: value2

tophat/pod.yml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  generateName: pod-using-generate-name-
+  # name: pod
+  annotations:
+    krane.shopify.io/timeout-override: 60s
+    # container.apparmor.security.beta.kubernetes.io/command-runner: runtime/default
+  labels:
+    type: pod-using-generate-name
+    name: pod-using-generate-name
+spec:
+  activeDeadlineSeconds: 60
+  restartPolicy: Never
+  containers:
+  - name: busybox-container
+    image: busybox
+    imagePullPolicy: IfNotPresent
+    command: ["sh", "-c", "echo 'Hello from the command runner!' && test 1 -eq 1"]
+    resources:
+      requests:
+        memory: 100Mi
+        cpu: 100m