turn unversioned Deployment into versioned TemporalWorkerDeployment

Author: carlydf

internal/demo/helloworld/temporal_worker_deployment.yaml

@@ -16,14 +16,8 @@ spec:
   rollout:
     strategy: Progressive
     steps:
-      # Increase traffic from 1% to 10% over 15 seconds
       - rampPercentage: 1
-        pauseDuration: 5s
-      - rampPercentage: 5
-        pauseDuration: 5s
-      - rampPercentage: 10
-        pauseDuration: 5s
-      # Increase traffic to 50% and wait 1 minute
+        pauseDuration: 30s
       - rampPercentage: 50
         pauseDuration: 1m
     gate:

internal/demo/helm/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v1
 name: demo-worker
 description: A Helm Chart Deploying a Minimalist Temporal Worker
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: "1.0.0"

internal/demo/helm/templates/worker.yaml

@@ -1,15 +1,30 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: temporal.io/v1alpha1
+kind: TemporalWorkerDeployment
 metadata:
   name: worker
   namespace: staging
   labels:
     app: worker
 spec:
+  # Configuration for connecting to Temporal
+  workerOptions:
+    connection: cloud-demo
+    temporalNamespace: "{{ .Values.temporal.namespace }}"
+
+  # How to roll out new workflow executions to the latest worker version
+  rollout:
+    strategy: Progressive
+    steps:
+      - rampPercentage: 1
+        pauseDuration: 30s
+      - rampPercentage: 50
+        pauseDuration: 1m
+    gate:
+      workflowType: "HelloWorld"
+  sunset:
+    scaledownDelay: 30s
+    deleteDelay: 1m
   replicas: 4
-  selector:
-    matchLabels:
-      app: worker
   template:
     metadata:
       labels:
@@ -22,20 +37,11 @@ spec:
           env:
             - name: TEMPORAL_TASK_QUEUE
               value: "{{ .Values.temporal.taskQueue }}"
-            - name: TEMPORAL_NAMESPACE
-              value: "{{ .Values.temporal.namespace }}"
-            - name: TEMPORAL_HOST_PORT
-              value: "{{ .Values.temporal.namespace }}.tmprl.cloud:7233"
-            - name: TEMPORAL_TLS_KEY_PATH
-              value: /etc/temporal/tls/tls.key
-            - name: TEMPORAL_TLS_CERT_PATH
-              value: /etc/temporal/tls/tls.crt
-          volumeMounts:
-            - mountPath: /etc/temporal/tls
-              name: temporal-tls
-              readOnly: true
-      volumes:
-        - name: temporal-tls
-          secret:
-            secretName: "{{ .Values.temporal.mTLSSecret }}"
-            defaultMode: 420
+---
+apiVersion: temporal.io/v1alpha1
+kind: TemporalConnection
+metadata:
+  name: cloud-demo
+spec:
+  hostPort: "{{ .Values.temporal.namespace }}.tmprl.cloud:7233"
+  mutualTLSSecret: "{{ .Values.temporal.mTLSSecret }}"

internal/demo/helm/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: helloworld
-  tag: v0.1.0 # unversioned worker, no DeploymentOptions
+  tag: v0.2.0 # versioned worker with DeploymentOptions
 
 temporal:
   namespace: worker-controller-demo.a2dd6

internal/demo/util/worker.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"go.temporal.io/sdk/worker"
+	"go.temporal.io/sdk/workflow"
 )
 
 func NewVersionedWorker(opts worker.Options) (w worker.Worker, stopFunc func()) {
@@ -25,17 +26,16 @@ func NewVersionedWorker(opts worker.Options) (w worker.Worker, stopFunc func())
 		}
 	}()
 
-	//opts.DeploymentOptions = worker.DeploymentOptions{
-	//	UseVersioning: true,
-	//	Version: worker.WorkerDeploymentVersion{
-	//		DeploymentName: mustGetEnv("TEMPORAL_DEPLOYMENT_NAME"),
-	//		BuildId:        mustGetEnv("WORKER_BUILD_ID"),
-	//	},
-	//	DefaultVersioningBehavior: workflow.VersioningBehaviorPinned,
-	//}
-
-	//c, stopClient := NewClient(mustGetEnv("WORKER_BUILD_ID"))
-	c, stopClient := NewClient("")
+	opts.DeploymentOptions = worker.DeploymentOptions{
+		UseVersioning: true,
+		Version: worker.WorkerDeploymentVersion{
+			DeploymentName: mustGetEnv("TEMPORAL_DEPLOYMENT_NAME"),
+			BuildId:        mustGetEnv("WORKER_BUILD_ID"),
+		},
+		DefaultVersioningBehavior: workflow.VersioningBehaviorPinned,
+	}
+
+	c, stopClient := NewClient(mustGetEnv("WORKER_BUILD_ID"))
 
 	w = worker.New(c, temporalTaskQueue, opts)