From f5a502cd9b60f7cca5371290cae2ec66b4ecb729 Mon Sep 17 00:00:00 2001 From: Anurag Date: Thu, 4 Dec 2025 06:37:55 +0000 Subject: [PATCH 01/38] add docker file --- website/.dockerignore | 25 +++++++++++++++++++++++++ website/Dockerfile | 24 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 website/.dockerignore create mode 100644 website/Dockerfile diff --git a/website/.dockerignore b/website/.dockerignore new file mode 100644 index 00000000..7347a7fb --- /dev/null +++ b/website/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/bin +**/charts +**/docker-compose* +**/compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md diff --git a/website/Dockerfile b/website/Dockerfile new file mode 100644 index 00000000..92f993d1 --- /dev/null +++ b/website/Dockerfile @@ -0,0 +1,24 @@ +# Use official PHP with Apache +FROM php:8.2-apache + +# Enable useful Apache modules (optional but common) +RUN a2enmod rewrite + +# Install any PHP extensions you need (example: PDO + MySQL) +# Remove pdo_mysql if you don't use a DB +RUN docker-php-ext-install pdo pdo_mysql + +# Set working directory to Apache web root +WORKDIR /var/www/html + +# Copy everything into the container (except what you .dockerignore) +COPY . /var/www/html/ + +# (Optional) If you rely on .htaccess and need overrides: +# RUN sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf + +# Expose Apache port +EXPOSE 80 + +# Apache is the default CMD in this image +# CMD ["apache2-foreground"] \ No newline at end of file From d6776253fc51e44a42e05a065aa90dd4373b997d Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Thu, 4 Dec 2025 06:53:13 +0000 Subject: [PATCH 02/38] updated file --- website/Dockerfile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/website/Dockerfile b/website/Dockerfile index 92f993d1..335e0b91 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -1,24 +1,20 @@ -# Use official PHP with Apache + FROM php:8.2-apache -# Enable useful Apache modules (optional but common) + RUN a2enmod rewrite -# Install any PHP extensions you need (example: PDO + MySQL) -# Remove pdo_mysql if you don't use a DB + RUN docker-php-ext-install pdo pdo_mysql -# Set working directory to Apache web root + WORKDIR /var/www/html -# Copy everything into the container (except what you .dockerignore) + COPY . /var/www/html/ -# (Optional) If you rely on .htaccess and need overrides: -# RUN sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf +RUN sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf -# Expose Apache port EXPOSE 80 -# Apache is the default CMD in this image -# CMD ["apache2-foreground"] \ No newline at end of file +CMD ["apache2-foreground"] From 6c9f5fd8651617889495b85f5ea18f61a0175125 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:18:33 +0000 Subject: [PATCH 03/38] Create inventory prod --- website/envs/prod/inventory/inventory | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/prod/inventory/inventory diff --git a/website/envs/prod/inventory/inventory b/website/envs/prod/inventory/inventory new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/prod/inventory/inventory @@ -0,0 +1 @@ + From 37b8352a89a57c5f5b0729c951225b8937e3642b Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:20:00 +0000 Subject: [PATCH 04/38] Create deployment.yaml production --- website/envs/prod/k8s/deployment.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/prod/k8s/deployment.yaml diff --git a/website/envs/prod/k8s/deployment.yaml b/website/envs/prod/k8s/deployment.yaml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/prod/k8s/deployment.yaml @@ -0,0 +1 @@ + From 5a85d930c580ac51d42c872faf03346368363946 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:21:02 +0000 Subject: [PATCH 05/38] Create inventory test --- website/envs/test/inventory/inventory | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/test/inventory/inventory diff --git a/website/envs/test/inventory/inventory b/website/envs/test/inventory/inventory new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/test/inventory/inventory @@ -0,0 +1 @@ + From 44e101e63b4d6200385994643043f546e8e4e418 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:23:38 +0000 Subject: [PATCH 06/38] Delete website/envs/test/inventory directory --- website/envs/test/inventory/inventory | 1 - 1 file changed, 1 deletion(-) delete mode 100644 website/envs/test/inventory/inventory diff --git a/website/envs/test/inventory/inventory b/website/envs/test/inventory/inventory deleted file mode 100644 index 8b137891..00000000 --- a/website/envs/test/inventory/inventory +++ /dev/null @@ -1 +0,0 @@ - From 366579b1ebbf36253e5483f53ba0ea2b11adb7e8 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:26:31 +0000 Subject: [PATCH 07/38] Create inventory test created --- website/envs/test/inventory/inventory | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/test/inventory/inventory diff --git a/website/envs/test/inventory/inventory b/website/envs/test/inventory/inventory new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/test/inventory/inventory @@ -0,0 +1 @@ + From dc311a01ec594cd63f74a8a04bf415af6f7a2e69 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:27:12 +0000 Subject: [PATCH 08/38] Create deployment.yaml test added --- website/envs/test/k8s/deployment.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/test/k8s/deployment.yaml diff --git a/website/envs/test/k8s/deployment.yaml b/website/envs/test/k8s/deployment.yaml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/test/k8s/deployment.yaml @@ -0,0 +1 @@ + From cd7f4c8107266f617aaf1f31d9fd68cfb8fd31ba Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:28:16 +0000 Subject: [PATCH 09/38] Create inventory dev created --- website/envs/dev/inventory/inventory | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/dev/inventory/inventory diff --git a/website/envs/dev/inventory/inventory b/website/envs/dev/inventory/inventory new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/dev/inventory/inventory @@ -0,0 +1 @@ + From 03e40ac3296c258e6b9e7b28a00e2bf95198c525 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:28:57 +0000 Subject: [PATCH 10/38] Create deployment.yaml dev --- website/envs/dev/k8s/deployment.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/dev/k8s/deployment.yaml diff --git a/website/envs/dev/k8s/deployment.yaml b/website/envs/dev/k8s/deployment.yaml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/dev/k8s/deployment.yaml @@ -0,0 +1 @@ + From 22d88a6e82b5e23b9bfd8d045c1b50fdc143015e Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:31:58 +0000 Subject: [PATCH 11/38] Update deployment.yaml updated --- website/envs/dev/k8s/deployment.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/website/envs/dev/k8s/deployment.yaml b/website/envs/dev/k8s/deployment.yaml index 8b137891..7294f918 100644 --- a/website/envs/dev/k8s/deployment.yaml +++ b/website/envs/dev/k8s/deployment.yaml @@ -1 +1,20 @@ - +apiVersion: apps/v1 +kind: Deployment +metadata: + name: php-app-deployment + namespace: dev # Explicitly define the namespace +spec: + replicas: 1 + selector: + matchLabels: + app: my-php-app + template: + metadata: + labels: + app: my-php-app + spec: + containers: + - name: my-container + image: apand84/php-app/your-image-name + ports: + - containerPort: 80 From 94164a4f88585c1ca6de495dcbf9c4a080f0109a Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:32:44 +0000 Subject: [PATCH 12/38] Update deployment.yaml production updated --- website/envs/prod/k8s/deployment.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/website/envs/prod/k8s/deployment.yaml b/website/envs/prod/k8s/deployment.yaml index 8b137891..02fe890b 100644 --- a/website/envs/prod/k8s/deployment.yaml +++ b/website/envs/prod/k8s/deployment.yaml @@ -1 +1,20 @@ - +apiVersion: apps/v1 +kind: Deployment +metadata: + name: php-app-deployment + namespace: prod # Explicitly define the namespace +spec: + replicas: 2 + selector: + matchLabels: + app: my-php-app + template: + metadata: + labels: + app: my-php-app + spec: + containers: + - name: my-container + image: apand84/php-app/your-image-name + ports: + - containerPort: 80 From def3145dd62de9a3ef5b2a136fa1285859d117b0 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:33:27 +0000 Subject: [PATCH 13/38] Update deployment.yaml updated --- website/envs/test/k8s/deployment.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/website/envs/test/k8s/deployment.yaml b/website/envs/test/k8s/deployment.yaml index 8b137891..4338fd4f 100644 --- a/website/envs/test/k8s/deployment.yaml +++ b/website/envs/test/k8s/deployment.yaml @@ -1 +1,20 @@ - +apiVersion: apps/v1 +kind: Deployment +metadata: + name: php-app-deployment + namespace: test # Explicitly define the namespace +spec: + replicas: 1 + selector: + matchLabels: + app: my-php-app + template: + metadata: + labels: + app: my-php-app + spec: + containers: + - name: my-container + image: apand84/php-app/your-image-name + ports: + - containerPort: 80 From a4600624cec0472a0ca47b7be24aadb139245ed8 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:31:32 +0000 Subject: [PATCH 14/38] Create deployment.yml ansible file --- website/ansible/deployment.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/ansible/deployment.yml diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/ansible/deployment.yml @@ -0,0 +1 @@ + From 52c1ce7cc95c422db6a56159f99a55fe01b8f2a7 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:36:28 +0000 Subject: [PATCH 15/38] Update deployment.yml ansible deployemt file --- website/ansible/deployment.yml | 47 ++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index 8b137891..e76534ba 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -1 +1,48 @@ +--- +- name: Deploy to EKS namespace using env-specific manifests + hosts: localhost + connection: local + gather_facts: no + vars: + env: "{{ env | default('dev') }}" + eks_cluster: "{{ eks_cluster | default('eks_cluster-demo') }}" + aws_region: "{{ aws_region | default('eu-west-2') }}" + + env_dir: "envs/{{ env }}" + inventory_dir: "{{ env_dir }}/inventory" + k8s_dir: "{{ env_dir }}/k8s" + namespace: "{{ env }}" # dev → dev ns, test → test ns, etc. + + tasks: + + - name: Show deployment parameters + debug: + msg: + - "Environment: {{ env }}" + - "Namespace : {{ namespace }}" + - "ENV_DIR : {{ env_dir }}" + - "Inventory : {{ inventory_dir }}" + - "K8S_DIR : {{ k8s_dir }}" + - "Cluster : {{ eks_cluster }}" + - "Region : {{ aws_region }}" + + + + + + - name: Apply inventory manifests (configmaps, secrets, etc.) + ansible.builtin.shell: | + set -e + if [ -d "{{ inventory_dir }}" ]; then + echo "Applying inventory from {{ inventory_dir }}" + kubectl apply -n {{ namespace }} -f {{ inventory_dir }} + else + echo "Inventory directory not found: {{ inventory_dir }}" + fi + + - name: Apply Kubernetes manifests + ansible.builtin.shell: | + set -e + echo "Applying k8s manifests from {{ k8s_dir }}" + kubectl apply -n {{ namespace }} -f {{ k8s_dir }} From feb08a010800624da3abfe0d2e68e55dd5452d2d Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:38:48 +0000 Subject: [PATCH 16/38] Update inventory --- website/envs/dev/inventory/inventory | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/envs/dev/inventory/inventory b/website/envs/dev/inventory/inventory index 8b137891..bc265742 100644 --- a/website/envs/dev/inventory/inventory +++ b/website/envs/dev/inventory/inventory @@ -1 +1,4 @@ - +[eks_dev:vars] +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo +k8s_manifest_dir=./website From 1de9b517fb64129f8267851651d7b352b132bc66 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:42:17 +0000 Subject: [PATCH 17/38] Update inventory prod --- website/envs/prod/inventory/inventory | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/envs/prod/inventory/inventory b/website/envs/prod/inventory/inventory index 8b137891..1505ee3b 100644 --- a/website/envs/prod/inventory/inventory +++ b/website/envs/prod/inventory/inventory @@ -1 +1,3 @@ - +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo +k8s_manifest_dir=./website From a9353024c494492e86953c020fcdf8e7893f1742 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:43:40 +0000 Subject: [PATCH 18/38] Update inventory test --- website/envs/test/inventory/inventory | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/envs/test/inventory/inventory b/website/envs/test/inventory/inventory index 8b137891..1505ee3b 100644 --- a/website/envs/test/inventory/inventory +++ b/website/envs/test/inventory/inventory @@ -1 +1,3 @@ - +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo +k8s_manifest_dir=./website From f66490a442aae437f979673885098ad88e232689 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:05:53 +0000 Subject: [PATCH 19/38] Delete website/envs/dev/inventory/inventory dev --- website/envs/dev/inventory/inventory | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 website/envs/dev/inventory/inventory diff --git a/website/envs/dev/inventory/inventory b/website/envs/dev/inventory/inventory deleted file mode 100644 index bc265742..00000000 --- a/website/envs/dev/inventory/inventory +++ /dev/null @@ -1,4 +0,0 @@ -[eks_dev:vars] -aws_region=eu-west-2 -eks_cluster_name=eks_cluster-demo -k8s_manifest_dir=./website From e512699023cf7599aef4ca15b2b43ffb14297062 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:07:24 +0000 Subject: [PATCH 20/38] Create inventory.ini dev --- website/envs/dev/inventory/inventory.ini | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 website/envs/dev/inventory/inventory.ini diff --git a/website/envs/dev/inventory/inventory.ini b/website/envs/dev/inventory/inventory.ini new file mode 100644 index 00000000..bc265742 --- /dev/null +++ b/website/envs/dev/inventory/inventory.ini @@ -0,0 +1,4 @@ +[eks_dev:vars] +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo +k8s_manifest_dir=./website From 18906b3ead75f1c4903a60b8492385fc6d662e5f Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:10:18 +0000 Subject: [PATCH 21/38] Delete website/envs/prod/inventory/inventory --- website/envs/prod/inventory/inventory | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 website/envs/prod/inventory/inventory diff --git a/website/envs/prod/inventory/inventory b/website/envs/prod/inventory/inventory deleted file mode 100644 index 1505ee3b..00000000 --- a/website/envs/prod/inventory/inventory +++ /dev/null @@ -1,3 +0,0 @@ -aws_region=eu-west-2 -eks_cluster_name=eks_cluster-demo -k8s_manifest_dir=./website From 730a99f150908dc49cfba32a1fdfa7c38c9da8d0 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:15:11 +0000 Subject: [PATCH 22/38] Create inventory.ini production --- website/envs/prod/inventory/inventory.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/prod/inventory/inventory.ini diff --git a/website/envs/prod/inventory/inventory.ini b/website/envs/prod/inventory/inventory.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/prod/inventory/inventory.ini @@ -0,0 +1 @@ + From 633338fe8c82719a082c82e21af722c93ede2e38 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:15:58 +0000 Subject: [PATCH 23/38] Update inventory.ini production --- website/envs/prod/inventory/inventory.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/envs/prod/inventory/inventory.ini b/website/envs/prod/inventory/inventory.ini index 8b137891..bba8b1f4 100644 --- a/website/envs/prod/inventory/inventory.ini +++ b/website/envs/prod/inventory/inventory.ini @@ -1 +1,4 @@ - +[eks_prod:vars] +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo +k8s_manifest_dir=./website From e771beaaf8f28fc5bd143624dfd16270c0f38590 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:19:02 +0000 Subject: [PATCH 24/38] Delete website/envs/test/inventory/inventory test --- website/envs/test/inventory/inventory | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 website/envs/test/inventory/inventory diff --git a/website/envs/test/inventory/inventory b/website/envs/test/inventory/inventory deleted file mode 100644 index 1505ee3b..00000000 --- a/website/envs/test/inventory/inventory +++ /dev/null @@ -1,3 +0,0 @@ -aws_region=eu-west-2 -eks_cluster_name=eks_cluster-demo -k8s_manifest_dir=./website From 0eeaa72b0efdbf62e9132a492a64a23d9c98fadf Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:23:19 +0000 Subject: [PATCH 25/38] Create inventory.ini test --- website/envs/test/inventory/inventory.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/envs/test/inventory/inventory.ini diff --git a/website/envs/test/inventory/inventory.ini b/website/envs/test/inventory/inventory.ini new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/website/envs/test/inventory/inventory.ini @@ -0,0 +1 @@ + From c1b88a977cca440c572194fd1a0ec757ebe38a4d Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Wed, 10 Dec 2025 03:24:04 +0000 Subject: [PATCH 26/38] Update inventory.ini removed --- website/envs/test/inventory/inventory.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/envs/test/inventory/inventory.ini b/website/envs/test/inventory/inventory.ini index 8b137891..7f1b70f1 100644 --- a/website/envs/test/inventory/inventory.ini +++ b/website/envs/test/inventory/inventory.ini @@ -1 +1,3 @@ - +[eks_test:vars] +aws_region=eu-west-2 +eks_cluster_name=eks_cluster-demo From 4de4473712e9e6a6100e450e6a8ae5a2bf8fbde7 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 19:28:29 +0000 Subject: [PATCH 27/38] Remove comment from namespace definition --- website/ansible/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index e76534ba..c290d1ee 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -12,7 +12,7 @@ env_dir: "envs/{{ env }}" inventory_dir: "{{ env_dir }}/inventory" k8s_dir: "{{ env_dir }}/k8s" - namespace: "{{ env }}" # dev → dev ns, test → test ns, etc. + namespace: "{{ env }}" tasks: From 7cf3bb4681b0c5140017acde7889c221103b50ce Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 19:56:57 +0000 Subject: [PATCH 28/38] Add host1 configuration to inventory.ini --- website/envs/dev/inventory/inventory.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/envs/dev/inventory/inventory.ini b/website/envs/dev/inventory/inventory.ini index bc265742..5bcac5b3 100644 --- a/website/envs/dev/inventory/inventory.ini +++ b/website/envs/dev/inventory/inventory.ini @@ -1,3 +1,6 @@ +[eks_dev] +host1 ansible_host=10.0.1.210 + [eks_dev:vars] aws_region=eu-west-2 eks_cluster_name=eks_cluster-demo From c1c10f3f2406d8e3af4b83af8ec7a7d9ec42a797 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:26:49 +0000 Subject: [PATCH 29/38] Refactor deployment.yml variable names for clarity --- website/ansible/deployment.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index c290d1ee..673b3412 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -5,21 +5,20 @@ gather_facts: no vars: - env: "{{ env | default('dev') }}" - eks_cluster: "{{ eks_cluster | default('eks_cluster-demo') }}" - aws_region: "{{ aws_region | default('eu-west-2') }}" + target_env: "{{ env | default('dev') }}" + eks_cluster: "{{ cluster_name | default('eks_cluster-demo') }}" + aws_region: "{{ region | default('eu-west-2') }}" - env_dir: "envs/{{ env }}" + env_dir: "envs/{{ target_env }}" inventory_dir: "{{ env_dir }}/inventory" k8s_dir: "{{ env_dir }}/k8s" - namespace: "{{ env }}" + namespace: "{{ target_env }}" tasks: - - name: Show deployment parameters debug: msg: - - "Environment: {{ env }}" + - "Environment: {{ target_env }}" - "Namespace : {{ namespace }}" - "ENV_DIR : {{ env_dir }}" - "Inventory : {{ inventory_dir }}" @@ -27,10 +26,6 @@ - "Cluster : {{ eks_cluster }}" - "Region : {{ aws_region }}" - - - - - name: Apply inventory manifests (configmaps, secrets, etc.) ansible.builtin.shell: | set -e @@ -40,9 +35,14 @@ else echo "Inventory directory not found: {{ inventory_dir }}" fi + # Ensure shell commands don't fail silently + register: inventory_output + changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" - name: Apply Kubernetes manifests ansible.builtin.shell: | set -e echo "Applying k8s manifests from {{ k8s_dir }}" kubectl apply -n {{ namespace }} -f {{ k8s_dir }} + register: k8s_output + changed_when: "'created' in k8s_output.stdout or 'configured' in k8s_output.stdout" From e75f827ce3b23f50fa9af6d914e199b7476b0142 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:27:12 +0000 Subject: [PATCH 30/38] Remove redundant comment in deployment.yml Removed comment about ensuring shell commands don't fail silently. --- website/ansible/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index 673b3412..ad8e86db 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -35,7 +35,6 @@ else echo "Inventory directory not found: {{ inventory_dir }}" fi - # Ensure shell commands don't fail silently register: inventory_output changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" From 995b05277a70b5f2ac96c77f737dc1b95de51ea7 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:34:02 +0000 Subject: [PATCH 31/38] Specify full path for kubectl in deployment.yml --- website/ansible/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index ad8e86db..d23ce7b8 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -31,7 +31,7 @@ set -e if [ -d "{{ inventory_dir }}" ]; then echo "Applying inventory from {{ inventory_dir }}" - kubectl apply -n {{ namespace }} -f {{ inventory_dir }} + /usr/local/bin/kubectl apply -n {{ namespace }} -f {{ inventory_dir }} else echo "Inventory directory not found: {{ inventory_dir }}" fi @@ -42,6 +42,6 @@ ansible.builtin.shell: | set -e echo "Applying k8s manifests from {{ k8s_dir }}" - kubectl apply -n {{ namespace }} -f {{ k8s_dir }} + /usr/local/bin/kubectl apply -n {{ namespace }} -f {{ k8s_dir }} register: k8s_output changed_when: "'created' in k8s_output.stdout or 'configured' in k8s_output.stdout" From 24bf3666f086453c02f84a54c2f3e52edfb7ec6c Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:34:53 +0000 Subject: [PATCH 32/38] Add Jenkins pipeline for Docker deployment --- website/jenkins | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 website/jenkins diff --git a/website/jenkins b/website/jenkins new file mode 100644 index 00000000..dfb2ae6d --- /dev/null +++ b/website/jenkins @@ -0,0 +1,79 @@ +pipeline { + agent any + + environment { + DOCKER_IMAGE = "apand84/php-app" + DOCKER_CREDENTIALS_ID = 'dockerhub-login-details' + } + parameters { + + choice(name: 'NAMESPACE', choices: ['dev', 'test', 'prod'], description: 'Target K8s Namespace') + } + + stages { + stage('Clone Repository') { + steps { + git credentialsId: 'GITHUB_CREDENTIAL', url: 'https://github.com/nitesh4511/projCert/' + } + } + + stage('Build Docker Image') { + steps { + script { + def builtImage = docker.build("${DOCKER_IMAGE}:${env.BUILD_NUMBER}","./website") + builtImage.tag("latest") + dockerImage = builtImage + } + } + } + + stage('Test (Optional Placeholder)') { + steps { + sh 'echo "Running tests... (Add your PHP unit tests here)"' + // Example of running tests inside the built container: + // dockerImage.inside { + // sh 'php artisan test' + // } + } + } + + stage('Push Image to Docker Hub') { + steps { + script { + docker.withRegistry('https://registry.hub.docker.com', DOCKER_CREDENTIALS_ID) { + dockerImage.push("${env.BUILD_NUMBER}") + dockerImage.push("latest") + } + } + } + } + stage('Deploy Dev') { + steps { + script { + sh "ansible-playbook -i ./website/envs/dev/inventory/inventory.ini ./website/ansible/deployment.yml" + } + } + } + + stage('Deploy Test') { + steps { + script { + sh "ansible-playbook -i ./website/envs/test/inventory/inventory.ini ./website/ansible/deployment.yml" + } + } + } + + stage('Deploy Prod') { + when { + + branch 'master' + } + steps { + script { + + sh "ansible-playbook -i ./website/envs/prod/inventory/inventory.ini ./website/ansible/deployment.yml" + } + } + } + } +} From 952f987b6b10c76579a0062dcbf9ced64df31288 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:38:31 +0000 Subject: [PATCH 33/38] Replace shell commands with kubernetes module --- website/ansible/deployment.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index d23ce7b8..0444d367 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -26,22 +26,22 @@ - "Cluster : {{ eks_cluster }}" - "Region : {{ aws_region }}" - - name: Apply inventory manifests (configmaps, secrets, etc.) - ansible.builtin.shell: | - set -e - if [ -d "{{ inventory_dir }}" ]; then - echo "Applying inventory from {{ inventory_dir }}" - /usr/local/bin/kubectl apply -n {{ namespace }} -f {{ inventory_dir }} - else - echo "Inventory directory not found: {{ inventory_dir }}" - fi + - name: Apply Kubernetes manifests + kubernetes.core.k8s: + state: present + namespace: "{{ namespace }}" + src: "{{ item }}" + with_fileglob: + - "{{ k8s_dir }}/*.yaml" register: inventory_output changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" - name: Apply Kubernetes manifests - ansible.builtin.shell: | - set -e - echo "Applying k8s manifests from {{ k8s_dir }}" - /usr/local/bin/kubectl apply -n {{ namespace }} -f {{ k8s_dir }} + kubernetes.core.k8s: + state: present + namespace: "{{ namespace }}" + src: "{{ item }}" + with_fileglob: + - "{{ k8s_dir }}/*.yaml" register: k8s_output changed_when: "'created' in k8s_output.stdout or 'configured' in k8s_output.stdout" From 6ca9665a7220963d438becfff96371bb06d11118 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:51:34 +0000 Subject: [PATCH 34/38] Add EKS development environment configuration --- website/envs/test/inventory/inventory.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/envs/test/inventory/inventory.ini b/website/envs/test/inventory/inventory.ini index 7f1b70f1..d6c8fcd7 100644 --- a/website/envs/test/inventory/inventory.ini +++ b/website/envs/test/inventory/inventory.ini @@ -1,3 +1,6 @@ +[eks_dev] +host1 ansible_host=10.0.1.210 + [eks_test:vars] aws_region=eu-west-2 eks_cluster_name=eks_cluster-demo From 9ab13d6b5bf7797d9dab13581e634755fd13620e Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Mon, 22 Dec 2025 23:53:15 +0000 Subject: [PATCH 35/38] Rename EKS environment from dev to test --- website/envs/test/inventory/inventory.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/envs/test/inventory/inventory.ini b/website/envs/test/inventory/inventory.ini index d6c8fcd7..5b238f0c 100644 --- a/website/envs/test/inventory/inventory.ini +++ b/website/envs/test/inventory/inventory.ini @@ -1,4 +1,4 @@ -[eks_dev] +[eks_test] host1 ansible_host=10.0.1.210 [eks_test:vars] From 4f630e0f63fb89a01b33f211446ea2beaf630998 Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 23 Dec 2025 00:03:38 +0000 Subject: [PATCH 36/38] Refactor deployment to use kubectl apply command Updated the deployment task to use kubectl apply instead of the Ansible k8s module. --- website/ansible/deployment.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index 0444d367..e79ac76e 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -17,8 +17,7 @@ tasks: - name: Show deployment parameters debug: - msg: - - "Environment: {{ target_env }}" + msg - "Namespace : {{ namespace }}" - "ENV_DIR : {{ env_dir }}" - "Inventory : {{ inventory_dir }}" @@ -27,12 +26,11 @@ - "Region : {{ aws_region }}" - name: Apply Kubernetes manifests - kubernetes.core.k8s: - state: present - namespace: "{{ namespace }}" - src: "{{ item }}" - with_fileglob: - - "{{ k8s_dir }}/*.yaml" + ansible.builtin.shell: | + set -e + kubectl apply -n {{ namespace }} -f k8s/ + args: + chdir: "{{ playbook_dir }}/content/envs/{{ target_env }}" register: inventory_output changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" From a99e73e15b6160688e946fe02ee672a7d27f1fbb Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 23 Dec 2025 00:05:59 +0000 Subject: [PATCH 37/38] Change Kubernetes module to shell command for apply Replaced Kubernetes module with shell command to apply manifests. --- website/ansible/deployment.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index e79ac76e..c8086c8c 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -35,11 +35,10 @@ changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" - name: Apply Kubernetes manifests - kubernetes.core.k8s: - state: present - namespace: "{{ namespace }}" - src: "{{ item }}" - with_fileglob: - - "{{ k8s_dir }}/*.yaml" + ansible.builtin.shell: | + set -e + kubectl apply -n {{ namespace }} -f k8s/ + args: + chdir: "{{ playbook_dir }}/content/envs/{{ target_env }}" register: k8s_output changed_when: "'created' in k8s_output.stdout or 'configured' in k8s_output.stdout" From 3204dda7803d7fd05730ff0c245f58d629055c7c Mon Sep 17 00:00:00 2001 From: nitesh4511 <112388271+nitesh4511@users.noreply.github.com> Date: Tue, 23 Dec 2025 00:10:26 +0000 Subject: [PATCH 38/38] Refactor deployment.yml to use kubernetes module --- website/ansible/deployment.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/website/ansible/deployment.yml b/website/ansible/deployment.yml index c8086c8c..0444d367 100644 --- a/website/ansible/deployment.yml +++ b/website/ansible/deployment.yml @@ -17,7 +17,8 @@ tasks: - name: Show deployment parameters debug: - msg + msg: + - "Environment: {{ target_env }}" - "Namespace : {{ namespace }}" - "ENV_DIR : {{ env_dir }}" - "Inventory : {{ inventory_dir }}" @@ -26,19 +27,21 @@ - "Region : {{ aws_region }}" - name: Apply Kubernetes manifests - ansible.builtin.shell: | - set -e - kubectl apply -n {{ namespace }} -f k8s/ - args: - chdir: "{{ playbook_dir }}/content/envs/{{ target_env }}" + kubernetes.core.k8s: + state: present + namespace: "{{ namespace }}" + src: "{{ item }}" + with_fileglob: + - "{{ k8s_dir }}/*.yaml" register: inventory_output changed_when: "'created' in inventory_output.stdout or 'configured' in inventory_output.stdout" - name: Apply Kubernetes manifests - ansible.builtin.shell: | - set -e - kubectl apply -n {{ namespace }} -f k8s/ - args: - chdir: "{{ playbook_dir }}/content/envs/{{ target_env }}" + kubernetes.core.k8s: + state: present + namespace: "{{ namespace }}" + src: "{{ item }}" + with_fileglob: + - "{{ k8s_dir }}/*.yaml" register: k8s_output changed_when: "'created' in k8s_output.stdout or 'configured' in k8s_output.stdout"