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
65 changes: 33 additions & 32 deletions cluster/local/.terraform.lock.hcl

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

4 changes: 2 additions & 2 deletions cluster/local/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ resource "helm_release" "argocd" {
chart = "argo-cd"
version = "9.4.17"

set_sensitive {
set_sensitive = [{
name = "configs.secret.argocdServerAdminPassword"
# ArgoCD require a `bcrypt()` hashed password here. But `bcrypt` generate a new hash at each execution
# So instead, we store the hash directly, so terraform is not confused anymore by fake changes
value = data.infisical_secrets.this.secrets["ArgoCD_admin_encrypted"].value
}
}]

values = [<<EOF
# server:
Expand Down
4 changes: 2 additions & 2 deletions cluster/local/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = "~> 2.0"
version = "~> 3.0"
}
infisical = {
version = "~> 0.16"
Expand All @@ -20,7 +20,7 @@ provider "kubernetes" {
}

provider "helm" {
kubernetes {
kubernetes = {
config_path = "~/.kube/config"
}
}
Expand Down
97 changes: 49 additions & 48 deletions cluster/scaleway/.terraform.lock.hcl

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

4 changes: 2 additions & 2 deletions cluster/scaleway/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@ resource "helm_release" "argocd" {

depends_on = [local_file.kubeconfig]

set_sensitive {
set_sensitive = [{
name = "configs.secret.argocdServerAdminPassword"
# ArgoCD expects a bcrypt() hash here. bcrypt() would regenerate on every
# run, so we store the hash directly in Infisical to avoid spurious diffs.
value = data.infisical_secrets.this[0].secrets["ArgoCD_admin_encrypted"].value
}
}]

values = [<<EOF
configs:
Expand Down
4 changes: 2 additions & 2 deletions cluster/scaleway/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = "~> 2.0"
version = "~> 3.0"
}
infisical = {
source = "infisical/infisical"
Expand Down Expand Up @@ -69,7 +69,7 @@ provider "kubernetes" {
}

provider "helm" {
kubernetes {
kubernetes = {
host = scaleway_k8s_cluster.homelab.kubeconfig[0].host
token = scaleway_k8s_cluster.homelab.kubeconfig[0].token
cluster_ca_certificate = base64decode(scaleway_k8s_cluster.homelab.kubeconfig[0].cluster_ca_certificate)
Expand Down
Loading