Merge pull request #2 from turkenf/fix-dockerfile

Fix directory name in Dockerfile

Makefile

@@ -112,9 +112,9 @@ CROSSPLANE_NAMESPACE = upbound-system
 # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test
 # - UPTEST_CLOUD_CREDENTIALS (optional), cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat ~/.aws/credentials)
 # - UPTEST_DATASOURCE_PATH (optional), see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
-uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
+uptest: $(UPTEST) $(KUBECTL) $(CHAINSAW) $(CROSSPLANE_CLI)
 	@$(INFO) running automated tests
-	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh || $(FAIL)
+	@KUBECTL=$(KUBECTL) CHAINSAW=$(CHAINSAW) CROSSPLANE_CLI=$(CROSSPLANE_CLI) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --skip-import || $(FAIL)
 	@$(OK) running automated tests
 
 local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)

README.md

@@ -120,7 +120,7 @@ configurable using `DeploymentRuntimeConfig`.
 ## Known limitations:
 
 * You must either use remote state or ensure the provider container's `/tf`
-  directory is not lost. `provider-opentofy` __does not persist state__;
+  directory is not lost. `provider-opentofu` __does not persist state__;
   consider using the [Kubernetes](https://opentofu.org/docs/language/settings/backends/kubernetes/) remote state backend.
 * If the module takes longer than the value of `--timeout` (default is 20m) to apply the
   underlying `tofu` process will be killed. You will potentially lose state

cluster/images/provider-opentofu/Dockerfile

@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 ENV OPENTOFU_VERSION=1.8.2
 ENV TF_IN_AUTOMATION=1
-ENV TOFU_PLUGIN_CACHE_DIR=/tf/plugin-cache
+ENV TOFU_PLUGIN_CACHE_DIR=/tofu/plugin-cache
 
 ADD "bin/${TARGETOS}_${TARGETARCH}/provider" /usr/local/bin/crossplane-opentofu-provider
 ADD .gitconfig .gitconfig
@@ -15,7 +15,7 @@ RUN curl -s -L https://github.com/opentofu/opentofu/releases/download/v${OPENTOF
   && rm tofu.zip \
   && chmod +x /usr/local/bin/tofu \
   && mkdir -p ${TOFU_PLUGIN_CACHE_DIR} \
-  && chown -R 2000 /tf
+  && chown -R 2000 /tofu
 # As of Crossplane v1.3.0 provider controllers run as UID 2000.
 # https://github.com/crossplane/crossplane/blob/v1.3.0/internal/controller/pkg/revision/deployment.go#L32