Skip to content

Commit 91e70d6

Browse files
committed
Add cloudflare_domain to workflow, remove unused release and vars
1 parent 19723b3 commit 91e70d6

File tree

6 files changed

+40
-36
lines changed

6 files changed

+40
-36
lines changed

.github/workflows/terraform.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
TF_VAR_cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
2525
TF_VAR_cloudflare_tunnel_name: ${{ vars.CLOUDFLARE_TUNNEL_NAME }}
2626
TF_VAR_cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
27-
TF_VAR_github_token: ${{ secrets.GH_TOKEN }}
28-
TF_VAR_github_username: ${{ secrets.GH_USERNAME }}
27+
TF_VAR_cloudflare_domain: ${{ vars.CLOUDFLARE_DOMAIN }}
28+
# TF_VAR_github_token: ${{ secrets.GH_TOKEN }}
29+
# TF_VAR_github_username: ${{ secrets.GH_USERNAME }}
2930
steps:
3031
- name: Checkout repository
3132
uses: actions/checkout@v2

infrastructure/terraform/application/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ module "helm" {
1111
cloudflare_api_token = var.cloudflare_api_token
1212
cloudflare_tunnel_account_id = var.cloudflare_account_id
1313
cloudflare_tunnel_name = var.cloudflare_tunnel_name
14-
github_token = var.github_token
15-
github_username = var.github_username
16-
github_secret = var.github_secret
14+
# github_token = var.github_token
15+
# github_username = var.github_username
16+
# github_secret = var.github_secret
1717
cloudflare_domain = var.cloudflare_domain
1818
}
1919

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cloudflare_account_id = "123"
2+
cloudflare_domain = "adhshr.xyz"
3+
cloudflare_tunnel_name = "k8s-homelab"

infrastructure/terraform/application/variables.tf

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ variable "cloudflare_domain" {
2121
default = ""
2222
}
2323

24-
variable "github_token" {
25-
description = "The token used to authenticate with GitHub's API"
26-
type = string
27-
sensitive = true
28-
}
24+
# variable "github_token" {
25+
# description = "The token used to authenticate with GitHub's API"
26+
# type = string
27+
# sensitive = true
28+
# }
2929

30-
variable "github_username" {
31-
description = "The username associated with your GitHub account"
32-
type = string
33-
}
30+
# variable "github_username" {
31+
# description = "The username associated with your GitHub account"
32+
# type = string
33+
# }
3434

35-
variable "github_secret" {
36-
description = "The secret used to authenticate with GitHub's API"
37-
type = string
38-
sensitive = true
39-
default = ""
40-
}
35+
# variable "github_secret" {
36+
# description = "The secret used to authenticate with GitHub's API"
37+
# type = string
38+
# sensitive = true
39+
# default = ""
40+
# }

infrastructure/terraform/modules/helm/releases.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
repository = "https://argoproj.github.io/argo-helm"
66
chart = "argo-cd"
77
namespace = "argocd"
8-
version = "8.0.3"
8+
version = "8.0.12"
99
values = {
1010
"hostname" = var.cloudflare_domain
1111
}

infrastructure/terraform/modules/helm/variables.tf

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ variable "cloudflare_domain" {
1818
type = string
1919
}
2020

21-
variable "github_token" {
22-
description = "The token used to authenticate with GitHub's API"
23-
type = string
24-
sensitive = true
25-
}
21+
# variable "github_token" {
22+
# description = "The token used to authenticate with GitHub's API"
23+
# type = string
24+
# sensitive = true
25+
# }
2626

27-
variable "github_username" {
28-
description = "The username associated with your GitHub account"
29-
type = string
30-
}
27+
# variable "github_username" {
28+
# description = "The username associated with your GitHub account"
29+
# type = string
30+
# }
3131

32-
variable "github_secret" {
33-
description = "The secret used to authenticate with GitHub's API"
34-
type = string
35-
sensitive = true
36-
default = ""
37-
}
32+
# variable "github_secret" {
33+
# description = "The secret used to authenticate with GitHub's API"
34+
# type = string
35+
# sensitive = true
36+
# default = ""
37+
# }

0 commit comments

Comments
 (0)