diff --git a/Makefile b/Makefile index 65065f3e..7821dd39 100644 --- a/Makefile +++ b/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. @@ -253,11 +253,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. diff --git a/README.md b/README.md index 4ca21a2f..6c9c093f 100644 --- a/README.md +++ b/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) diff --git a/helm/temporal-worker-controller/templates/crds/temporal.io_temporalconnections.yaml b/helm/temporal-worker-controller/crds/temporal.io_temporalconnections.yaml similarity index 100% rename from helm/temporal-worker-controller/templates/crds/temporal.io_temporalconnections.yaml rename to helm/temporal-worker-controller/crds/temporal.io_temporalconnections.yaml diff --git a/helm/temporal-worker-controller/templates/crds/temporal.io_temporalworkerdeployments.yaml b/helm/temporal-worker-controller/crds/temporal.io_temporalworkerdeployments.yaml similarity index 100% rename from helm/temporal-worker-controller/templates/crds/temporal.io_temporalworkerdeployments.yaml rename to helm/temporal-worker-controller/crds/temporal.io_temporalworkerdeployments.yaml diff --git a/internal/tests/internal/env_helpers.go b/internal/tests/internal/env_helpers.go index f82aa4ff..c36507c5 100644 --- a/internal/tests/internal/env_helpers.go +++ b/internal/tests/internal/env_helpers.go @@ -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, }