From 0bb53cb05e8fbfc8896048728950f3a9cf3a58ae Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Mon, 6 Feb 2023 17:34:18 -0600
Subject: [PATCH 01/11] bumping go version to 1.19

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml             | 10 +++++-----
 .github/workflows/codeql-analysis.yml    |  2 +-
 .github/workflows/upgrade_automation.yml |  2 +-
 go.mod                                   |  2 +-
 go.sum                                   |  2 --
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 8a4b0f64f..01806de50 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -14,7 +14,7 @@ jobs:
     name: Lint
     uses: flyteorg/flytetools/.github/workflows/lint.yml@master
     with:
-      go-version: 1.18
+      go-version: 1.19
 
   tests:
     name: Unit Tests
@@ -22,7 +22,7 @@ jobs:
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
-      go-version: 1.18
+      go-version: l.19
 
   docker-build:
     name: Docker Build Images
@@ -42,13 +42,13 @@ jobs:
     uses: flyteorg/flytetools/.github/workflows/integration.yml@master
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
-      go-version: 1.18
+      go-version: 1.19
 
   generate:
     name: Check Go Generate
     uses: flyteorg/flytetools/.github/workflows/go_generate.yml@master
     with:
-      go-version: 1.18
+      go-version: 1.19
 
   bump_version:
     name: Bump Version
@@ -63,7 +63,7 @@ jobs:
     needs: [ bump_version ] # Only to ensure it can successfully build
     uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master
     with:
-      go-version: 1.18
+      go-version: 1.19
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index af39d7554..8a4993b58 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: '1.18'
+        go-version: '1.19'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/upgrade_automation.yml b/.github/workflows/upgrade_automation.yml
index 83e933d07..6d1ea4163 100644
--- a/.github/workflows/upgrade_automation.yml
+++ b/.github/workflows/upgrade_automation.yml
@@ -16,6 +16,6 @@ jobs:
     uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@master
     with:
       component: ${{ github.event.inputs.component }}
-      go-version: 1.18
+      go-version: 1.19
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
diff --git a/go.mod b/go.mod
index c62ed1934..3fafafbb5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flyteorg/flytepropeller
 
