From 07eb19111d993fce89fe3a91954bd767d3165473 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:54:11 +0800
Subject: [PATCH 01/23] Create git-deployment.yml

---
 git-deployment.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 git-deployment.yml

diff --git a/git-deployment.yml b/git-deployment.yml
new file mode 100644
index 0000000..d6d61a8
--- /dev/null
+++ b/git-deployment.yml
@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: underwater-app-github
+  labels:
+    app: octopus-underwater-app
+spec:
+  selector:
+    matchLabels:
+        app: octopus-underwater-app
+  replicas: 3
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: octopus-underwater-app
+    spec:
+      containers:
+        - name: octopus-underwater-app
+          image: 720766170633.dkr.ecr.us-east-2.amazonaws.com/octopus-underwater-app:latest
+          ports:
+            - containerPort: 80
+              protocol: TCP
+          imagePullPolicy: Always

From d800cd4cb02ca17c117e881743d9d05359b942b6 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:55:28 +0800
Subject: [PATCH 02/23] Create main.yml

---
 main.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 main.yml

diff --git a/main.yml b/main.yml
new file mode 100644
index 0000000..f664131
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,45 @@
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+name: AWS ECR push
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install Octopus CLI
+      uses: OctopusDeploy/install-octopus-cli-action@v1.1.1
+      with:
+          version: latest
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-2
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push the image to Amazon ECR
+      id: build-image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: ${{ secrets.REPO_NAME }}
+        IMAGE_TAG: "latest"
+
+      run: |
+        # Build a docker container and push it to ECR 
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+        echo "Pushing image to ECR..."
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

From 183a7ee179cde15a2b30369ef8c002015147f75d Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:57:54 +0800
Subject: [PATCH 03/23] Create main.yml

---
 .github/workflows/main.yml | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..f664131
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,45 @@
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+name: AWS ECR push
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install Octopus CLI
+      uses: OctopusDeploy/install-octopus-cli-action@v1.1.1
+      with:
+          version: latest
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-2
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push the image to Amazon ECR
+      id: build-image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: ${{ secrets.REPO_NAME }}
+        IMAGE_TAG: "latest"
+
+      run: |
+        # Build a docker container and push it to ECR 
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+        echo "Pushing image to ECR..."
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

From 20aabde2c9821e22c1fe6c1f72a88a645e65a4fc Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:59:28 +0800
Subject: [PATCH 04/23] Delete main.yml

---
 main.yml | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 main.yml

diff --git a/main.yml b/main.yml
deleted file mode 100644
index f664131..0000000
--- a/main.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-name: AWS ECR push
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Install Octopus CLI
-      uses: OctopusDeploy/install-octopus-cli-action@v1.1.1
-      with:
-          version: latest
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
-
-    - name: Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
-
-    - name: Build, tag, and push the image to Amazon ECR
-      id: build-image
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        ECR_REPOSITORY: ${{ secrets.REPO_NAME }}
-        IMAGE_TAG: "latest"
-
-      run: |
-        # Build a docker container and push it to ECR 
-        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-        echo "Pushing image to ECR..."
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-        echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

From cf85862d6254ebbf00dc28533883f55cc4b7cb64 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:15:36 +0800
Subject: [PATCH 05/23] Update Dockerfile


From a8f1823d08b8e13cdefc5900a8ac9201302c32d8 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:21:36 +0800
Subject: [PATCH 06/23] Update git-deployment.yml

---
 git-deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-deployment.yml b/git-deployment.yml
index d6d61a8..65b414b 100644
--- a/git-deployment.yml
+++ b/git-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: octopus-underwater-app
-          image: 720766170633.dkr.ecr.us-east-2.amazonaws.com/octopus-underwater-app:latest
+          image: public.ecr.aws/f9l8r7z1/octopus-underwater-app-nick:latest
           ports:
             - containerPort: 80
               protocol: TCP

From 8ebab48545f9227680b7cceb16e039b204ccf3c9 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:24:21 +0800
Subject: [PATCH 07/23] Update git-deployment.yml


From 187a115429a315f43c0006374f8c6ea0f7cde5ef Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:33:01 +0800
Subject: [PATCH 08/23] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f664131..ad55258 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ main ]
 
-name: AWS ECR push
+name: AWS ECR push1
 
 jobs:
   deploy:

