Skip to content

fix: switch out secret for secret_v1 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matttrach merged 1 commit into from
Feb 9, 2026
Merged

fix: switch out secret for secret_v1 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/downstream/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module "rancher" {
# rke2
rke2_version = local.rke2_version
local_file_path = local.local_file_path
install_method = "rpm" # rpm only for now, need to figure out local helm chart installs otherwise
install_method = "rpm"
cni = "canal"
node_configuration = {
"rancher" = {
Expand Down
2 changes: 1 addition & 1 deletion examples/downstream_splitrole/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module "rancher" {
# rke2
rke2_version = local.rke2_version
local_file_path = local.local_file_path
install_method = "rpm" # rpm only for now, need to figure out local helm chart installs otherwise
install_method = "rpm"
cni = "canal"
node_configuration = {
"rancher" = {
Expand Down
2 changes: 1 addition & 1 deletion examples/one/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module "rancher" {
# rke2
rke2_version = local.rke2_version
local_file_path = local.local_file_path
install_method = "rpm" # rpm only for now, need to figure out local helm chart installs otherwise
install_method = "tar" # this installs RKE using the tar method, but it isn't an air-gapped install, Rancher install still uses public helm chart
cni = "canal"
node_configuration = {
"rancher" = {
Expand Down
2 changes: 1 addition & 1 deletion examples/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module "rancher" {
# rke2
rke2_version = local.rke2_version
local_file_path = local.local_file_path
install_method = "rpm" # rpm only for now, need to figure out local helm chart installs otherwise
install_method = "tar" # tar install, but not air-gapped
cni = "canal"
node_configuration = {
"initial" = {
Expand Down
2 changes: 1 addition & 1 deletion examples/three/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ module "rancher" {
# rke2
rke2_version = local.rke2_version
local_file_path = local.local_file_path
install_method = "rpm" # rpm only for now, need to figure out local helm chart installs otherwise
install_method = "tar" # tar install, but not air-gapped
cni = "canal"
node_configuration = local.node_configuration
# rancher
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions modules/install_rancher/rancher/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ data "kubernetes_secret_v1" "certificate" {

# we need to create the tls-ca and tls-ca-additional secrets while the rancher pod is starting up
# the rancher pod will fail a few times, but once the secrets are in place it will start and everything will start to work
resource "kubernetes_secret" "rancher_tls_ca" {
resource "kubernetes_secret_v1" "rancher_tls_ca" {
depends_on = [
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
Expand All @@ -203,7 +203,7 @@ resource "kubernetes_secret" "rancher_tls_ca" {
name = "tls-ca"
namespace = "cattle-system"
}
type = "generic"
type = "Opaque" # "generic" https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
data = {
"cacerts.pem" = data.kubernetes_secret_v1.certificate.data["tls.crt"], # don't base64 encode
}
Expand All @@ -214,7 +214,7 @@ resource "kubernetes_secret" "rancher_tls_ca" {
}
}

resource "kubernetes_secret" "rancher_tls_ca_additional" {
resource "kubernetes_secret_v1" "rancher_tls_ca_additional" {
depends_on = [
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
Expand All @@ -227,7 +227,7 @@ resource "kubernetes_secret" "rancher_tls_ca_additional" {
name = "tls-ca-additional"
namespace = "cattle-system"
}
type = "generic"
type = "Opaque" # "generic" https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
data = {
"ca-additional.pem" = data.kubernetes_secret_v1.certificate.data["tls.crt"], # don't base64 encode
}
Expand All @@ -246,8 +246,8 @@ resource "terraform_data" "wait_for_rancher" {
kubernetes_manifest.issuer,
helm_release.rancher,
data.kubernetes_secret_v1.certificate,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret.rancher_tls_ca_additional,
kubernetes_secret_v1.rancher_tls_ca,
kubernetes_secret_v1.rancher_tls_ca_additional,
]
provisioner "local-exec" {
command = <<-EOT
Expand All @@ -268,8 +268,8 @@ resource "terraform_data" "get_public_cert_info" {
kubernetes_manifest.issuer,
helm_release.rancher,
data.kubernetes_secret_v1.certificate,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret.rancher_tls_ca_additional,
kubernetes_secret_v1.rancher_tls_ca,
kubernetes_secret_v1.rancher_tls_ca_additional,
terraform_data.wait_for_rancher,
]
provisioner "local-exec" {
Expand Down
36 changes: 18 additions & 18 deletions modules/install_rancher/rancher_externalTLS/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ resource "terraform_data" "cattle-system" {
}
}

resource "kubernetes_secret" "tls_rancher_ingress" {
resource "kubernetes_secret_v1" "tls_rancher_ingress" {
depends_on = [
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
Expand All @@ -119,7 +119,7 @@ resource "kubernetes_secret" "tls_rancher_ingress" {
name = "tls-rancher-ingress"
namespace = "cattle-system"
}
type = "kubernetes.io/tls"
type = "kubernetes.io/tls" #https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
data = {
"tls.crt" = local.full_chain,
"tls.key" = local.private_key,
Expand All @@ -131,18 +131,18 @@ resource "kubernetes_secret" "tls_rancher_ingress" {
}
}

resource "kubernetes_secret" "rancher_tls_ca" {
resource "kubernetes_secret_v1" "rancher_tls_ca" {
depends_on = [
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
terraform_data.cattle-system,
kubernetes_secret.tls_rancher_ingress,
kubernetes_secret_v1.tls_rancher_ingress,
]
metadata {
name = "tls-ca"
namespace = "cattle-system"
}
type = "generic"
type = "Opaque" #https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
data = {
"cacerts.pem" = local.ca_certs
}
Expand All @@ -153,19 +153,19 @@ resource "kubernetes_secret" "rancher_tls_ca" {
}
}

resource "kubernetes_secret" "rancher_tls_ca_additional" {
resource "kubernetes_secret_v1" "rancher_tls_ca_additional" {
depends_on = [
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
terraform_data.cattle-system,
kubernetes_secret.tls_rancher_ingress,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret_v1.tls_rancher_ingress,
kubernetes_secret_v1.rancher_tls_ca,
]
metadata {
name = "tls-ca-additional"
namespace = "cattle-system"
}
type = "generic"
type = "Opaque" #"generic" https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
data = {
"ca-additional.pem" = local.ca_certs,
}
Expand All @@ -182,9 +182,9 @@ resource "helm_release" "rancher" {
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
terraform_data.cattle-system,
kubernetes_secret.tls_rancher_ingress,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret.rancher_tls_ca_additional,
kubernetes_secret_v1.tls_rancher_ingress,
kubernetes_secret_v1.rancher_tls_ca,
kubernetes_secret_v1.rancher_tls_ca_additional,
]
name = "rancher"
chart = "${local.rancher_helm_repo}/${local.rancher_helm_channel}/rancher-${local.rancher_version}.tgz"
Expand All @@ -211,9 +211,9 @@ resource "terraform_data" "wait_for_rancher" {
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
terraform_data.cattle-system,
kubernetes_secret.tls_rancher_ingress,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret.rancher_tls_ca_additional,
kubernetes_secret_v1.tls_rancher_ingress,
kubernetes_secret_v1.rancher_tls_ca,
kubernetes_secret_v1.rancher_tls_ca_additional,
helm_release.rancher,
]
provisioner "local-exec" {
Expand All @@ -231,9 +231,9 @@ resource "terraform_data" "get_public_cert_info" {
time_sleep.settle_before_rancher,
terraform_data.wait_for_nginx,
terraform_data.cattle-system,
kubernetes_secret.tls_rancher_ingress,
kubernetes_secret.rancher_tls_ca,
kubernetes_secret.rancher_tls_ca_additional,
kubernetes_secret_v1.tls_rancher_ingress,
kubernetes_secret_v1.rancher_tls_ca,
kubernetes_secret_v1.rancher_tls_ca_additional,
helm_release.rancher,
terraform_data.wait_for_rancher,
]
Expand Down