Skip to content

Commit

Permalink
Use moved blocks to ease upgrades
Browse files Browse the repository at this point in the history
The moved blocks allow relocation of resources. They handle the state
transition. Moving namespaces to using a count would otherwise result
in their destruction. This would be disruptive as it requires
associated kubernetes resources to also be removed.
  • Loading branch information
bobdoah committed Jun 8, 2022
1 parent ab9bdc8 commit 1691a05
Show file tree
Hide file tree
Showing 32 changed files with 96 additions and 16 deletions.
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/adot-collector-haproxy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.collector]
}

moved {
from = kubernetes_namespace_v1.collector
to = kubernetes_namespace_v1.collector[0]
}

resource "kubernetes_namespace_v1" "collector" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/adot-collector-java/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.collector]
}

moved {
from = kubernetes_namespace_v1.collector
to = kubernetes_namespace_v1.collector[0]
}

resource "kubernetes_namespace_v1" "collector" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/adot-collector-java/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/adot-collector-memcached/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.collector]
}

moved {
from = kubernetes_namespace_v1.collector
to = kubernetes_namespace_v1.collector[0]
}

resource "kubernetes_namespace_v1" "collector" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/adot-collector-nginx/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.collector]
}

moved {
from = kubernetes_namespace_v1.collector
to = kubernetes_namespace_v1.collector[0]
}

resource "kubernetes_namespace_v1" "collector" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/adot-collector-nginx/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/agones/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/agones/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/argo-rollouts/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/argo-rollouts/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/argocd/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/argocd/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/crossplane/main.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
moved {
from = kubernetes_namespace_v1.crossplane
to = kubernetes_namespace_v1.crossplane[0]
}

resource "kubernetes_namespace_v1" "crossplane" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/crossplane/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/ingress-nginx/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ module "helm_addon" {
# Helm Namespace
#-------------------------------------

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/ingress-nginx/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/metrics-server/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0

Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/metrics-server/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/opentelemetry-operator/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ module "operator" {

depends_on = [kubernetes_namespace_v1.prometheus]
}
moved {
from = kubernetes_namespace_v1.prometheus
to = kubernetes_namespace_v1.prometheus[0]
}


resource "kubernetes_namespace_v1" "prometheus" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/prometheus/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.prometheus]
}

moved {
from = kubernetes_namespace_v1.prometheus
to = kubernetes_namespace_v1.prometheus[0]
}

resource "kubernetes_namespace_v1" "prometheus" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/prometheus/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
aws = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/spark-k8s-operator/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/spark-k8s-operator/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/traefik/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.this]
}

moved {
from = kubernetes_namespace_v1.this
to = kubernetes_namespace_v1.this[0]
}

resource "kubernetes_namespace_v1" "this" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/traefik/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/vpa/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.vpa]
}

moved {
from = kubernetes_namespace_v1.vpa
to = kubernetes_namespace_v1.vpa[0]
}

resource "kubernetes_namespace_v1" "vpa" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/vpa/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down
5 changes: 5 additions & 0 deletions modules/kubernetes-addons/yunikorn/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module "helm_addon" {
depends_on = [kubernetes_namespace_v1.yunikorn]
}

moved {
from = kubernetes_namespace_v1.yunikorn
to = kubernetes_namespace_v1.yunikorn[0]
}

resource "kubernetes_namespace_v1" "yunikorn" {
count = try(local.helm_config["create_namespace"], true) && local.helm_config["namespace"] != "kube-system" ? 1 : 0
metadata {
Expand Down
2 changes: 1 addition & 1 deletion modules/kubernetes-addons/yunikorn/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 1.0.0"
required_version = ">= 1.1.0"

required_providers {
kubernetes = {
Expand Down

0 comments on commit 1691a05

Please sign in to comment.