Fix fnrunner and controllers not setting image prefix from .env for local deployment

Signed-off-by: Rendre Greyling <rendre.greyling@nokia.com>

Author: rendre-greyling

scripts/create-deployment-blueprint.sh

@@ -187,7 +187,7 @@ for resource in ctx.resource_list["items"]:
 '
 }
 
-function add_image_args_porch_server() {
+function add_default_image_prefix() {
     kpt fn eval ${DESTINATION} \
       --image ${STARLARK_IMG} \
       --match-kind Deployment \
@@ -199,6 +199,35 @@ for resource in ctx.resource_list['items']:
   for container in containers:
     container['args'].append('--default-image-prefix=${GHCR_IMAGE_PREFIX}')
 "
+
+    kpt fn eval ${DESTINATION} \
+      --image ${STARLARK_IMG} \
+      --match-kind Deployment \
+      --match-name function-runner \
+      --match-namespace porch-system \
+      -- "source=
+for resource in ctx.resource_list['items']:
+  containers = resource['spec']['template']['spec']['containers']
+  for container in containers:
+    container['command'].append('--default-image-prefix=${GHCR_IMAGE_PREFIX}')
+"
+
+    kpt fn eval ${DESTINATION} \
+      --image ${STARLARK_IMG} \
+      --match-kind Deployment \
+      --match-name porch-controllers \
+      --match-namespace porch-system \
+      -- "source=
+for resource in ctx.resource_list['items']:
+  for container in resource['spec']['template']['spec']['containers']:
+    if container['name'] == 'porch-controllers':
+      if container['env'] == None:
+        container['env'] = []
+      container['env'].append({
+        'name': 'DEFAULT_IMAGE_PREFIX',
+        'value': '${GHCR_IMAGE_PREFIX}'
+      })
+"
 }
 
 function disable_fn_runner_warm_up_pod_cache() {
@@ -368,7 +397,7 @@ function main() {
   cp ${PORCH_DIR}/controllers/config/rbac/role.yaml "${DESTINATION}/9-porch-controller-clusterrole.yaml"
 
   if [[ -n "${GHCR_IMAGE_PREFIX}" ]]; then
-    add_image_args_porch_server
+    add_default_image_prefix
   fi
 
   if [[ "${FN_RUNNER_WARM_UP_POD_CACHE}" == "false" ]]; then

test/performance/README.md

@@ -235,7 +235,7 @@ Tests handle `SIGINT`/`SIGTERM` gracefully: in-flight work stops and results col
 | `-gitea-username` | `porch` | Gitea username |
 | `-gitea-password` | `secret` | Gitea password |
 
-The KRM function registry URL is configured via `PORCH_GHCR_PREFIX_URL` in the repo root `.env` file. It is applied to porch-server and function-runner at deploy time (`make run-in-kind` reads `.env` automatically). Package `Kptfile` images use short names (for example `set-namespace:v0.4.1`); function-runner resolves them with `--default-image-prefix`. The `CHANGE_NAMESPACE` placeholder in Kptfiles is substituted at test runtime.
+The KRM function registry URL is configured via `PORCH_GHCR_PREFIX_URL` in the repo root `.env` file. It is applied at deploy time to porch-server, function-runner, and porch-controllers (`make run-in-kind`, `make run-in-kind-db-cache`, and `make run-in-kind-v1alpha2` all read `.env` automatically via `make deployment-config`). Package `Kptfile` images use short names (for example `set-namespace:v0.4.1`); porch-server and function-runner resolve them with `--default-image-prefix`, and controllers use the `DEFAULT_IMAGE_PREFIX` environment variable. The `CHANGE_NAMESPACE` placeholder in Kptfiles is substituted at test runtime.
 
 ## 6. Output Files