From fe526dd33ce906d44554a5ee1696c498e699055d Mon Sep 17 00:00:00 2001
From: "gcp-cherry-pick-bot[bot]"
 <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date: Wed, 9 Aug 2023 10:03:53 -0400
Subject: [PATCH] fix(actions): check if CronWorkflow has labels in
 create-workflow action (#14962) (#14974) (#14982)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mickaël Canévet <mickael.canevet@gmail.com>
Co-authored-by: Mickaël Canévet <mickael.canevet@gmail.com>
---
 .../CronWorkflow/actions/action_test.yaml     |  3 ++
 .../actions/create-workflow/action.lua        |  2 +-
 .../testdata/cronworkflow-without-label.yaml  | 31 +++++++++++++++++++
 .../testdata/workflow-without-label.yaml      | 26 ++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 resource_customizations/argoproj.io/CronWorkflow/actions/testdata/cronworkflow-without-label.yaml
 create mode 100644 resource_customizations/argoproj.io/CronWorkflow/actions/testdata/workflow-without-label.yaml

diff --git a/resource_customizations/argoproj.io/CronWorkflow/actions/action_test.yaml b/resource_customizations/argoproj.io/CronWorkflow/actions/action_test.yaml
index 4c7aa77ff127a..7fce1c3b36cf6 100644
--- a/resource_customizations/argoproj.io/CronWorkflow/actions/action_test.yaml
+++ b/resource_customizations/argoproj.io/CronWorkflow/actions/action_test.yaml
@@ -2,3 +2,6 @@ actionTests:
 - action: create-workflow
   inputPath: testdata/cronworkflow.yaml
   expectedOutputPath: testdata/workflow.yaml
+- action: create-workflow
+  inputPath: testdata/cronworkflow-without-label.yaml
+  expectedOutputPath: testdata/workflow-without-label.yaml
diff --git a/resource_customizations/argoproj.io/CronWorkflow/actions/create-workflow/action.lua b/resource_customizations/argoproj.io/CronWorkflow/actions/create-workflow/action.lua
index 35f7a66b80413..85470525b60b2 100644
--- a/resource_customizations/argoproj.io/CronWorkflow/actions/create-workflow/action.lua
+++ b/resource_customizations/argoproj.io/CronWorkflow/actions/create-workflow/action.lua
@@ -50,7 +50,7 @@ if (obj.spec.workflowMetadata ~= nil) then
     end
 end
 workflow.metadata.labels["workflows.argoproj.io/cron-workflow"] = obj.metadata.name
-if (obj.metadata.labels["workflows.argoproj.io/controller-instanceid"] ~= nil) then
+if (obj.metadata.labels ~= nil and obj.metadata.labels["workflows.argoproj.io/controller-instanceid"] ~= nil) then
     workflow.metadata.labels["workflows.argoproj.io/controller-instanceid"] = obj.metadata.labels["workflows.argoproj.io/controller-instanceid"]
 end
 workflow.metadata.annotations["workflows.argoproj.io/scheduled-time"] = os.date("!%Y-%m-%dT%d:%H:%MZ")
diff --git a/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/cronworkflow-without-label.yaml b/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/cronworkflow-without-label.yaml
new file mode 100644
index 0000000000000..a9f9e2ed8d5c0
--- /dev/null
+++ b/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/cronworkflow-without-label.yaml
@@ -0,0 +1,31 @@
+apiVersion: argoproj.io/v1alpha1
+kind: CronWorkflow
+metadata:
+  annotations:
+    cronworkflows.argoproj.io/last-used-schedule: CRON_TZ=America/Los_Angeles * * * * *
+  name: hello-world
+  namespace: default
+spec:
+  concurrencyPolicy: Replace
+  failedJobsHistoryLimit: 4
+  schedule: '* * * * *'
+  startingDeadlineSeconds: 0
+  successfulJobsHistoryLimit: 4
+  suspend: true
+  timezone: America/Los_Angeles
+  workflowSpec:
+    entrypoint: whalesay
+    templates:
+      - container:
+          args:
+            - "\U0001F553 hello world. Scheduled on: {{workflow.scheduledTime}}"
+          command:
+            - cowsay
+          image: 'docker/whalesay:latest'
+        name: whalesay
+  workflowMetadata:
+    labels:
+      example: test
+    annotations:
+      another-example: another-test
+    finalizers: [test-finalizer]
diff --git a/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/workflow-without-label.yaml b/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/workflow-without-label.yaml
new file mode 100644
index 0000000000000..1d20bc0d72a6a
--- /dev/null
+++ b/resource_customizations/argoproj.io/CronWorkflow/actions/testdata/workflow-without-label.yaml
@@ -0,0 +1,26 @@
+- k8sOperation: create
+  unstructuredObj:
+    apiVersion: argoproj.io/v1alpha1
+    kind: Workflow
+    metadata:
+      annotations:
+        another-example: another-test
+      labels:
+        example: test
+      name: hello-world-202306221736
+      namespace: default
+      ownerReferences:
+        - apiVersion: argoproj.io/v1alpha1
+          kind: CronWorkflow
+          name: hello-world
+    finalizers: [test-finalizer]
+    spec:
+      entrypoint: whalesay
+      templates:
+        - container:
+            args:
+              - "\U0001F553 hello world. Scheduled on: {{workflow.scheduledTime}}"
+            command:
+              - cowsay
+            image: 'docker/whalesay:latest'
+          name: whalesay