Skip to content

Commit

Permalink
Updating github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
madduci committed Dec 14, 2024
1 parent f7c4495 commit d68049d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 20 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/opentofu-plan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ jobs:
- name: Setup OpenTofu
uses: opentofu/setup-opentofu@v1

- name: Terraform Init
run: cd cluster && tofu init

- name: Terraform Plan (Plain)
run: cd examples/kind-with-${matrix.type} && tofu plan -no-color -out=tfplan.out && tofu show -json tfplan.out > tfplan.json
- name: Tofu Plan
run: cd examples/kind-with-${matrix.type} && tofu init && tofu plan -no-color -out=tfplan.out && tofu show -json tfplan.out > tfplan.json

- name: Output Plan
run: cat tfplan.json
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/terraform-plan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v3

- name: Terraform Init
run: cd cluster && terraform init

- name: Terraform Plan (Plain)
run: cd examples/kind-with-${matrix.type} && terraform plan -no-color -out=tfplan.out && terraform show -json tfplan.out > tfplan.json
- name: Terraform Plan
run: cd examples/kind-with-${matrix.type} && terraform init && terraform plan -no-color -out=tfplan.out && terraform show -json tfplan.out > tfplan.json

- name: Output Plan
run: cat tfplan.json
Expand Down
4 changes: 2 additions & 2 deletions modules/cilium-mesh/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ resource "helm_release" "cilium" {

set {
name = "ingressController.service.insecureNodePort"
value = "${var.node_port_http}"
value = var.node_port_http
}

set {
name = "ingressController.service.secureNodePort"
value = "${var.node_port_https}"
value = var.node_port_https
}

set {
Expand Down
4 changes: 2 additions & 2 deletions modules/cilium-mesh/providers.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_providers {
helm = {
source = "hashicorp/helm"
source = "hashicorp/helm"
}
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
}
}
}
8 changes: 4 additions & 4 deletions modules/kind-cluster/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ output "name" {

output "container_port_http" {
description = "The Container Port that is mapping the HTTP Port 80 on the host"
value = 30000
value = 30000
}

output "container_port_https" {
description = "The Container Port that is mapping the HTTPS Port 443 on the host"
value = 30001
value = 30001
}

output "container_port_istioctl" {
description = "The Container Port that is mapping the Istioctl Port 15021 on the host"
value = 30002
value = 30002
}

output "http_container_port" {
description = "The Container Port that is mapping the Ciliumctl Port 9876 on the host"
value = 30003
value = 30003
}
2 changes: 1 addition & 1 deletion modules/kind-cluster/providers.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
kind = {
source = "tehcyx/kind"
source = "tehcyx/kind"
}
}
}
2 changes: 1 addition & 1 deletion modules/nginx-ingress/providers.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
}
}
}

0 comments on commit d68049d

Please sign in to comment.