Skip to content

Commit

Permalink
fix chap10
Browse files Browse the repository at this point in the history
  • Loading branch information
mikaelkrief committed Aug 24, 2023
1 parent ce3231f commit 8e8dfa0
Show file tree
Hide file tree
Showing 12 changed files with 140 additions and 16 deletions.
22 changes: 22 additions & 0 deletions CHAP10/app/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions CHAP10/app/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
terraform {
required_version = "~> 1.1"
required_providers {
kubernetes = {
source = "hashicorp/kubernetes"
Expand All @@ -23,7 +24,7 @@ resource "kubernetes_namespace" "ns" {
resource "kubernetes_deployment" "deployment" {
metadata {
name = "webapp"
namespace = kubernetes_namespace.ns.metadata.0.name
namespace = kubernetes_namespace.ns.metadata[0].name
labels = {
app = "webapp"
}
Expand Down Expand Up @@ -58,11 +59,11 @@ resource "kubernetes_deployment" "deployment" {
resource "kubernetes_service" "service" {
metadata {
name = "webapp"
namespace = kubernetes_namespace.ns.metadata.0.name
namespace = kubernetes_namespace.ns.metadata[0].name
}
spec {
selector = {
app = kubernetes_deployment.deployment.metadata.0.labels.app
app = kubernetes_deployment.deployment.metadata[0].labels.app
}

port {
Expand Down
24 changes: 24 additions & 0 deletions CHAP10/docker/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CHAP10/docker/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

terraform {
required_version = "~> 1.1"
required_providers {
docker = {
source = "kreuzwerker/docker"
Expand Down
22 changes: 22 additions & 0 deletions CHAP10/helm/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions CHAP10/helm/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
terraform {
required_version = "~> 1.1"
required_providers {
helm = {
source = "hashicorp/helm"
Expand All @@ -12,18 +13,6 @@ provider "helm" {
}
}

# provider "kubernetes" {
# }

# resource "kubernetes_namespace" "ns" {
# metadata {
# labels = {
# mylabel = "ingress"
# }
# name = "ingress"
# }
# }


resource "helm_release" "nginx_ingress" {
name = "ingress"
Expand Down
16 changes: 16 additions & 0 deletions CHAP10/kind/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion CHAP10/kind/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
terraform {
required_version = "~> 1.1"
required_providers {
kind = {
source = "tehcyx/kind"
Expand All @@ -13,5 +14,5 @@ provider "kind" {}
resource "kind_cluster" "default" {
name = "cluster-book"
wait_for_ready = true
kubeconfig_path = local.k8s_config_path
kubeconfig_path = ".kube/conf"
}
24 changes: 24 additions & 0 deletions CHAP10/kustomize/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CHAP10/kustomize/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

terraform {
required_version = "~> 1.1"
required_providers {
kustomization = {
source = "kbst/kustomization"
Expand Down
22 changes: 22 additions & 0 deletions CHAP10/tf-controller/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CHAP10/tf-controller/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
terraform {
required_version = "~> 1.1"
required_providers {
helm = {
source = "hashicorp/helm"
Expand Down

0 comments on commit 8e8dfa0

Please sign in to comment.