From 01839ee6bfda580d1d38eeb3b3151c7a622ee5f3 Mon Sep 17 00:00:00 2001
From: Stuart Harris <stuart.harris@red-badger.com>
Date: Mon, 18 Dec 2023 16:22:39 +0000
Subject: [PATCH] image names

---
 rust-containers-k8s/deployment/inventory-service/values.yaml  | 2 +-
 .../deployment/notification-service/values.yaml               | 2 +-
 rust-containers-k8s/deployment/order-service/values.yaml      | 2 +-
 rust-containers-k8s/deployment/product-service/values.yaml    | 2 +-
 rust-containers-k8s/scripts/build_and_push.sh                 | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rust-containers-k8s/deployment/inventory-service/values.yaml b/rust-containers-k8s/deployment/inventory-service/values.yaml
index f010194..20faa25 100644
--- a/rust-containers-k8s/deployment/inventory-service/values.yaml
+++ b/rust-containers-k8s/deployment/inventory-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: europe-west2-docker.pkg.dev/platform-poc-rust/inventory-service
+  repository: europe-west2-docker.pkg.dev/platform-poc-rust/inventory-service/inventory-service
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
diff --git a/rust-containers-k8s/deployment/notification-service/values.yaml b/rust-containers-k8s/deployment/notification-service/values.yaml
index c5e68d1..7b2fd55 100644
--- a/rust-containers-k8s/deployment/notification-service/values.yaml
+++ b/rust-containers-k8s/deployment/notification-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: europe-west2-docker.pkg.dev/platform-poc-rust/notification-service
+  repository: europe-west2-docker.pkg.dev/platform-poc-rust/notification-service/notification-service
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
diff --git a/rust-containers-k8s/deployment/order-service/values.yaml b/rust-containers-k8s/deployment/order-service/values.yaml
index bbdd0cc..6026666 100644
--- a/rust-containers-k8s/deployment/order-service/values.yaml
+++ b/rust-containers-k8s/deployment/order-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: europe-west2-docker.pkg.dev/platform-poc-rust/order-service
+  repository: europe-west2-docker.pkg.dev/platform-poc-rust/order-service/order-service
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
diff --git a/rust-containers-k8s/deployment/product-service/values.yaml b/rust-containers-k8s/deployment/product-service/values.yaml
index 46c0ecd..9ada026 100644
--- a/rust-containers-k8s/deployment/product-service/values.yaml
+++ b/rust-containers-k8s/deployment/product-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: europe-west2-docker.pkg.dev/platform-poc-rust/product-service
+  repository: europe-west2-docker.pkg.dev/platform-poc-rust/product-service/product-service
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
diff --git a/rust-containers-k8s/scripts/build_and_push.sh b/rust-containers-k8s/scripts/build_and_push.sh
index 63dfad2..84834f6 100755
--- a/rust-containers-k8s/scripts/build_and_push.sh
+++ b/rust-containers-k8s/scripts/build_and_push.sh
@@ -2,12 +2,12 @@
 
 set -euo pipefail
 
-registry=europe-west2-docker.pkg.dev
+host=europe-west2-docker.pkg.dev
 project=platform-poc-rust
 sha="$(git rev-parse --short HEAD)"
 
 for service in *-service; do
-  tag="${registry}/${project}/${service}:${sha}"
+  tag="${host}/${project}/${service}/${service}:${sha}"
 
   pushd "$service"