Merge pull request #8668 from dokku/8594-scheduler-k3s-cron-id-label-can-exceed-63-byte-kubernetes-limit

tests/unit/builder-pack.bats

@@ -265,7 +265,7 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
-  assert_output "['task.py']"
+  assert_output "['task.py', 'some', 'cron', 'task']"
 }
 
 @test "(builder-pack) cron:run with Procfile reference" {

tests/unit/scheduler-k3s-cnb.bats

@@ -103,11 +103,31 @@ teardown() {
   assert_success
   assert_output_exists
 
+  cron_hash="$(printf '%s' "$cron_id" | sha1sum | awk '{print $1}')"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-id\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_id"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.labels.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
   run /bin/bash -c "dokku --quiet cron:run $TEST_APP $cron_id"
   echo "output: $output"
   echo "status: $status"
   assert_success
-  assert_output_contains "['task.py']"
+  assert_output_contains "['task.py', 'some', 'cron', 'task']"
 }
 
 @test "(scheduler-k3s) cnb dokku run uses launcher entrypoint" {

tests/unit/scheduler-k3s-dockerfile.bats

@@ -94,6 +94,26 @@ teardown() {
   assert_success
   assert_output_exists
 
+  cron_hash="$(printf '%s' "$cron_id" | sha1sum | awk '{print $1}')"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-id\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_id"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.labels.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
   run /bin/bash -c "dokku --quiet cron:run $TEST_APP $cron_id"
   echo "output: $output"
   echo "status: $status"

tests/unit/scheduler-k3s-herokuish.bats

@@ -99,6 +99,26 @@ teardown() {
   assert_success
   assert_output_exists
 
+  cron_hash="$(printf '%s' "$cron_id" | sha1sum | awk '{print $1}')"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-id\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_id"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.labels.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
+  run /bin/bash -c "kubectl get cronjob -o json | jq -r '.items[0].metadata.annotations.\"dokku.com/cron-hash\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "$cron_hash"
+
   run /bin/bash -c "dokku --quiet cron:run $TEST_APP $cron_id"
   echo "output: $output"
   echo "status: $status"