From f6bba6713ce16dd34e3f2af706776128b67d378d Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:43:24 +0800
Subject: [PATCH 09/23] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad55258..74b49eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
+        aws-region: us-east-1
 
     - name: Login to Amazon ECR
       id: login-ecr

From 20280cff7805c43c1508fecb7268cf1d9e07d5cc Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:54:02 +0800
Subject: [PATCH 10/23] Update git-deployment.yml

---
 git-deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-deployment.yml b/git-deployment.yml
index 65b414b..c55f082 100644
--- a/git-deployment.yml
+++ b/git-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: octopus-underwater-app
-          image: public.ecr.aws/f9l8r7z1/octopus-underwater-app-nick:latest
+          image: 432030471883.dkr.ecr.us-east-1.amazonaws.com/octopus-underwater-app-docker-nick:latest
           ports:
             - containerPort: 80
               protocol: TCP

From 4079027ce01edf7f382b80d7d93ea9d0948edb83 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:56:44 +0800
Subject: [PATCH 11/23] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 74b49eb..974172f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ main ]
 
-name: AWS ECR push1
+name: AWS ECR push0
 
 jobs:
   deploy:

From dade5c273c3336aa7a546a2b2fd00dbb9e7ba425 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:59:55 +0800
Subject: [PATCH 12/23] Create deployment.yml

---
 .github/workflows/deployment.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/deployment.yml

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
new file mode 100644
index 0000000..65b414b
--- /dev/null
+++ b/.github/workflows/deployment.yml
@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: underwater-app-github
+  labels:
+    app: octopus-underwater-app
+spec:
+  selector:
+    matchLabels:
+        app: octopus-underwater-app
+  replicas: 3
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: octopus-underwater-app
+    spec:
+      containers:
+        - name: octopus-underwater-app
+          image: public.ecr.aws/f9l8r7z1/octopus-underwater-app-nick:latest
+          ports:
+            - containerPort: 80
+              protocol: TCP
+          imagePullPolicy: Always

From fc778b896cd90485a5b36cc5b75da31fc5cc3a4e Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 23:48:13 +0800
Subject: [PATCH 13/23] Update main.yml

---
 .github/workflows/main.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 974172f..971f0e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,3 +43,14 @@ jobs:
         echo "Pushing image to ECR..."
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
         echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+    
+    - name: Update kube config
+      run: aws eks update-kubeconfig --name octopus --region us-east-1
+
+    - name: Deploy to EKS
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
+        IMAGE_TAG: ${{ steps.commit.outputs.short }}
+      run: |
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" ./git-deployment.yaml && \
+        kubectl apply -f ./git-deployment.yaml

From 34eaf78377c8eae2eb610ba541a12c245d9f7d1a Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 23:49:56 +0800
Subject: [PATCH 14/23] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 971f0e6..9e48a3b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,5 +52,5 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
       run: |
-        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" ./git-deployment.yaml && \
-        kubectl apply -f ./git-deployment.yaml
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" .github/workflows/git-deployment.yaml && \
+        kubectl apply -f .github/workflows/git-deployment.yaml

From 75048d135ee88b50ee35279734747ba8c66fd6d4 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Thu, 25 Jan 2024 23:51:20 +0800
Subject: [PATCH 15/23] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e48a3b..782ed40 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Update kube config
       run: aws eks update-kubeconfig --name octopus --region us-east-1
 
-    - name: Deploy to EKS
+    - name: Deploy to EKS1
       env:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}

From ead8019f68129502dd8cd611141c5707685c7b9f Mon Sep 17 00:00:00 2001
From: Nick Kim <khs10@hotmail.com>
Date: Fri, 26 Jan 2024 00:06:47 +0800
Subject: [PATCH 16/23] adding manifest dir

---
 manifest/git-deployment.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 manifest/git-deployment.yml

diff --git a/manifest/git-deployment.yml b/manifest/git-deployment.yml
new file mode 100644
index 0000000..c55f082
--- /dev/null
+++ b/manifest/git-deployment.yml
@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: underwater-app-github
+  labels:
+    app: octopus-underwater-app
+spec:
+  selector:
+    matchLabels:
+        app: octopus-underwater-app
+  replicas: 3
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: octopus-underwater-app
+    spec:
+      containers:
+        - name: octopus-underwater-app
+          image: 432030471883.dkr.ecr.us-east-1.amazonaws.com/octopus-underwater-app-docker-nick:latest
+          ports:
+            - containerPort: 80
+              protocol: TCP
+          imagePullPolicy: Always

