From dbed74ca22743313ed131ae8fbfee92947c6cfce Mon Sep 17 00:00:00 2001 From: Younus Date: Sat, 1 Nov 2025 22:42:43 +0530 Subject: [PATCH 1/7] inital commit --- unus.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 unus.txt diff --git a/unus.txt b/unus.txt new file mode 100644 index 0000000..356ec07 --- /dev/null +++ b/unus.txt @@ -0,0 +1 @@ +Hello Younus From 003235569db54e93fb1a9bd72388a1481686a719 Mon Sep 17 00:00:00 2001 From: Younus Date: Sat, 1 Nov 2025 22:57:02 +0530 Subject: [PATCH 2/7] this commit is from branch feature1 --- unus.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unus.txt b/unus.txt index 356ec07..d2dde73 100644 --- a/unus.txt +++ b/unus.txt @@ -1 +1 @@ -Hello Younus +this is feature work From af416763faf6a29929d608d989e5f91a8ec996b0 Mon Sep 17 00:00:00 2001 From: Younus Date: Sun, 2 Nov 2025 23:09:50 +0530 Subject: [PATCH 3/7] this is commit for fork --- temp/fork.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp/fork.txt diff --git a/temp/fork.txt b/temp/fork.txt new file mode 100644 index 0000000..d5f205c --- /dev/null +++ b/temp/fork.txt @@ -0,0 +1 @@ +this is fork demo From 5896c9ae9328705b2640b87508c602ef7a2adf28 Mon Sep 17 00:00:00 2001 From: Younus Date: Sun, 2 Nov 2025 23:54:31 +0530 Subject: [PATCH 4/7] demo --- .../backup/02-deployment-cleanedup.yaml | 2 +- .../backup/03-deployment-multiple-deployments.yaml | 2 +- .../configuration/iaac/azure/backend/main.tf | 6 +++--- .../configuration/iaac/azure/kubernetes/main.tf | 13 +++---------- .../configuration/kubernetes/deployment.yaml | 2 +- .../deployment.yaml | 2 +- terraform/backup/01-terraform-basics/main.tf | 8 +++++++- terraform/backup/02-more-terraform-basics/main.tf | 4 ++-- terraform/backup/03-lists-and-sets/main.tf | 2 +- terraform/backup/04-maps/main.tf | 2 +- terraform/backup/05-ec2-instances/main.tf | 2 +- terraform/backup/06-ec2-with-elb/main.tf | 2 +- .../backup/07-backend-state/backend-state/main.tf | 2 +- .../08-modules/terraform-modules/users/main.tf | 2 +- terraform/backup/09-multiple-ec2-instances/main.tf | 2 +- 15 files changed, 26 insertions(+), 27 deletions(-) diff --git a/kubernetes/01-hello-world-rest-api/backup/02-deployment-cleanedup.yaml b/kubernetes/01-hello-world-rest-api/backup/02-deployment-cleanedup.yaml index 9f0bef1..745d359 100644 --- a/kubernetes/01-hello-world-rest-api/backup/02-deployment-cleanedup.yaml +++ b/kubernetes/01-hello-world-rest-api/backup/02-deployment-cleanedup.yaml @@ -44,4 +44,4 @@ spec: selector: app: hello-world-rest-api sessionAffinity: None - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/kubernetes/01-hello-world-rest-api/backup/03-deployment-multiple-deployments.yaml b/kubernetes/01-hello-world-rest-api/backup/03-deployment-multiple-deployments.yaml index 5926dea..bb0f2df 100644 --- a/kubernetes/01-hello-world-rest-api/backup/03-deployment-multiple-deployments.yaml +++ b/kubernetes/01-hello-world-rest-api/backup/03-deployment-multiple-deployments.yaml @@ -81,4 +81,4 @@ spec: app: hello-world-rest-api version: v2 sessionAffinity: None - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/backend/main.tf b/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/backend/main.tf index 4495efd..abcffd1 100644 --- a/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/backend/main.tf +++ b/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/backend/main.tf @@ -16,7 +16,7 @@ resource "azurerm_resource_group" "resource_group" { } resource "azurerm_storage_account" "storage_account" { - name = "${var.environment}terraformstatestorage" + name = "${var.environment}in28minsterrastestor" location = var.location resource_group_name = azurerm_resource_group.resource_group.name account_tier = "Standard" @@ -27,6 +27,6 @@ resource "azurerm_storage_account" "storage_account" { } resource "azurerm_storage_container" "storage_container" { - name = "${var.environment}terraformstatestoragecontainer" + name = "${var.environment}in28minsterrastatestorcontainer" storage_account_name = azurerm_storage_account.storage_account.name -} \ No newline at end of file +} diff --git a/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/kubernetes/main.tf b/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/kubernetes/main.tf index 1d7893c..f19a518 100644 --- a/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/kubernetes/main.tf +++ b/projects/microservices/01-currency-exchange-microservice-basic/configuration/iaac/azure/kubernetes/main.tf @@ -1,13 +1,4 @@ -resource "azurerm_resource_group" "resource_group" { - name = "${var.resource_group}_${var.environment}" - location = var.location -} - -provider "azurerm" { - //version = "~>2.0.0" - features {} -} - +>>>>>>> 70281d0 (Upgraded to latest version) resource "azurerm_kubernetes_cluster" "terraform-k8s" { name = "${var.cluster_name}_${var.environment}" location = azurerm_resource_group.resource_group.location @@ -26,7 +17,9 @@ resource "azurerm_kubernetes_cluster" "terraform-k8s" { name = "agentpool" node_count = var.node_count vm_size = "standard_b2ms" + # vm_size = "standard_d2as_v5" CHANGE IF AN ERROR ARISES +>>>>>>> 70281d0 (Upgraded to latest version) } service_principal { diff --git a/projects/microservices/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml b/projects/microservices/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml index 0df080c..db9424d 100644 --- a/projects/microservices/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml +++ b/projects/microservices/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml @@ -68,4 +68,4 @@ spec: selector: app: currency-exchange sessionAffinity: None #CHANGE - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/projects/microservices/02-currency-conversion-microservice-basic/deployment.yaml b/projects/microservices/02-currency-conversion-microservice-basic/deployment.yaml index 82cd7a7..5475070 100755 --- a/projects/microservices/02-currency-conversion-microservice-basic/deployment.yaml +++ b/projects/microservices/02-currency-conversion-microservice-basic/deployment.yaml @@ -51,4 +51,4 @@ spec: selector: app: currency-conversion sessionAffinity: None #CHANGE - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/terraform/backup/01-terraform-basics/main.tf b/terraform/backup/01-terraform-basics/main.tf index 91b7bca..85a4db0 100644 --- a/terraform/backup/01-terraform-basics/main.tf +++ b/terraform/backup/01-terraform-basics/main.tf @@ -5,10 +5,16 @@ provider "aws" { # plan - execute resource "aws_s3_bucket" "my_s3_bucket" { + bucket = "my-s3-bucket-in28minutes-rangak-002" # versioning { # enabled = true # } + bucket = "my-s3-bucket-in28minutes-sathishm-002" + versioning { + enabled = true + } +>>>>>>> 70281d0 (Upgraded to latest version) } resource "aws_s3_bucket_versioning" "versioning_example" { @@ -21,4 +27,4 @@ resource "aws_s3_bucket_versioning" "versioning_example" { resource "aws_iam_user" "my_iam_user" { name = "my_iam_user_abc_updated" -} \ No newline at end of file +} diff --git a/terraform/backup/02-more-terraform-basics/main.tf b/terraform/backup/02-more-terraform-basics/main.tf index 80aa47c..4a2b99c 100644 --- a/terraform/backup/02-more-terraform-basics/main.tf +++ b/terraform/backup/02-more-terraform-basics/main.tf @@ -9,6 +9,6 @@ provider "aws" { } resource "aws_iam_user" "my_iam_users" { - count = 1 + count = 2 name = "${var.iam_user_name_prefix}_${count.index}" -} \ No newline at end of file +} diff --git a/terraform/backup/03-lists-and-sets/main.tf b/terraform/backup/03-lists-and-sets/main.tf index 12b34c4..07823be 100644 --- a/terraform/backup/03-lists-and-sets/main.tf +++ b/terraform/backup/03-lists-and-sets/main.tf @@ -13,4 +13,4 @@ resource "aws_iam_user" "my_iam_users" { #name = var.names[count.index] for_each = toset(var.names) name = each.value -} \ No newline at end of file +} diff --git a/terraform/backup/04-maps/main.tf b/terraform/backup/04-maps/main.tf index b8322c4..b94576f 100644 --- a/terraform/backup/04-maps/main.tf +++ b/terraform/backup/04-maps/main.tf @@ -19,4 +19,4 @@ resource "aws_iam_user" "my_iam_users" { country : each.value.country department : each.value.department } -} \ No newline at end of file +} diff --git a/terraform/backup/05-ec2-instances/main.tf b/terraform/backup/05-ec2-instances/main.tf index 75ebede..c7af96e 100644 --- a/terraform/backup/05-ec2-instances/main.tf +++ b/terraform/backup/05-ec2-instances/main.tf @@ -62,4 +62,4 @@ resource "aws_instance" "http_server" { "echo Welcome to in28minutes - Virtual Server is at ${self.public_dns} | sudo tee /var/www/html/index.html" ] } -} \ No newline at end of file +} diff --git a/terraform/backup/06-ec2-with-elb/main.tf b/terraform/backup/06-ec2-with-elb/main.tf index 91369f4..c28a1f2 100644 --- a/terraform/backup/06-ec2-with-elb/main.tf +++ b/terraform/backup/06-ec2-with-elb/main.tf @@ -100,4 +100,4 @@ resource "aws_instance" "http_servers" { "echo Welcome to in28minutes - Virtual Server is at ${self.public_dns} | sudo tee /var/www/html/index.html" ] } -} \ No newline at end of file +} diff --git a/terraform/backup/07-backend-state/backend-state/main.tf b/terraform/backup/07-backend-state/backend-state/main.tf index cc85fa0..91a8413 100644 --- a/terraform/backup/07-backend-state/backend-state/main.tf +++ b/terraform/backup/07-backend-state/backend-state/main.tf @@ -55,4 +55,4 @@ resource "aws_dynamodb_table" "enterprise_backend_lock" { type = "S" } -} \ No newline at end of file +} diff --git a/terraform/backup/08-modules/terraform-modules/users/main.tf b/terraform/backup/08-modules/terraform-modules/users/main.tf index c8b17c3..d8aaaf7 100644 --- a/terraform/backup/08-modules/terraform-modules/users/main.tf +++ b/terraform/backup/08-modules/terraform-modules/users/main.tf @@ -13,4 +13,4 @@ resource "aws_iam_user" "my_iam_user" { locals { iam_user_extension = "my_iam_user_abc" -} \ No newline at end of file +} diff --git a/terraform/backup/09-multiple-ec2-instances/main.tf b/terraform/backup/09-multiple-ec2-instances/main.tf index 96ed61c..ca7bf9a 100644 --- a/terraform/backup/09-multiple-ec2-instances/main.tf +++ b/terraform/backup/09-multiple-ec2-instances/main.tf @@ -48,4 +48,4 @@ resource "aws_instance" "http_server" { //subnet_id = "subnet-3f7b2563" subnet_id = tolist(data.aws_subnet_ids.default_subnets.ids)[0] -} \ No newline at end of file +} From 5779046683fce89051508f2adf2593b32367e4e6 Mon Sep 17 00:00:00 2001 From: Younus Date: Sun, 2 Nov 2025 23:24:41 +0530 Subject: [PATCH 5/7] added fork demo file --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index a39fe6d..d2497ad 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# DevOps for Beginners - Docker, Kubernetes, Terraform and Azure Devops +# DevOps for Beginners - Docker, Kubernetes, Terraform and Aws Devops [![Image](https://www.springboottutorial.com/images/Course-DevOps.png "DevOps Course")](https://links.in28minutes.com/DevOps-SBT) From dd559debd62f8969732e53ee59561d4b4c718eb8 Mon Sep 17 00:00:00 2001 From: Younus Date: Sun, 2 Nov 2025 23:31:50 +0530 Subject: [PATCH 6/7] this is fork commit --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index d2497ad..cb4ab59 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # DevOps for Beginners - Docker, Kubernetes, Terraform and Aws Devops -[![Image](https://www.springboottutorial.com/images/Course-DevOps.png "DevOps Course")](https://links.in28minutes.com/DevOps-SBT) +[![Image](https://www.springboottutorial.co/images/Course-DevOps.png "DevOps Course")](https://links.in28minutes.com/DevOps-SBT) ## Learn Devops with Docker, Kubernetes, Terraform, Ansible, Jenkins and Azure Devops From 2b7703f29e2ce8cc260f6503432ff750b74c60a1 Mon Sep 17 00:00:00 2001 From: Younus Date: Sun, 2 Nov 2025 23:40:57 +0530 Subject: [PATCH 7/7] this is demo for fork --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index cb4ab59..8d2c1ef 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ [![Image](https://www.springboottutorial.co/images/Course-DevOps.png "DevOps Course")](https://links.in28minutes.com/DevOps-SBT) - +this is me adding new text to commit the fork changes ## Learn Devops with Docker, Kubernetes, Terraform, Ansible, Jenkins and Azure Devops ## Pipeline Project Github Repositories