diff --git a/main.tf b/main.tf index 7a8c6a0..1eff858 100644 --- a/main.tf +++ b/main.tf @@ -135,9 +135,6 @@ module "verrazzano" { mesh_id = var.mesh_id istio_model = var.istio_model - dev_prom_operator = var.dev_prom_operator - dev_thanos = var.dev_thanos - depends_on = [ module.clusters ] diff --git a/modules/verrazzano/resources/thanos-enhanced.template.yaml b/modules/verrazzano/resources/thanos-enhanced.template.yaml index e88e255..5db3618 100644 --- a/modules/verrazzano/resources/thanos-enhanced.template.yaml +++ b/modules/verrazzano/resources/thanos-enhanced.template.yaml @@ -1,5 +1,5 @@ type: OCI config: provider: "oke-workload-identity" - bucket: "${label_prefix}-thanos" + bucket: ${bucket_name} region: "${region}" \ No newline at end of file diff --git a/modules/verrazzano/resources/vz_admin.template.yaml b/modules/verrazzano/resources/vz_admin.template.yaml index ba1ef97..4c3f0d6 100644 --- a/modules/verrazzano/resources/vz_admin.template.yaml +++ b/modules/verrazzano/resources/vz_admin.template.yaml @@ -129,7 +129,6 @@ spec: integration: sidecar prometheusSpec: thanos: - image: ${dev_prom_operator} objectStorageConfig: name: objstore-config key: objstore.yml @@ -138,10 +137,6 @@ spec: overrides: - values: existingObjstoreSecret: objstore-config - image: - registry: phx.ocir.io - repository: ${dev_thanos} - tag: 0.32.0 storagegateway: enabled: ${storage_gateway} rancher: diff --git a/modules/verrazzano/resources/vz_admin_nip.template.yaml b/modules/verrazzano/resources/vz_admin_nip.template.yaml index 58ec3b0..8baefc4 100644 --- a/modules/verrazzano/resources/vz_admin_nip.template.yaml +++ b/modules/verrazzano/resources/vz_admin_nip.template.yaml @@ -92,7 +92,6 @@ spec: integration: sidecar prometheusSpec: thanos: - image: ${dev_prom_operator} objectStorageConfig: name: objstore-config key: objstore.yml @@ -101,10 +100,6 @@ spec: overrides: - values: existingObjstoreSecret: objstore-config - image: - registry: phx.ocir.io - repository: ${dev_thanos} - tag: 0.32.0 storagegateway: enabled: ${storage_gateway} rancher: diff --git a/modules/verrazzano/resources/vz_mc.template.yaml b/modules/verrazzano/resources/vz_mc.template.yaml index 844a66b..28763ef 100644 --- a/modules/verrazzano/resources/vz_mc.template.yaml +++ b/modules/verrazzano/resources/vz_mc.template.yaml @@ -107,7 +107,6 @@ spec: integration: sidecar prometheusSpec: thanos: - image: ${dev_prom_operator} objectStorageConfig: name: objstore-config key: objstore.yml @@ -116,10 +115,6 @@ spec: overrides: - values: existingObjstoreSecret: objstore-config - image: - registry: phx.ocir.io - repository: ${dev_thanos} - tag: 0.32.0 storagegateway: enabled: ${storage_gateway} velero: diff --git a/modules/verrazzano/resources/vz_mc_nip.template.yaml b/modules/verrazzano/resources/vz_mc_nip.template.yaml index c3a20f8..6c970cb 100644 --- a/modules/verrazzano/resources/vz_mc_nip.template.yaml +++ b/modules/verrazzano/resources/vz_mc_nip.template.yaml @@ -70,7 +70,6 @@ spec: integration: sidecar prometheusSpec: thanos: - image: ${dev_prom_operator} objectStorageConfig: name: objstore-config key: objstore.yml @@ -79,10 +78,6 @@ spec: overrides: - values: existingObjstoreSecret: objstore-config - image: - registry: phx.ocir.io - repository: ${dev_thanos} - tag: 0.32.0 storagegateway: enabled: ${storage_gateway} velero: diff --git a/modules/verrazzano/scripts/install_vz_cli.template.sh b/modules/verrazzano/scripts/install_vz_cli.template.sh index 8b04540..7b31dff 100644 --- a/modules/verrazzano/scripts/install_vz_cli.template.sh +++ b/modules/verrazzano/scripts/install_vz_cli.template.sh @@ -16,4 +16,4 @@ chmod +x clusterctl sudo mv clusterctl /usr/local/bin curl -L https://istio.io/downloadIstio | sh - -sudo cp istio-1.18.2/bin/istioctl /usr/local/bin \ No newline at end of file +sudo cp istio-1.19.0/bin/istioctl /usr/local/bin \ No newline at end of file diff --git a/modules/verrazzano/templates.tf b/modules/verrazzano/templates.tf index d949012..33eb6a3 100644 --- a/modules/verrazzano/templates.tf +++ b/modules/verrazzano/templates.tf @@ -116,8 +116,6 @@ locals { rancher = var.rancher thanos_enabled = tobool(lookup(var.thanos, "enabled", "false")) thanos_integration = lookup(var.thanos, "integration", "sidecar") - dev_prom_operator = var.dev_prom_operator - dev_thanos = var.dev_thanos storage_gateway = tobool(lookup(var.thanos, "storage_gateway", "false")) velero = var.velero weblogic_operator = var.weblogic_operator @@ -152,8 +150,6 @@ locals { prometheus_operator = var.prometheus_operator thanos_enabled = tobool(lookup(var.thanos, "enabled", "false")) thanos_integration = lookup(var.thanos, "integration", "sidecar") - dev_prom_operator = var.dev_prom_operator - dev_thanos = var.dev_thanos storage_gateway = tobool(lookup(var.thanos, "storage_gateway", "false")) rancher = var.rancher velero = var.velero @@ -189,8 +185,6 @@ locals { prometheus_operator = var.prometheus_operator thanos_enabled = tobool(lookup(var.thanos, "enabled", "false")) thanos_integration = lookup(var.thanos, "integration", "sidecar") - dev_prom_operator = var.dev_prom_operator - dev_thanos = var.dev_thanos storage_gateway = tobool(lookup(var.thanos, "storage_gateway", "false")) velero = var.velero weblogic_operator = var.weblogic_operator @@ -221,8 +215,6 @@ locals { prometheus_operator = var.prometheus_operator thanos_enabled = tobool(lookup(var.thanos, "enabled", "false")) thanos_integration = lookup(var.thanos, "integration", "sidecar") - dev_prom_operator = var.dev_prom_operator - dev_thanos = var.dev_thanos storage_gateway = tobool(lookup(var.thanos, "storage_gateway", "false")) velero = var.velero weblogic_operator = var.weblogic_operator @@ -287,11 +279,10 @@ locals { thanos_storage_templates = { for k, v in var.all_cluster_ids : - # k => templatefile("${path.module}/resources/thanos-storage.template.yaml", { k => templatefile("${path.module}/resources/${local.thanos_template}", { label_prefix = var.label_prefix region = lookup(local.all_regions, k) - bucket_name = lookup(var.thanos, "bucket_name", "thanos") + bucket_name = "${var.label_prefix}-${lookup(var.thanos, "bucket_name", "thanos")}" }) if tobool(lookup(var.thanos, "enabled", "false")) && v != "" } diff --git a/modules/verrazzano/variables.tf b/modules/verrazzano/variables.tf index d757b43..3f68bcb 100644 --- a/modules/verrazzano/variables.tf +++ b/modules/verrazzano/variables.tf @@ -210,12 +210,4 @@ variable "istio_model" { default = "single" description = "The deployment model of Istio to use when deploying multiple clusters" type = string -} - -variable "dev_prom_operator" { - type = string -} - -variable "dev_thanos" { - type = string } \ No newline at end of file diff --git a/variables.tf b/variables.tf index 8000533..f93232d 100644 --- a/variables.tf +++ b/variables.tf @@ -138,7 +138,7 @@ variable "admin_region" { } variable "kubernetes_version" { - default = "v1.26.2" + default = "v1.27.2" description = "The version of Kubernetes to use." type = string } @@ -266,7 +266,7 @@ variable "install_verrazzano" { } variable "verrazzano_version" { - default = "1.6.5" + default = "1.6.7" description = "Verrazzano version to install" type = string } @@ -461,16 +461,4 @@ variable "istio_model" { default = "single" description = "The deployment model of Istio to use when using multiple clusters" type = string -} - -variable "dev_prom_operator" { - default = "" - description = "dev prometheus operator image" - type = string -} - -variable "dev_thanos" { - default = "" - description = "dev thanos image" - type = string } \ No newline at end of file