Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cert-manager_cloudflare/cert-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ resource "kubernetes_namespace" "certmanager" {
}

resource "helm_release" "certmanager" {
name = "cert-manager"
namespace = kubernetes_namespace.certmanager.metadata[0].name
name = "cert-manager"
namespace = kubernetes_namespace.certmanager.metadata[0].name

repository = "https://charts.jetstack.io"
chart = "cert-manager"
version = var.cert_manager_version # check version here: https://artifacthub.io/packages/helm/cert-manager/cert-manager/

set {
name = "installCRDs"
name = "installCRDs"
value = "true"
}

Expand All @@ -22,5 +22,5 @@ resource "helm_release" "certmanager" {
command = "kubectl delete crd certificaterequests.cert-manager.io certificates.cert-manager.io challenges.acme.cert-manager.io clusterissuers.cert-manager.io issuers.cert-manager.io orders.acme.cert-manager.io"
}

depends_on = [ kubernetes_secret.cloudflare_api_token_secret ]
depends_on = [kubernetes_secret.cloudflare_api_token_secret]
}
2 changes: 1 addition & 1 deletion cert-manager_cloudflare/clusterissuer_selfsigned.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
selfSigned: {}
YAML

depends_on = [ helm_release.certmanager ]
depends_on = [helm_release.certmanager]
}

resource "kubectl_manifest" "cert_manager_certificate_steled_selfsigned_ca" {
Expand Down
2 changes: 1 addition & 1 deletion cert-manager_cloudflare/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
version = "~> 2.16.1"
}
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = "~> 2.35.0"
}
kubectl = {
Expand Down
4 changes: 2 additions & 2 deletions cert-manager_cloudflare/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "cert_manager_version" {
type = string
type = string
description = "Set the version of cert-manager"
}

Expand All @@ -12,6 +12,6 @@ variable "cert_manager_email" {
}

variable "namespace" {
type = string
type = string
description = "Name of the kubernetes namespace"
}
6 changes: 3 additions & 3 deletions cert-manager_duckdns/cert-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ resource "kubernetes_namespace" "certmanager" {
}

resource "helm_release" "certmanager" {
name = "cert-manager"
namespace = kubernetes_namespace.certmanager.metadata[0].name
name = "cert-manager"
namespace = kubernetes_namespace.certmanager.metadata[0].name

repository = "https://charts.jetstack.io"
chart = "cert-manager"
version = var.cert_manager_version # check version here: https://artifacthub.io/packages/helm/cert-manager/cert-manager/

set {
name = "installCRDs"
name = "installCRDs"
value = "true"
}
}
12 changes: 6 additions & 6 deletions cert-manager_duckdns/duckdns-webhook.tf
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
resource "helm_release" "duckdns_webhook" {
# name = "cert-manager-webhook-duckdns"
name = "cert-manager-duckdns-webhook"
namespace = kubernetes_namespace.certmanager.metadata[0].name
name = "cert-manager-duckdns-webhook"
namespace = kubernetes_namespace.certmanager.metadata[0].name

# repository = "https://steled.github.io/cert-manager-webhook-duckdns/"
repository = "https://csp33.github.io/cert-manager-duckdns-webhook"
# chart = "cert-manager-webhook-duckdns"
chart = "cert-manager-duckdns-webhook"
version = var.duckdns_webhook_version # check version here: https://github.com/steled/cert-manager-webhook-duckdns/blob/master/charts/cert-manager-webhook-duckdns/Chart.yaml#L4
chart = "cert-manager-duckdns-webhook"
version = var.duckdns_webhook_version # check version here: https://github.com/steled/cert-manager-webhook-duckdns/blob/master/charts/cert-manager-webhook-duckdns/Chart.yaml#L4

# values = [ templatefile(var.duckdns_webhook_values_yaml, {
# duckdns_webhook_ip_address = var.duckdns_webhook_ip_address
# })]

values = [ file(var.duckdns_webhook_values_yaml) ]
values = [file(var.duckdns_webhook_values_yaml)]

depends_on = [ helm_release.certmanager ]
depends_on = [helm_release.certmanager]
}
2 changes: 1 addition & 1 deletion cert-manager_duckdns/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
version = ">= 2.9.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = "~> 2.35.0"
}
}
Expand Down
8 changes: 4 additions & 4 deletions cert-manager_duckdns/variables.tf
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
variable "namespace" {
type = string
type = string
description = "Name of the kubernetes namespace"
}

variable "cert_manager_version" {
type = string
type = string
description = "Set the version of cert-manager"
}

