demo mostly fixed

Author: colinjlacy

platform/kratix/promises/application-release/promise.yaml.tmpl

@@ -84,4 +84,4 @@ spec:
                   resourceNamespace: "__CATALOG_NAMESPACE__"
             containers:
               - name: resolver
-                image: __RUNTIME_WORKLOAD_PIPELINE_IMAGE__
+                image: __APPLICATION_RELEASE_PIPELINE_IMAGE__

platform/scripts/02-build-and-push-images.sh

@@ -13,7 +13,7 @@ if [[ -n "${IMAGE_REGISTRY:-}" ]]; then
   IMAGE_TAG="${IMAGE_TAG:-dev}"
   IMAGE_PREFIX="${IMAGE_REGISTRY%/}"
   REDIS_PIPELINE_IMAGE="${REDIS_PIPELINE_IMAGE:-${IMAGE_PREFIX}/redis-pipeline:${IMAGE_TAG}}"
-  RUNTIME_WORKLOAD_PIPELINE_IMAGE="${RUNTIME_WORKLOAD_PIPELINE_IMAGE:-${IMAGE_PREFIX}/runtime-workload-pipeline:${IMAGE_TAG}}"
+  APPLICATION_RELEASE_PIPELINE_IMAGE="${APPLICATION_RELEASE_PIPELINE_IMAGE:-${IMAGE_PREFIX}/application-release-pipeline:${IMAGE_TAG}}"
   TODOS_API_IMAGE="${TODOS_API_IMAGE:-${IMAGE_PREFIX}/todos-api:${IMAGE_TAG}}"
   REQUEST_LOGGER_IMAGE="${REQUEST_LOGGER_IMAGE:-${IMAGE_PREFIX}/request-logger:${IMAGE_TAG}}"
 else

platform/scripts/02-use-ghcr-images.sh

@@ -47,7 +47,7 @@ GHCR_REPOSITORY="$(printf '%s' "${GHCR_REPOSITORY}" | tr '[:upper:]' '[:lower:]'
 IMAGE_PREFIX="${IMAGE_PREFIX:-ghcr.io/${GHCR_OWNER}/${GHCR_REPOSITORY}}"
 
 REDIS_PIPELINE_IMAGE="${REDIS_PIPELINE_IMAGE:-${IMAGE_PREFIX}-redis-pipeline:${IMAGE_TAG}}"
-RUNTIME_WORKLOAD_PIPELINE_IMAGE="${RUNTIME_WORKLOAD_PIPELINE_IMAGE:-${IMAGE_PREFIX}-runtime-workload-pipeline:${IMAGE_TAG}}"
+APPLICATION_RELEASE_PIPELINE_IMAGE="${APPLICATION_RELEASE_PIPELINE_IMAGE:-${IMAGE_PREFIX}-application-release-pipeline:${IMAGE_TAG}}"
 TODOS_API_IMAGE="${TODOS_API_IMAGE:-${IMAGE_PREFIX}-todos-api:${IMAGE_TAG}}"
 REQUEST_LOGGER_IMAGE="${REQUEST_LOGGER_IMAGE:-${IMAGE_PREFIX}-request-logger:${IMAGE_TAG}}"
 

platform/scripts/03-install-promises.sh

@@ -9,31 +9,31 @@ source_generated_env
 require_kubectl_context
 
 [[ -n "${REDIS_PIPELINE_IMAGE:-}" ]] || fail "REDIS_PIPELINE_IMAGE is not set; run 02-build-and-push-images.sh first"
-[[ -n "${RUNTIME_WORKLOAD_PIPELINE_IMAGE:-}" ]] || fail "RUNTIME_WORKLOAD_PIPELINE_IMAGE is not set; run 02-build-and-push-images.sh first"
+[[ -n "${APPLICATION_RELEASE_PIPELINE_IMAGE:-}" ]] || fail "APPLICATION_RELEASE_PIPELINE_IMAGE is not set; run 02-build-and-push-images.sh first"
 
 kubectl create namespace "${DEMO_NAMESPACE}" --dry-run=client -o yaml | kubectl apply -f -
 kubectl create namespace "${CATALOG_NAMESPACE}" --dry-run=client -o yaml | kubectl apply -f -
 
 REDIS_PROMISE="${BUILD_DIR}/redis-promise.yaml"
-RUNTIME_WORKLOAD_PROMISE="${BUILD_DIR}/runtime-workload-promise.yaml"
+APPLICATION_RELEASE_PROMISE="${BUILD_DIR}/application-release-promise.yaml"
 
 render_template \
   "${PLATFORM_DIR}/kratix/promises/redis/promise.yaml.tmpl" \
   "${REDIS_PROMISE}" \
   REDIS_PIPELINE_IMAGE "${REDIS_PIPELINE_IMAGE}"
 
 render_template \
-  "${PLATFORM_DIR}/kratix/promises/runtime-workload/promise.yaml.tmpl" \
-  "${RUNTIME_WORKLOAD_PROMISE}" \
-  RUNTIME_WORKLOAD_PIPELINE_IMAGE "${RUNTIME_WORKLOAD_PIPELINE_IMAGE}" \
+  "${PLATFORM_DIR}/kratix/promises/application-release/promise.yaml.tmpl" \
+  "${APPLICATION_RELEASE_PROMISE}" \
+  APPLICATION_RELEASE_PIPELINE_IMAGE "${APPLICATION_RELEASE_PIPELINE_IMAGE}" \
   CATALOG_NAMESPACE "${CATALOG_NAMESPACE}"
 
 log "Installing Redis Promise"
 kubectl apply -f "${REDIS_PROMISE}"
 wait_for_crd redis.runtimeconditions.io
 
 log "Installing RuntimeWorkload Promise"
-kubectl apply -f "${RUNTIME_WORKLOAD_PROMISE}"
+kubectl apply -f "${APPLICATION_RELEASE_PROMISE}"
 wait_for_crd runtimeworkloads.runtimeconditions.io
 
 log "Runtime Conditions Promises are installed"

platform/scripts/lib/common.sh

@@ -50,7 +50,7 @@ write_generated_env() {
   cat >"${ENV_FILE}" <<EOF
 # Generated by a platform image reference script.
 REDIS_PIPELINE_IMAGE=${REDIS_PIPELINE_IMAGE}
-RUNTIME_WORKLOAD_PIPELINE_IMAGE=${RUNTIME_WORKLOAD_PIPELINE_IMAGE}
+APPLICATION_RELEASE_PIPELINE_IMAGE=${APPLICATION_RELEASE_PIPELINE_IMAGE}
 TODOS_API_IMAGE=${TODOS_API_IMAGE}
 REQUEST_LOGGER_IMAGE=${REQUEST_LOGGER_IMAGE}
 DEMO_NAMESPACE=${DEMO_NAMESPACE}