-go 1.18
+go 1.19
 
 require (
 	github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295
diff --git a/go.sum b/go.sum
index e7dd229f6..44a889647 100644
--- a/go.sum
+++ b/go.sum
@@ -300,8 +300,6 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flyteorg/flyteidl v1.3.2 h1:s4DC8go2ou5LtZ+CFcS31r0mhv3baelNV81C1KZS26U=
-github.com/flyteorg/flyteidl v1.3.2/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU=
 github.com/flyteorg/flyteidl v1.3.4 h1:vbbusPDa25wvH2C2s1ODhv7vdwbl5T+T21/8U30n6CE=
 github.com/flyteorg/flyteidl v1.3.4/go.mod h1:OJAq333OpInPnMhvVz93AlEjmlQ+t0FAD4aakIYE4OU=
 github.com/flyteorg/flyteplugins v1.0.28 h1:w9XeA3NKMSoOyKKVPdkGi5u64p77sIhRTICOCFDvHTc=

From d73885a61e1c40a54047856cd48c33278673461d Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Mon, 6 Feb 2023 19:49:13 -0600
Subject: [PATCH 02/11] fixed linter

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 manager/doc.go                        |  2 +-
 pkg/compiler/builders.go              |  2 +-
 pkg/compiler/workflow_compiler.go     | 48 ++++++++++-----------
 pkg/controller/composite_workqueue.go |  8 ++--
 pkg/controller/config/config.go       | 61 ++++++++++++++-------------
 pkg/controller/controller.go          |  2 +-
 pkg/controller/handler.go             | 25 +++++------
 pkg/controller/nodes/executor.go      | 16 +++----
 pkg/webhook/pod.go                    | 28 ++++++------
 9 files changed, 98 insertions(+), 94 deletions(-)

diff --git a/manager/doc.go b/manager/doc.go
index 2afdcb148..648b2079a 100644
--- a/manager/doc.go
+++ b/manager/doc.go
@@ -16,7 +16,7 @@ FlytePropeller Manager is configured at the root of the FlytePropeller configurt
 
 FlytePropeller Manager handles dynamic updates to both the k8s PodTemplate and shard configuration. The k8s PodTemplate resource has an associated resource version which uniquely identifies changes. Additionally, shard configuration modifications may be tracked using a simple hash. Flyte stores these values as annotations on managed FlytePropeller instances. Therefore, if either of there values change the FlytePropeller Manager instance will detect it and perform the necessary deployment updates.
 
-Shard Strategies
+# Shard Strategies
 
 Flyte defines a variety of Shard Strategies for configuring how FlyteWorkflows are sharded. These options may include the shard type (ex. hash, project, or domain) along with the number of shards or the distribution of project / domain IDs over shards.
 
diff --git a/pkg/compiler/builders.go b/pkg/compiler/builders.go
index e71d2c8a6..6fe2b805a 100755
--- a/pkg/compiler/builders.go
+++ b/pkg/compiler/builders.go
@@ -7,7 +7,7 @@ import (
 	c "github.com/flyteorg/flytepropeller/pkg/compiler/common"
 )
 
-type flyteTask = core.TaskTemplate
+type flyteTask = core.TaskTemplate //nolint:unused
 type flyteWorkflow = core.CompiledWorkflow
 type flyteNode = core.Node
 
diff --git a/pkg/compiler/workflow_compiler.go b/pkg/compiler/workflow_compiler.go
index 332871215..cfcb08f6b 100755
--- a/pkg/compiler/workflow_compiler.go
+++ b/pkg/compiler/workflow_compiler.go
@@ -5,30 +5,30 @@
 // 2) Call CompileWorkflow(...) and make sure it reports no errors.
 // 3) Use one of the transformer packages (e.g. transformer/k8s) to build the final executable workflow.
 //
-//                 +-------------------+
-//                 | start(StartNode)  |
-//                 +-------------------+
-//                   |
-//                   | wf_input
-//                   v
-//  +--------+     +-------------------+
-//  | static | --> | node_1(TaskNode)  |
-//  +--------+     +-------------------+
-//    |              |
-//    |              | x
-//    |              v
-//    |            +-------------------+
-//    +----------> | node_2(TaskNode)  |
-//                 +-------------------+
-//                   |
-//                   | n2_output
-//                   v
-//                 +-------------------+
-//                 |   end(EndNode)    |
-//                 +-------------------+
-//                 +-------------------+
-//                 | Workflow Id: repo |
-//                 +-------------------+
+//	               +-------------------+
+//	               | start(StartNode)  |
+//	               +-------------------+
+//	                 |
+//	                 | wf_input
+//	                 v
+//	+--------+     +-------------------+
+//	| static | --> | node_1(TaskNode)  |
+//	+--------+     +-------------------+
+//	  |              |
+//	  |              | x
+//	  |              v
+//	  |            +-------------------+
+//	  +----------> | node_2(TaskNode)  |
+//	               +-------------------+
+//	                 |
+//	                 | n2_output
+//	                 v
+//	               +-------------------+
+//	               |   end(EndNode)    |
+//	               +-------------------+
+//	               +-------------------+
+//	               | Workflow Id: repo |
+//	               +-------------------+
 package compiler
 
 import (
diff --git a/pkg/controller/composite_workqueue.go b/pkg/controller/composite_workqueue.go
index 260b504be..6d0f85c57 100644
--- a/pkg/controller/composite_workqueue.go
+++ b/pkg/controller/composite_workqueue.go
@@ -14,10 +14,10 @@ import (
 )
 
 // A CompositeWorkQueue can be used in cases where the work is enqueued by two sources. It can be enqueued by either
-// 1. Informer for the Primary Object itself. In case of FlytePropeller, this is the workflow object
-// 2. Informer or any other process that enqueues the top-level object for re-evaluation in response to one of the
-//    sub-objects being ready. In the case of FlytePropeller this is the "Node/Task" updates, will re-enqueue the workflow
-//    to be re-evaluated
+//  1. Informer for the Primary Object itself. In case of FlytePropeller, this is the workflow object
+//  2. Informer or any other process that enqueues the top-level object for re-evaluation in response to one of the
+//     sub-objects being ready. In the case of FlytePropeller this is the "Node/Task" updates, will re-enqueue the workflow
+//     to be re-evaluated
 type CompositeWorkQueue interface {
 	workqueue.RateLimitingInterface
 	// Specialized interface that should be called to start the migration of work from SubQueue to primaryQueue
diff --git a/pkg/controller/config/config.go b/pkg/controller/config/config.go
index 769075124..7589c6aac 100644
--- a/pkg/controller/config/config.go
+++ b/pkg/controller/config/config.go
@@ -1,33 +1,36 @@
-// Package config contains the core configuration for FlytePropeller. This configuration can be added under the ``propeller`` section.
-//  Example config:
+// Package config contains the core configuration for FlytePropeller. This configuration can be added under the “propeller“ section.
+//
+//	Example config:
+//
 // ----------------
-//  propeller:
-//     rawoutput-prefix: s3://my-container/test/
-//     metadata-prefix: metadata/propeller/sandbox
-//     workers: 4
-//     workflow-reeval-duration: 10s
-//     downstream-eval-duration: 5s
-//     limit-namespace: "all"
-//     prof-port: 11254
-//     metrics-prefix: flyte
-//     enable-admin-launcher: true
-//     max-ttl-hours: 1
-//     gc-interval: 500m
-//     queue:
-//       type: batch
-//       queue:
-//         type: bucket
-//         rate: 1000
-//         capacity: 10000
-//       sub-queue:
-//         type: bucket
-//         rate: 1000
-//         capacity: 10000
-//     # This config assumes using `make start` in flytesnacks repo to startup a DinD k3s container
-//     kube-config: "$HOME/kubeconfig/k3s/k3s.yaml"
-//     publish-k8s-events: true
-//     workflowStore:
-//       policy: "ResourceVersionCache"
+//
+//	propeller:
+//	   rawoutput-prefix: s3://my-container/test/
+//	   metadata-prefix: metadata/propeller/sandbox
+//	   workers: 4
+//	   workflow-reeval-duration: 10s
+//	   downstream-eval-duration: 5s
+//	   limit-namespace: "all"
+//	   prof-port: 11254
+//	   metrics-prefix: flyte
+//	   enable-admin-launcher: true
+//	   max-ttl-hours: 1
+//	   gc-interval: 500m
+//	   queue:
+//	     type: batch
+//	     queue:
+//	       type: bucket
+//	       rate: 1000
+//	       capacity: 10000
+//	     sub-queue:
+//	       type: bucket
+//	       rate: 1000
+//	       capacity: 10000
+//	   # This config assumes using `make start` in flytesnacks repo to startup a DinD k3s container
+//	   kube-config: "$HOME/kubeconfig/k3s/k3s.yaml"
+//	   publish-k8s-events: true
+//	   workflowStore:
+//	     policy: "ResourceVersionCache"
 package config
 
 import (
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index a2a6a432a..ce6a28102 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -131,7 +131,7 @@ func (c *Controller) run(ctx context.Context) error {
 }
 
 // Called from leader elector -if configured- to start running as the leader.
-func (c *Controller) onStartedLeading(ctx context.Context) {
+func (c *Controller) onStartedLeading(_ context.Context) {
 	ctx, cancelNow := context.WithCancel(context.Background())
 	logger.Infof(ctx, "Acquired leader lease.")
 	go func() {
diff --git a/pkg/controller/handler.go b/pkg/controller/handler.go
index fed7ba622..a16755787 100644
--- a/pkg/controller/handler.go
+++ b/pkg/controller/handler.go
@@ -163,18 +163,19 @@ func (p *Propeller) TryMutateWorkflow(ctx context.Context, originalW *v1alpha1.F
 // The return value should be an error, in the case, we wish to retry this workflow
 // <pre>
 //
-//     +--------+        +---------+        +------------+     +---------+
-//     |        |        |         |        |            |     |         |
-//     | Ready  +--------> Running +--------> Succeeding +-----> Success |
-//     |        |        |         |        |            |     |         |
-//     +--------+        +---------+        +------------+     +---------+
-//         |                  |
-//         |                  |
-//         |             +----v----+        +---------------------+        +--------+
-//         |             |         |        |     (optional)      |        |        |
-//         +-------------> Failing +--------> HandlingFailureNode +--------> Failed |
-//                       |         |        |                     |        |        |
-//                       +---------+        +---------------------+        +--------+
+//	+--------+        +---------+        +------------+     +---------+
+//	|        |        |         |        |            |     |         |
+//	| Ready  +--------> Running +--------> Succeeding +-----> Success |
+//	|        |        |         |        |            |     |         |
+//	+--------+        +---------+        +------------+     +---------+
+//	    |                  |
+//	    |                  |
+//	    |             +----v----+        +---------------------+        +--------+
+//	    |             |         |        |     (optional)      |        |        |
+//	    +-------------> Failing +--------> HandlingFailureNode +--------> Failed |
+//	                  |         |        |                     |        |        |
+//	                  +---------+        +---------------------+        +--------+
+//
 // </pre>
 func (p *Propeller) Handle(ctx context.Context, namespace, name string) error {
 	logger.Infof(ctx, "Processing Workflow.")
diff --git a/pkg/controller/nodes/executor.go b/pkg/controller/nodes/executor.go
index 20a4bcdbd..12ca14425 100644
--- a/pkg/controller/nodes/executor.go
+++ b/pkg/controller/nodes/executor.go
@@ -6,14 +6,14 @@
 // to the respective node handlers
 //
 // Available node handlers are
-// - Task: Arguably the most important handler as it handles all tasks. These include all plugins. The goal of the workflow is
-//         is to run tasks, thus every workflow will contain atleast one TaskNode (except for the case, where the workflow
-//          is purely a meta-workflow and can run other workflows
-// - SubWorkflow: This is one of the most important handlers. It can execute Workflows that are nested inside a workflow
-// - DynamicTask Handler: This is just a decorator on the Task Handler. It handles cases, in which the Task returns a futures
-//                        file. Every Task is actually executed through the DynamicTaskHandler
-// - Branch Handler: This handler is used to execute branches
-// - Start & End Node handler: these are nominal handlers for the start and end node and do no really carry a lot of logic
+//   - Task: Arguably the most important handler as it handles all tasks. These include all plugins. The goal of the workflow is
+//     is to run tasks, thus every workflow will contain atleast one TaskNode (except for the case, where the workflow
+//     is purely a meta-workflow and can run other workflows
+//   - SubWorkflow: This is one of the most important handlers. It can execute Workflows that are nested inside a workflow
+//   - DynamicTask Handler: This is just a decorator on the Task Handler. It handles cases, in which the Task returns a futures
+//     file. Every Task is actually executed through the DynamicTaskHandler
+//   - Branch Handler: This handler is used to execute branches
+//   - Start & End Node handler: these are nominal handlers for the start and end node and do no really carry a lot of logic
 package nodes
 
 import (
diff --git a/pkg/webhook/pod.go b/pkg/webhook/pod.go
index 2657bfb32..29ee88c5a 100644
--- a/pkg/webhook/pod.go
+++ b/pkg/webhook/pod.go
@@ -1,29 +1,29 @@
 // The PodMutator is a controller-runtime webhook that intercepts Pod Creation events and mutates them. Currently, there
 // is only one registered Mutator, that's the SecretsMutator. It works as follows:
 //
-//  -  The Webhook only works on Pods. If propeller/plugins launch a resource outside of K8s (or in a separate k8s
+//   - The Webhook only works on Pods. If propeller/plugins launch a resource outside of K8s (or in a separate k8s
 //     cluster), it's the responsibility of the plugin to correctly pass secret injection information.
-//  -  When a k8s-plugin builds a resource, propeller's PluginManager will automatically inject a label `inject-flyte
+//   - When a k8s-plugin builds a resource, propeller's PluginManager will automatically inject a label `inject-flyte
 //     -secrets: true` and serialize the secret injection information into the annotations.
-//  -  If a plugin does not use the K8sPlugin interface, it's its responsibility to pass secret injection information.
-//  -  If a k8s plugin creates a CRD that launches other Pods (e.g. Spark/PyTorch... etc.), it's its responsibility to
+//   - If a plugin does not use the K8sPlugin interface, it's its responsibility to pass secret injection information.
+//   - If a k8s plugin creates a CRD that launches other Pods (e.g. Spark/PyTorch... etc.), it's its responsibility to
 //     make sure the labels/annotations set on the CRD by PluginManager are propagated to those launched Pods. This
 //     ensures secret injection happens no matter how many levels of indirections there are.
-//  -  The Webhook expects 'inject-flyte-secrets: true' as a label on the Pod. Otherwise it won't listen/observe that pod.
-//  -  Once it intercepts the admission request, it goes over all registered Mutators and invoke them in the order they
+//   - The Webhook expects 'inject-flyte-secrets: true' as a label on the Pod. Otherwise it won't listen/observe that pod.
+//   - Once it intercepts the admission request, it goes over all registered Mutators and invoke them in the order they
 //     are registered as. If a Mutator fails and it's marked as `required`, the operation will fail and the admission
 //     will be rejected.
-//  -  The SecretsMutator will attempt to lookup the requested secret from the process environment. If the secret is
+//   - The SecretsMutator will attempt to lookup the requested secret from the process environment. If the secret is
 //     already mounted, it'll inject it as plain-text into the Pod Spec (Less secure).
-//  -  If it's not found in the environment it'll, instead, fallback to the enabled Secrets Injector (K8s, Confidant,
+//   - If it's not found in the environment it'll, instead, fallback to the enabled Secrets Injector (K8s, Confidant,
 //     Vault... etc.).
-//  -  Each SecretsInjector will mutate the Pod differently depending on how its backend secrets system injects the secrets
+//   - Each SecretsInjector will mutate the Pod differently depending on how its backend secrets system injects the secrets
 //     for example:
-//      - For K8s secrets, it'll either add EnvFromSecret or VolumeMountSource (depending on the MountRequirement
-//        stated in the flyteIdl.Secret object) into the Pod. There is no validation that the secret exist and is available
-//        to the Pod at this point. If the secret is not accessible, the Pod will fail with ContainerCreationConfigError and
-//        will be retried.
-//      - For Vault secrets, it'll inject the right annotations to trigger Vault's own sidecar/webhook to mount the secret.
+//   - For K8s secrets, it'll either add EnvFromSecret or VolumeMountSource (depending on the MountRequirement
+//     stated in the flyteIdl.Secret object) into the Pod. There is no validation that the secret exist and is available
+//     to the Pod at this point. If the secret is not accessible, the Pod will fail with ContainerCreationConfigError and
+//     will be retried.
+//   - For Vault secrets, it'll inject the right annotations to trigger Vault's own sidecar/webhook to mount the secret.
 package webhook
 
 import (

From 8844a47fc5e0fa24e9902a833ffa34a542ec4c9f Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Mon, 6 Feb 2023 20:01:55 -0600
Subject: [PATCH 03/11] bumping setup-go action

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8a4993b58..6e1f0c511 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,9 +38,9 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: '1.19'
 

From e95cb934e07561a3bebb4adcfbca4415c16beedb Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Mon, 6 Feb 2023 20:19:52 -0600
Subject: [PATCH 04/11] using different flytetools branch

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml             | 18 +++++++++---------
 .github/workflows/upgrade_automation.yml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 01806de50..75d185cf7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -12,13 +12,13 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: flyteorg/flytetools/.github/workflows/lint.yml@master
+    uses: flyteorg/flytetools/.github/workflows/lint.yml@housekeeping/bump-go-version
     with:
       go-version: 1.19
 
   tests:
     name: Unit Tests
-    uses: flyteorg/flytetools/.github/workflows/tests.yml@master
+    uses: flyteorg/flytetools/.github/workflows/tests.yml@housekeeping/bump-go-version
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
@@ -26,12 +26,12 @@ jobs:
 
   docker-build:
     name: Docker Build Images
-    uses: flyteorg/flytetools/.github/workflows/docker_build.yml@master
+    uses: flyteorg/flytetools/.github/workflows/docker_build.yml@housekeeping/bump-go-version
 
   endtoend:
     name: End2End Test
     needs: [ docker-build ]
-    uses: flyteorg/flytetools/.github/workflows/end2end.yml@master
+    uses: flyteorg/flytetools/.github/workflows/end2end.yml@housekeeping/bump-go-version
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
       priorities: "P0"
@@ -39,14 +39,14 @@ jobs:
   integration:
     name: Integration Test
     needs: [ docker-build ]
-    uses: flyteorg/flytetools/.github/workflows/integration.yml@master
+    uses: flyteorg/flytetools/.github/workflows/integration.yml@housekeeping/bump-go-version
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
       go-version: 1.19
 
   generate:
     name: Check Go Generate
-    uses: flyteorg/flytetools/.github/workflows/go_generate.yml@master
+    uses: flyteorg/flytetools/.github/workflows/go_generate.yml@housekeeping/bump-go-version
     with:
       go-version: 1.19
 
@@ -54,14 +54,14 @@ jobs:
     name: Bump Version
     if: ${{ github.event_name != 'pull_request' }}
     needs: [ endtoend,  integration, lint, tests, generate ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/bump_version.yml@master
+    uses: flyteorg/flytetools/.github/workflows/bump_version.yml@housekeeping/bump-go-version
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
 
   goreleaser:
     name: Goreleaser
     needs: [ bump_version ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master
+    uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@housekeeping/bump-go-version
     with:
       go-version: 1.19
     secrets:
@@ -70,7 +70,7 @@ jobs:
   push_docker_image:
     name: Build & Push Flytepropeller Image
     needs: [ bump_version ]
-    uses: flyteorg/flytetools/.github/workflows/publish.yml@master
+    uses: flyteorg/flytetools/.github/workflows/publish.yml@housekeeping/bump-go-version
     with:
       version: ${{ needs.bump_version.outputs.version }}
       dockerfile: Dockerfile
diff --git a/.github/workflows/upgrade_automation.yml b/.github/workflows/upgrade_automation.yml
index 6d1ea4163..7804085cc 100644
--- a/.github/workflows/upgrade_automation.yml
+++ b/.github/workflows/upgrade_automation.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   trigger-upgrade:
     name: ${{ github.event.inputs.component }} Upgrade
-    uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@master
+    uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@housekeeping/bump-go-version
     with:
       component: ${{ github.event.inputs.component }}
       go-version: 1.19

From 8c0c81bce770d1a83eec61e95ed423f302e80637 Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 09:56:44 -0600
Subject: [PATCH 05/11] fixed go generate

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 manager/config/shardtype_enumer.go             | 1 -
 pkg/controller/nodes/handler/ephase_enumer.go  | 1 -
 pkg/webhook/config/kvversion_enumer.go         | 1 -
 pkg/webhook/config/secretmanagertype_enumer.go | 1 -
 4 files changed, 4 deletions(-)

diff --git a/manager/config/shardtype_enumer.go b/manager/config/shardtype_enumer.go
index 78ae145d8..2a3a7f8b1 100644
--- a/manager/config/shardtype_enumer.go
+++ b/manager/config/shardtype_enumer.go
@@ -1,6 +1,5 @@
 // Code generated by "enumer --type=ShardType --trimprefix=ShardType -json -yaml"; DO NOT EDIT.
 
-//
 package config
 
 import (
diff --git a/pkg/controller/nodes/handler/ephase_enumer.go b/pkg/controller/nodes/handler/ephase_enumer.go
index d574f93e0..4773825e5 100644
--- a/pkg/controller/nodes/handler/ephase_enumer.go
+++ b/pkg/controller/nodes/handler/ephase_enumer.go
@@ -1,6 +1,5 @@
 // Code generated by "enumer --type=EPhase --trimprefix=EPhase"; DO NOT EDIT.
 
-//
 package handler
 
 import (
diff --git a/pkg/webhook/config/kvversion_enumer.go b/pkg/webhook/config/kvversion_enumer.go
index f9ac3fc6e..7c60f3650 100644
--- a/pkg/webhook/config/kvversion_enumer.go
+++ b/pkg/webhook/config/kvversion_enumer.go
@@ -1,6 +1,5 @@
 // Code generated by "enumer --type=KVVersion --trimprefix=KVVersion -json -yaml"; DO NOT EDIT.
 
-//
 package config
 
 import (
diff --git a/pkg/webhook/config/secretmanagertype_enumer.go b/pkg/webhook/config/secretmanagertype_enumer.go
index 19d3979ed..ce33f910f 100644
--- a/pkg/webhook/config/secretmanagertype_enumer.go
+++ b/pkg/webhook/config/secretmanagertype_enumer.go
@@ -1,6 +1,5 @@
 // Code generated by "enumer --type=SecretManagerType --trimprefix=SecretManagerType -json -yaml"; DO NOT EDIT.
 
-//
 package config
 
 import (

From b4fef29ae2fab810df50665be0f654e20b564de9 Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 10:27:12 -0600
Subject: [PATCH 06/11] using master branch of flytetools

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml             | 18 +++++++++---------
 .github/workflows/upgrade_automation.yml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 75d185cf7..01806de50 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -12,13 +12,13 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: flyteorg/flytetools/.github/workflows/lint.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/lint.yml@master
     with:
       go-version: 1.19
 
   tests:
     name: Unit Tests
-    uses: flyteorg/flytetools/.github/workflows/tests.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/tests.yml@master
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
@@ -26,12 +26,12 @@ jobs:
 
   docker-build:
     name: Docker Build Images
-    uses: flyteorg/flytetools/.github/workflows/docker_build.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/docker_build.yml@master
 
   endtoend:
     name: End2End Test
     needs: [ docker-build ]
-    uses: flyteorg/flytetools/.github/workflows/end2end.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/end2end.yml@master
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
       priorities: "P0"
@@ -39,14 +39,14 @@ jobs:
   integration:
     name: Integration Test
     needs: [ docker-build ]
-    uses: flyteorg/flytetools/.github/workflows/integration.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/integration.yml@master
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
       go-version: 1.19
 
   generate:
     name: Check Go Generate
-    uses: flyteorg/flytetools/.github/workflows/go_generate.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/go_generate.yml@master
     with:
       go-version: 1.19
 
@@ -54,14 +54,14 @@ jobs:
     name: Bump Version
     if: ${{ github.event_name != 'pull_request' }}
     needs: [ endtoend,  integration, lint, tests, generate ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/bump_version.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/bump_version.yml@master
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
 
   goreleaser:
     name: Goreleaser
     needs: [ bump_version ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master
     with:
       go-version: 1.19
     secrets:
@@ -70,7 +70,7 @@ jobs:
   push_docker_image:
     name: Build & Push Flytepropeller Image
     needs: [ bump_version ]
-    uses: flyteorg/flytetools/.github/workflows/publish.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/publish.yml@master
     with:
       version: ${{ needs.bump_version.outputs.version }}
       dockerfile: Dockerfile
diff --git a/.github/workflows/upgrade_automation.yml b/.github/workflows/upgrade_automation.yml
index 7804085cc..6d1ea4163 100644
--- a/.github/workflows/upgrade_automation.yml
+++ b/.github/workflows/upgrade_automation.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   trigger-upgrade:
     name: ${{ github.event.inputs.component }} Upgrade
-    uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@housekeeping/bump-go-version
+    uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@master
     with:
       component: ${{ github.event.inputs.component }}
       go-version: 1.19

From d5de3c0b448e910b63fa72c35c9613ce845abe8a Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 10:33:14 -0600
Subject: [PATCH 07/11] removed secrets from unit tests

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 01806de50..2b8ec0db4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -19,8 +19,6 @@ jobs:
   tests:
     name: Unit Tests
     uses: flyteorg/flytetools/.github/workflows/tests.yml@master
-    secrets:
-      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
       go-version: l.19
 

From dffd1efbcfa675de139ed4f4f64f01db9658fcca Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 10:49:48 -0600
Subject: [PATCH 08/11] maybe surround go-version in quotes

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 2b8ec0db4..b8ca2c1b8 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -19,8 +19,10 @@ jobs:
   tests:
     name: Unit Tests
     uses: flyteorg/flytetools/.github/workflows/tests.yml@master
+    secrets:
+      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
-      go-version: l.19
+      go-version: 'l.19'
 
   docker-build:
     name: Docker Build Images

From 72c8977ac08ae61bf26b10f771be8f7986fee0e5 Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 11:19:03 -0600
Subject: [PATCH 09/11] specific 1.19.5 version

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b8ca2c1b8..c59a72797 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -22,7 +22,7 @@ jobs:
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
     with:
-      go-version: 'l.19'
+      go-version: l.19.5
 
   docker-build:
     name: Docker Build Images

From c9996bee7f3904634e285ed68720c8fab0b3f95d Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 12:04:42 -0600
Subject: [PATCH 10/11] moved go-version before secrets

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index c59a72797..3a6ad8848 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -14,15 +14,15 @@ jobs:
     name: Lint
     uses: flyteorg/flytetools/.github/workflows/lint.yml@master
     with:
-      go-version: 1.19
+      go-version: "1.19"
 
   tests:
     name: Unit Tests
     uses: flyteorg/flytetools/.github/workflows/tests.yml@master
+    with:
+      go-version: "l.19"
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-    with:
-      go-version: l.19.5
 
   docker-build:
     name: Docker Build Images
@@ -42,13 +42,13 @@ jobs:
     uses: flyteorg/flytetools/.github/workflows/integration.yml@master
     with:
       cache_key: ${{ needs.docker-build.outputs.cache_key }}
-      go-version: 1.19
+      go-version: "1.19"
 
   generate:
     name: Check Go Generate
     uses: flyteorg/flytetools/.github/workflows/go_generate.yml@master
     with:
-      go-version: 1.19
+      go-version: "1.19"
 
   bump_version:
     name: Bump Version
@@ -63,7 +63,7 @@ jobs:
     needs: [ bump_version ] # Only to ensure it can successfully build
     uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master
     with:
-      go-version: 1.19
+      go-version: "1.19"
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
 

From 37732c1384a126be6873e183ae9360270a31c950 Mon Sep 17 00:00:00 2001
From: Daniel Rammer <daniel@union.ai>
Date: Tue, 7 Feb 2023 12:06:01 -0600
Subject: [PATCH 11/11] OMG

Signed-off-by: Daniel Rammer <daniel@union.ai>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3a6ad8848..e1041998a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -20,7 +20,7 @@ jobs:
     name: Unit Tests
     uses: flyteorg/flytetools/.github/workflows/tests.yml@master
     with:
-      go-version: "l.19"
+      go-version: "1.19"
     secrets:
       FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}