variable "duckdns_webhook_version" {
type = string
type = string
description = "Set the version of duckdns webhook"
}

variable "duckdns_webhook_values_yaml" {
type = string
type = string
description = "Path to the duckdns webhook values.yml file, relative to the root module"
}

Expand Down
22 changes: 11 additions & 11 deletions dht22/dht22/dht22.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@ resource "kubernetes_deployment" "dht22" {
container {
image = var.image
name = "dht22"
args = [ "-g", "D2", "-i", "5" ]
args = ["-g", "D2", "-i", "5"]
port {
name = "metrics"
name = "metrics"
container_port = 9100
}
# security_context {
# capabilities {
# add = [ "SYS_RAWIO" ]
# }
# }
# security_context {
# capabilities {
# add = [ "SYS_RAWIO" ]
# }
# }

resources {
limits = {
"smarter-devices/gpiomem" = "1"
cpu = "0.5"
memory = "512Mi"
cpu = "0.5"
memory = "512Mi"
}
requests = {
"smarter-devices/gpiomem" = "1"
cpu = "250m"
memory = "50Mi"
cpu = "250m"
memory = "50Mi"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dht22/dht22/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "namespace" {
type = string
type = string
description = "Name of the kubernetes namespace"
}

Expand Down
4 changes: 2 additions & 2 deletions dht22/dht22_sdm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "kubernetes_namespace" "sdm-dht22" {
}

module "sdm" {
source = "./sdm"
source = "./sdm"
namespace = kubernetes_namespace.sdm-dht22.metadata[0].name
node_name = var.node_name
image = var.sdm_image # check version here: https://gitlab.com/arm-research/smarter/smarter-device-manager/container_registry/1080664
Expand All @@ -18,5 +18,5 @@ module "dht22" {
node_name = var.node_name
image = var.dht22_image

depends_on = [ module.sdm, ]
depends_on = [module.sdm, ]
}
2 changes: 1 addition & 1 deletion dht22/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {

required_providers {
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = "~> 2.35.0"
}
}
Expand Down
4 changes: 2 additions & 2 deletions dht22/sdm/sdm.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "kubernetes_config_map" "sdm" {
metadata {
name = "smarter-device-manager"
name = "smarter-device-manager"
namespace = var.namespace
}

Expand Down Expand Up @@ -48,7 +48,7 @@ resource "kubernetes_deployment" "sdm" {
allow_privilege_escalation = false

capabilities {
drop = [ "ALL" ]
drop = ["ALL"]
}
}

Expand Down
2 changes: 1 addition & 1 deletion dht22/sdm/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "namespace" {
type = string
type = string
description = "Name of the kubernetes namespace"
}

Expand Down
2 changes: 1 addition & 1 deletion dht22/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "namespace" {
type = string
type = string
description = "Name of the kubernetes namespace"
}

Expand Down
26 changes: 13 additions & 13 deletions gitea/gitea.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ resource "kubernetes_namespace" "gitea" {
}

resource "helm_release" "gitea" {
name = "gitea"
name = "gitea"

repository = "https://dl.gitea.io/charts/"
chart = "gitea"
version = var.gitea_version # check version here: https://gitea.com/gitea/helm-chart/src/branch/master/Chart.yaml
# force_update = true
# recreate_pods = true
# force_update = true
# recreate_pods = true

values = [ templatefile(var.values_yaml, {
gitea_domain = var.gitea_domain
environment = var.environment
gitea_admin_username = var.gitea_admin_username
gitea_admin_password = var.gitea_admin_password
gitea_admin_email = var.gitea_admin_email
gitea_oauth2_jwt_secret = var.gitea_oauth2_jwt_secret
values = [templatefile(var.values_yaml, {
gitea_domain = var.gitea_domain
environment = var.environment
gitea_admin_username = var.gitea_admin_username
gitea_admin_password = var.gitea_admin_password
gitea_admin_email = var.gitea_admin_email
gitea_oauth2_jwt_secret = var.gitea_oauth2_jwt_secret
gitea_security_internal_token = var.gitea_security_internal_token
gitea_security_secret_key = var.gitea_security_secret_key
gitea_server_lfs_jwt_secret = var.gitea_server_lfs_jwt_secret
}) ]
gitea_security_secret_key = var.gitea_security_secret_key
gitea_server_lfs_jwt_secret = var.gitea_server_lfs_jwt_secret
})]

namespace = kubernetes_namespace.gitea.metadata[0].name
}
2 changes: 1 addition & 1 deletion gitea/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
version = ">= 2.9.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = "~> 2.35.0"
}
}
Expand Down
Loading
Loading