rebase

Author: carlydf

.github/workflows/linters.yml

@@ -15,6 +15,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
+          cache: true
 
       - name: lint actions
         run: |
@@ -33,6 +34,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
+          cache: true
 
       - name: format golang import statements
         run: |
@@ -58,6 +60,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
+          cache: true
 
       - name: lint code
         run: |
@@ -72,12 +75,29 @@ jobs:
             exit 1
           fi
 
+  go-vet:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Run go vet
+        run: go vet ./...
+
   linters-succeed:
     name: All Linters Succeed
     needs:
       - lint-actions
       - fmt-imports
       - golangci
+      - go-vet
     runs-on: ubuntu-latest
     if: always()
     env:

.github/workflows/test-integration.yml

@@ -61,11 +61,17 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-      
+
+    - name: setup go workspace
+      run: go work init && go work use -r .
+
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
       with:
-        go-version-file: 'go.mod'
+        go-version-file: go.work
+        cache-dependency-path: |
+          go.work.sum
+          **/go.sum
         check-latest: true
         cache: true
 
@@ -115,11 +121,17 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+
+    - name: setup go workspace
+      run: go work init && go work use -r .
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
       with:
-        go-version-file: 'go.mod'
+        go-version-file: go.work
+        cache-dependency-path: |
+          go.work.sum
+          **/go.sum
         check-latest: true
         cache: true
 
@@ -144,24 +156,3 @@ jobs:
           cover.out
           bin/
         retention-days: 7 
-
-  go-vet:
-    name: Run Go Vet
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: 'go.mod'
-        check-latest: true
-        cache: true
-        
-    - name: Download dependencies
-      run: go mod download
-      
-    - name: Run go vet
-      run: go vet ./...

.gitignore

@@ -12,4 +12,7 @@ certs
 cover.out
 
 .claude
-config
+configinternal/demo/worker
+internal/demo/helloworld/worker
+go.work
+go.work.sum

cmd/main.go

@@ -121,10 +121,12 @@ func main() {
 		setupLog.Error(nil, "POD_NAMESPACE environment variable must be set")
 		os.Exit(1)
 	}
-	if os.Getenv(controller.IdentityEnvKey) == "" {
+
+	if os.Getenv(controller.IdentityPrefixEnvKey) == "" {
 		setupLog.Error(nil, "CONTROLLER_IDENTITY environment variable must be set")
 		os.Exit(1)
 	}
+
 	var ns corev1.Namespace
 	if err := mgr.GetAPIReader().Get(context.Background(), types.NamespacedName{Name: podNamespace}, &ns); err != nil {
 		setupLog.Error(err, "unable to fetch namespace UID for controller identity suffix")

go.work

@@ -211,7 +211,7 @@ func (r *TemporalWorkerDeploymentReconciler) claimManagerIdentity(
 		// This should never happen, but this is the extra fallback in case somehow
 		// the check in main() and Reconcile() are not sufficient.
 		return errors.New(fmt.Sprintf("%s and %s are not set; refusing to call SetManagerIdentity to avoid clearing the manager identity field",
-			IdentityEnvKey, IdentitySuffixEnvKey))
+			IdentityPrefixEnvKey, IdentitySuffixEnvKey))
 	}
 	resp, err := deploymentHandler.SetManagerIdentity(ctx, sdkclient.WorkerDeploymentSetManagerIdentityOptions{
 		Self:          true,

go.work.sum

@@ -28,7 +28,7 @@ var k8sClient client.Client
 var testEnv *envtest.Environment
 
 func TestMain(m *testing.M) {
-	_ = os.Setenv(IdentityEnvKey, "test-controller-identity")
+	_ = os.Setenv(IdentityPrefixEnvKey, "test-controller-identity")
 	_ = os.Setenv(IdentitySuffixEnvKey, "123")
 	os.Exit(m.Run())
 }

internal/controller/execplan.go

@@ -35,7 +35,7 @@ const (
 	VersionMetadataKey  = "temporal.io/controller-version"
 
 	VersionEnvKey                                    = "CONTROLLER_VERSION"
-	IdentityEnvKey                                   = "CONTROLLER_IDENTITY"
+	IdentityPrefixEnvKey                             = "CONTROLLER_IDENTITY"
 	IdentitySuffixEnvKey                             = "CONTROLLER_IDENTITY_SUFFIX"
 	MaxDeploymentVersionsIneligibleForDeletionEnvKey = "CONTROLLER_MAX_DEPLOYMENT_VERSIONS_INELIGIBLE_FOR_DELETION"
 
@@ -61,7 +61,7 @@ func getControllerVersion() string {
 // getDeprecatedControllerIdentity is used for smooth identity reclamation when rolling
 // forward to the new identity format.
 func getDeprecatedControllerIdentity() string {
-	if identity := os.Getenv(IdentityEnvKey); identity != "" {
+	if identity := os.Getenv(IdentityPrefixEnvKey); identity != "" {
 		return identity
 	}
 	return defaults.DeprecatedDefaultControllerIdentity
@@ -70,7 +70,7 @@ func getDeprecatedControllerIdentity() string {
 // getControllerIdentity returns the identity with controller env var and namespace uid suffix.
 // Presence of both are ensured by main() and in Reconcile() for users of the controller as a library.
 func getControllerIdentity() string {
-	id := os.Getenv(IdentityEnvKey)
+	id := os.Getenv(IdentityPrefixEnvKey)
 	suffix := os.Getenv(IdentitySuffixEnvKey)
 	if id != "" && suffix != "" {
 		return id + "/" + suffix

internal/controller/suite_test.go

@@ -140,7 +140,7 @@ func (r *TemporalWorkerDeploymentReconciler) Reconcile(ctx context.Context, req
 	// faster feedback in normal Helm-based deployments.
 	if getControllerIdentity() == "" {
 		return ctrl.Result{}, errors.New(fmt.Sprintf("%s and %s are not set",
-			IdentityEnvKey, IdentitySuffixEnvKey))
+			IdentityPrefixEnvKey, IdentitySuffixEnvKey))
 	}
 
 	l.V(1).Info("Running Reconcile loop")