From 9ac98f340920d9d4147fae9f40248fb8e829119c Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:10:49 +0800
Subject: [PATCH 17/23] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 782ed40..4aff1e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,5 +52,5 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
       run: |
-        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" .github/workflows/git-deployment.yaml && \
-        kubectl apply -f .github/workflows/git-deployment.yaml
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifest/git-deployment.yaml && \
+        kubectl apply -f manifest/git-deployment.yaml

From e01a819bb828f6319643d0c34f918d0edf7b74be Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:13:09 +0800
Subject: [PATCH 18/23] Update main.yml

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4aff1e6..0387661 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
     - name: Deploy to EKS1
       env:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
-        IMAGE_TAG: ${{ steps.commit.outputs.short }}
+        IMAGE_TAG: "latest"
       run: |
-        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifest/git-deployment.yaml && \
-        kubectl apply -f manifest/git-deployment.yaml
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifest/git-deployment.yml && \
+        kubectl apply -f manifest/git-deployment.yml

From cf1a09f290fe363b0558c1afbe9a938a70d0f396 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:22:07 +0800
Subject: [PATCH 19/23] Create service.yml

---
 manifest/service.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 manifest/service.yml

diff --git a/manifest/service.yml b/manifest/service.yml
new file mode 100644
index 0000000..8cf076f
--- /dev/null
+++ b/manifest/service.yml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: kubernetes-octopus-underwater-app
+  labels:
+    app: octopus-underwater-app
+spec:
+  selector:
+    app: octopus-underwater-app
+
+  ports:
+    - port: 28015
+      targetPort: 80
+
+  type: LoadBalancer

From 895e484c39e1cb092e3ccbdb4fd7e893ac6d54b8 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:23:24 +0800
Subject: [PATCH 20/23] Update main.yml

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0387661..e309fe7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,3 +54,4 @@ jobs:
       run: |
         sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifest/git-deployment.yml && \
         kubectl apply -f manifest/git-deployment.yml
+        kubectl apply -f manifests/service.yml

From 4f080149261b081e65bf32f107085fe94fb2c13b Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:24:06 +0800
Subject: [PATCH 21/23] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e309fe7..3907c7f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,4 +54,4 @@ jobs:
       run: |
         sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifest/git-deployment.yml && \
         kubectl apply -f manifest/git-deployment.yml
-        kubectl apply -f manifests/service.yml
+        kubectl apply -f manifest/service.yml

From cd68f0eb837194aa59af99dbc76aa48af973eb01 Mon Sep 17 00:00:00 2001
From: Nick Kim <khs10@hotmail.com>
Date: Fri, 26 Jan 2024 16:12:35 +0800
Subject: [PATCH 22/23] test again

---
 git-deployment.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 git-deployment.yml

diff --git a/git-deployment.yml b/git-deployment.yml
deleted file mode 100644
index c55f082..0000000
--- a/git-deployment.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: underwater-app-github
-  labels:
-    app: octopus-underwater-app
-spec:
-  selector:
-    matchLabels:
-        app: octopus-underwater-app
-  replicas: 3
-  strategy:
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: octopus-underwater-app
-    spec:
-      containers:
-        - name: octopus-underwater-app
-          image: 432030471883.dkr.ecr.us-east-1.amazonaws.com/octopus-underwater-app-docker-nick:latest
-          ports:
-            - containerPort: 80
-              protocol: TCP
-          imagePullPolicy: Always

From f095af6c5f5e9f99845994417cec5d0789c66530 Mon Sep 17 00:00:00 2001
From: khsydney <31054283+khsydney@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:48:02 +0800
Subject: [PATCH 23/23] Update git-deployment.yml

---
 manifest/git-deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/git-deployment.yml b/manifest/git-deployment.yml
index c55f082..563c170 100644
--- a/manifest/git-deployment.yml
+++ b/manifest/git-deployment.yml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: underwater-app-github
+  name: underwater-app-github1
   labels:
     app: octopus-underwater-app
 spec: