Merge remote-tracking branch 'upstream/main' into ss/api-keys

Author: Shivs11

Makefile

@@ -152,7 +152,7 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	GOWORK=off GO111MODULE=on $(CONTROLLER_GEN) rbac:roleName=manager-role crd:allowDangerousTypes=true,maxDescLen=0,generateEmbeddedObjectMeta=true webhook paths=./api/... paths=./internal/... paths=./cmd/... \
-    output:crd:artifacts:config=helm/temporal-worker-controller/templates/crds
+    output:crd:artifacts:config=helm/temporal-worker-controller/crds
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -268,11 +268,11 @@ endif
 
 .PHONY: install
 install: manifests ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUBECTL) apply --context $(K8S_CONTEXT) -f helm/temporal-worker-controller/templates/crds
+	$(KUBECTL) apply --context $(K8S_CONTEXT) -f helm/temporal-worker-controller/crds
 
 .PHONY: uninstall
 uninstall: manifests ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUBECTL) delete --context $(K8S_CONTEXT) --ignore-not-found=$(ignore-not-found) -f helm/temporal-worker-controller/templates/crds
+	$(KUBECTL) delete --context $(K8S_CONTEXT) --ignore-not-found=$(ignore-not-found) -f helm/temporal-worker-controller/crds
 
 .PHONY: deploy
 deploy: manifests helm ## Deploy controller to the K8s cluster specified in ~/.kube/config.

README.md

@@ -74,7 +74,8 @@ When you update the image, the controller automatically:
 
 ### Prerequisites
 
-- Kubernetes cluster (1.19+) 
+- Kubernetes cluster (1.19+)
+- Helm [v3.0+](https://github.com/helm/helm/releases) if deploying via our Helm chart
 - [Temporal Server](https://docs.temporal.io/) (Cloud or self-hosted [v1.28.1](https://github.com/temporalio/temporal/releases/tag/v1.28.1))
 - Basic familiarity with Temporal [Workers](https://docs.temporal.io/workers), [Workflows](https://docs.temporal.io/workflows), and [Worker Versioning](https://docs.temporal.io/production-deployment/worker-deployments/worker-versioning)
 

docs/configuration.md

@@ -182,35 +182,6 @@ rollout:
       pauseDuration: 5m
   gate:
     workflowType: "HealthCheck"
-    input: |
-      {
-        "version": "{{.Version}}",
-        "environment": "production"
-      }
-    timeout: 300s
-```
-
-### Gate Workflow Examples
-
-**Simple Health Check:**
-```yaml
-gate:
-  workflowType: "HealthCheck"
-  timeout: 60s
-```
-
-**Complex Validation with Input:**
-```yaml
-gate:
-  workflowType: "ValidationWorkflow"
-  input: |
-    {
-      "deploymentName": "{{.DeploymentName}}",
-      "buildId": "{{.BuildId}}",
-      "rampPercentage": {{.RampPercentage}},
-      "environment": "{{.Environment}}"
-    }
-  timeout: 600s
 ```
 
 ## Advanced Configuration
@@ -240,7 +211,6 @@ spec:
         pauseDuration: 45m
     gate:
       workflowType: "ProductionHealthCheck"
-      timeout: 300s
   sunset:
     scaledownDelay: 2h
     deleteDelay: 48h

helm/temporal-worker-controller/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: temporal-worker-controller
 description: A Helm chart for the Temporal Worker Controller
 type: application
-version: 0.8.0
-appVersion: 1.0.0
+version: 0.9.0
+appVersion: 1.0.2

helm/temporal-worker-controller/templates/crds/temporal.io_temporalconnections.yaml renamed to helm/temporal-worker-controller/crds/temporal.io_temporalconnections.yaml

@@ -113,7 +113,7 @@ func setupTestEnvironment(t *testing.T) (*rest.Config, client.Client, manager.Ma
 	t.Log("bootstrapping test environment")
 	testEnv := &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join(getRepoRoot(t), "helm", "temporal-worker-controller", "templates", "crds"),
+			filepath.Join(getRepoRoot(t), "helm", "temporal-worker-controller", "crds"),
 		},
 		ErrorIfCRDPathMissing: true,
 	}