diff --git a/.gitignore b/.gitignore index 0dcdb20680..dbca3b6666 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ build/ bin/ bin_test/ matchbox/ -modules/update-payload/generated/ /contrib/govcloud/vpn.conf # Bazel diff --git a/BUILD.bazel b/BUILD.bazel index 66ac9f108c..09e808b673 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -99,7 +99,7 @@ genrule( pkg_tar( name = "tarball_terraform_configuration", mode = "0644", - srcs = glob(["modules/**"], exclude=["modules/update-payload/**"]) + glob(["steps/**"]) + ["config.tf"], + srcs = glob(["modules/**"]) + glob(["steps/**"]) + ["config.tf"], strip_prefix = ".", ) diff --git a/modules/update-payload/assets.tf b/modules/update-payload/assets.tf deleted file mode 100644 index 5113c5007e..0000000000 --- a/modules/update-payload/assets.tf +++ /dev/null @@ -1,51 +0,0 @@ -# Kubernetes Deployments and AppVersions TPR used in the payload -resource "template_dir" "payload_operators" { - source_dir = "../tectonic/resources/manifests/updater/operators" - destination_dir = "./generated/operators" - - vars { - kube_core_operator_image = "${var.tectonic_container_images["kube_core_operator"]}" - tectonic_channel_operator_image = "${var.tectonic_container_images["tectonic_channel_operator"]}" - tectonic_prometheus_operator_image = "${var.tectonic_container_images["tectonic_prometheus_operator"]}" - tectonic_cluo_operator_image = "${var.tectonic_container_images["tectonic_cluo_operator"]}" - kubernetes_addon_operator_image = "${var.tectonic_container_images["kubernetes_addon_operator"]}" - tectonic_alm_operator_image = "${var.tectonic_container_images["tectonic_alm_operator"]}" - tectonic_utility_operator_image = "${var.tectonic_container_images["tectonic_utility_operator"]}" - } -} - -# TNO -data "template_file" "tectonic_network_operator" { - template = "${file("${path.module}/../bootkube/resources/manifests/tectonic-network-operator.yaml")}" - - vars { - tectonic_network_operator_image = "${var.tectonic_container_images["tectonic_network_operator"]}" - } -} - -resource "local_file" "tectonic_network_operator" { - content = "${data.template_file.tectonic_network_operator.rendered}" - filename = "./generated/operators/tectonic-network-operator.yaml" - - depends_on = ["template_dir.payload_operators"] -} - -resource "template_dir" "payload_appversions" { - source_dir = "../tectonic/resources/manifests/updater/app_versions" - destination_dir = "./generated/app_versions" - - vars { - monitoring_version = "${var.tectonic_versions["monitoring"]}" - tectonic_version = "${var.tectonic_versions["tectonic"]}" - tectonic_cluo_operator_version = "${var.tectonic_versions["cluo"]}" - tectonic_alm_operator_version = "${var.tectonic_versions["alm"]}" - } -} - -# TNO -resource "local_file" "appversion_tectonic_network" { - content = "${file("${path.module}/../bootkube/resources/manifests/app-version-tectonic-network.yaml")}" - filename = "./generated/app_versions/app-version-tectonic-network.yaml" - - depends_on = ["template_dir.payload_appversions"] -} diff --git a/modules/update-payload/config.tf b/modules/update-payload/config.tf deleted file mode 120000 index a040ec375d..0000000000 --- a/modules/update-payload/config.tf +++ /dev/null @@ -1 +0,0 @@ -../../config.tf \ No newline at end of file