in28minutes · Younus03 · Nov 1, 2025 · Nov 1, 2025 · Nov 2, 2025 · Nov 2, 2025
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
@@ -44,4 +44,4 @@ spec:
   selector:
     app: hello-world-rest-api
   sessionAffinity: None
-  type: LoadBalancer
+  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
@@ -81,4 +81,4 @@ spec:
     app: hello-world-rest-api
     version: v2
   sessionAffinity: None
-  type: LoadBalancer
+  type: LoadBalancer
diff --git a/...services/01-currency-exchange-microservice-basic/configuration/iaac/azure/backend/main.tf b/...services/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
-}
+}
diff --git a/...vices/01-currency-exchange-microservice-basic/configuration/iaac/azure/kubernetes/main.tf b/...vices/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/...services/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml b/...services/01-currency-exchange-microservice-basic/configuration/kubernetes/deployment.yaml
@@ -68,4 +68,4 @@ spec:
   selector:
     app: currency-exchange
   sessionAffinity: None #CHANGE
-  type: LoadBalancer
+  type: LoadBalancer
diff --git 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
+  type: LoadBalancer
diff --git a/readme.md b/readme.md
@@ -1,8 +1,8 @@
-# DevOps for Beginners - Docker, Kubernetes, Terraform and Azure Devops
-
-[![Image](https://www.springboottutorial.com/images/Course-DevOps.png "DevOps Course")](https://links.in28minutes.com/DevOps-SBT)
+# DevOps for Beginners - Docker, Kubernetes, Terraform and Aws Devops
 
+[![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

diff --git a/temp/fork.txt b/temp/fork.txt
@@ -0,0 +1 @@
+this is fork demo
diff --git 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"
-}
+}
diff --git 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}"
-}
+}
diff --git 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
-}
+}
diff --git 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
   }
-}
+}
diff --git 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"
     ]
   }
-}
+}
diff --git 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"
     ]
   }
-}
+}
diff --git 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"
     }
 
-}
+}
diff --git 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"
-}
+}
diff --git 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]
-}
+}
diff --git a/unus.txt b/unus.txt
@@ -0,0 +1 @@
+this is feature work
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ resource "aws_iam_user" "my_iam_users" { @@
         country : each.value.country
         department : each.value.department
       }
-    }
+    }