From 9bf596ce90c3ee5c1f4fdc6591b690f430dc8861 Mon Sep 17 00:00:00 2001
From: Martin Buchleitner <mbuchleitner@infralovers.com>
Date: Mon, 22 May 2023 14:00:16 +0200
Subject: [PATCH 1/2] fix: dns name update

Signed-off-by: Martin Buchleitner <mbuchleitner@infralovers.com>
---
 deployment-helm/values.yaml                         |  2 +-
 deployment-kustomize/base/guestbook-deployment.yaml |  2 +-
 .../overlays/development/kustomization.yaml         |  2 +-
 deployment-manifest/guestbook-deployment.yaml       |  2 +-
 replace-variables.sh                                | 13 +++++++++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/deployment-helm/values.yaml b/deployment-helm/values.yaml
index faff71f..9e34e1c 100644
--- a/deployment-helm/values.yaml
+++ b/deployment-helm/values.yaml
@@ -4,7 +4,7 @@
 
 frontend:
   name: guestbook
-  containerRegistry: registry.gitlab.<ENV-ANIMAL>.commandemy.training/git-user-<ENV-USER-ID>
+  containerRegistry: registry.gitlab.<ENV-ANIMAL>.<ENV-DOMAIN>/git-user-<ENV-USER-ID>
   containerImage: guestbook-application
   replicaCount: 1
   port: 3000
diff --git a/deployment-kustomize/base/guestbook-deployment.yaml b/deployment-kustomize/base/guestbook-deployment.yaml
index b4fc700..40aa7aa 100644
--- a/deployment-kustomize/base/guestbook-deployment.yaml
+++ b/deployment-kustomize/base/guestbook-deployment.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: guestbook
-        image: registry.gitlab.<ENV-ANIMAL>.commandemy.training/git-user-<ENV-USER-ID>/guestbook-application:1
+        image: registry.gitlab.<ENV-ANIMAL>.<ENV-DOMAIN>/git-user-<ENV-USER-ID>/guestbook-application:1
         env:
         - name: REDIS-SERVICE-NAME
           value: redis
diff --git a/deployment-kustomize/overlays/development/kustomization.yaml b/deployment-kustomize/overlays/development/kustomization.yaml
index fc521c4..19c99b5 100644
--- a/deployment-kustomize/overlays/development/kustomization.yaml
+++ b/deployment-kustomize/overlays/development/kustomization.yaml
@@ -4,6 +4,6 @@ kind: Kustomization
 bases:
   - ../../base
 images:
-- name: registry.gitlab.<ENV-ANIMAL>.commandemy.training/git-user-<ENV-USER-ID>/guestbook-application
+- name: registry.gitlab.<ENV-ANIMAL>.<ENV-DOMAIN>/git-user-<ENV-USER-ID>/guestbook-application
   newTag: "1" # {"$imagepolicy": "flux-system:guestbook:tag"}
 
diff --git a/deployment-manifest/guestbook-deployment.yaml b/deployment-manifest/guestbook-deployment.yaml
index 06194fe..67e3c01 100644
--- a/deployment-manifest/guestbook-deployment.yaml
+++ b/deployment-manifest/guestbook-deployment.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: guestbook
-        image: registry.gitlab.<ENV-ANIMAL>.commandemy.training/git-user-<ENV-USER-ID>/guestbook-application:1
+        image: registry.gitlab.<ENV-ANIMAL>.<ENV-DOMAIN>/git-user-<ENV-USER-ID>/guestbook-application:1
         env:
         - name: REDIS-SERVICE-NAME
           value: redis
diff --git a/replace-variables.sh b/replace-variables.sh
index 62ad0c4..4738469 100644
--- a/replace-variables.sh
+++ b/replace-variables.sh
@@ -1,7 +1,16 @@
 #!/bin/sh
 
 # Replace <ENV-USER-ID>
-find deployment* -type f -exec sed -i -e "s/<ENV-USER-ID>/$USER_ID/g" {} \;
+find examples* -type f -exec sed -i -e "s/<ENV-USER-ID>/$USER_ID/g" {} \;
 
 # Replace <ENV-ANIMAL>
-find deployment* -type f -exec sed -i -e "s/<ENV-ANIMAL>/$ANIMAL/g" {} \;
+find examples* -type f -exec sed -i -e "s/<ENV-ANIMAL>/$ANIMAL/g" {} \;
+
+# Replace <ENV-IP>
+find examples* -type f -exec sed -i -e "s/<ENV-IP>/$HOST_IP/g" {} \;
+
+# Replace <ENV-NAME>
+find examples* -type f -exec sed -i -e "s/<ENV-NAME>/$ENVIRONMENT/g" {} \;
+
+# Replace <ENV-DOMAIN>
+find examples* -type f -exec sed -i -e "s/<ENV-DOMAIN>/$DOMAIN/g" {} \;
\ No newline at end of file

From 720a5cdb1bf796aa7d0368d2e8a630c3a883d7bc Mon Sep 17 00:00:00 2001
From: Martin Buchleitner <mbuchleitner@infralovers.com>
Date: Mon, 22 May 2023 14:14:00 +0200
Subject: [PATCH 2/2] fix: update script and perm on the script

Signed-off-by: Martin Buchleitner <mbuchleitner@infralovers.com>
---
 replace-variables.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/replace-variables.sh b/replace-variables.sh
index 4738469..0deaecc 100644
--- a/replace-variables.sh
+++ b/replace-variables.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 # Replace <ENV-USER-ID>
-find examples* -type f -exec sed -i -e "s/<ENV-USER-ID>/$USER_ID/g" {} \;
+find deployment* -type f -exec sed -i -e "s/<ENV-USER-ID>/$USER_ID/g" {} \;
 
 # Replace <ENV-ANIMAL>
-find examples* -type f -exec sed -i -e "s/<ENV-ANIMAL>/$ANIMAL/g" {} \;
+find deployment* -type f -exec sed -i -e "s/<ENV-ANIMAL>/$ANIMAL/g" {} \;
 
 # Replace <ENV-IP>
-find examples* -type f -exec sed -i -e "s/<ENV-IP>/$HOST_IP/g" {} \;
+find deployment* -type f -exec sed -i -e "s/<ENV-IP>/$HOST_IP/g" {} \;
 
 # Replace <ENV-NAME>
-find examples* -type f -exec sed -i -e "s/<ENV-NAME>/$ENVIRONMENT/g" {} \;
+find deployment* -type f -exec sed -i -e "s/<ENV-NAME>/$ENVIRONMENT/g" {} \;
 
 # Replace <ENV-DOMAIN>
-find examples* -type f -exec sed -i -e "s/<ENV-DOMAIN>/$DOMAIN/g" {} \;
\ No newline at end of file
+find deployment* -type f -exec sed -i -e "s/<ENV-DOMAIN>/$DOMAIN/g" {} \;
\ No newline at end of file