diff --git a/deploy/helm_charts/dc_website/templates/deployment.yaml b/deploy/helm_charts/dc_website/templates/deployment.yaml index 008e5292fa..7beec761a2 100644 --- a/deploy/helm_charts/dc_website/templates/deployment.yaml +++ b/deploy/helm_charts/dc_website/templates/deployment.yaml @@ -56,7 +56,7 @@ spec: name: schema-mapping{{ .Values.resourceSuffix }} containers: - name: website - image: "{{ .Values.website.image.repository }}:{{ .Values.website.image.tag }}" + image: "gcr.io/{{ .Values.website.image.project }}/datacommons-website:{{ .Values.website.image.tag }}" imagePullPolicy: {{ .Values.website.image.pullPolicy }} args: [] ports: @@ -75,9 +75,9 @@ spec: periodSeconds: 10 resources: limits: - memory: "8G" + memory: "3G" requests: - memory: "8G" + memory: "3G" volumeMounts: - name: ai-config mountPath: /datacommons/ai @@ -117,7 +117,7 @@ spec: - name: BOUNCE value: "dummy" - name: mixer - image: "{{ .Values.mixer.image.repository }}:{{ .Values.mixer.image.tag | default .Chart.AppVersion }}" + image: "gcr.io/{{ .Values.mixer.image.project }}/datacommons-mixer:{{ .Values.mixer.image.tag }}" imagePullPolicy: {{ .Values.mixer.image.pullPolicy }} resources: limits: @@ -201,9 +201,9 @@ spec: key: serviceName resources: limits: - memory: "2G" + memory: "1G" requests: - memory: "2G" + memory: "1G" readinessProbe: httpGet: path: /healthz diff --git a/deploy/helm_charts/dc_website/templates/ingress.yaml b/deploy/helm_charts/dc_website/templates/ingress.yaml index a979654c6a..bcf0c9f3b5 100644 --- a/deploy/helm_charts/dc_website/templates/ingress.yaml +++ b/deploy/helm_charts/dc_website/templates/ingress.yaml @@ -29,10 +29,9 @@ kind: Ingress metadata: name: {{ .Values.ingress.name }} namespace: {{ .Values.namespace.name }} - {{- with .Values.ingress.annotations }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + kubernetes.io/ingress.global-static-ip-name: dc-website-ip + ingress.gcp.kubernetes.io/pre-shared-cert: dc-website-cert{{ .Values.resourceSuffix }} spec: rules: - http: diff --git a/deploy/helm_charts/dc_website/values.yaml b/deploy/helm_charts/dc_website/values.yaml index c341e43a46..8824f6c560 100644 --- a/deploy/helm_charts/dc_website/values.yaml +++ b/deploy/helm_charts/dc_website/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -resourceSuffix: +resourceSuffix: "" # Website service config. website: @@ -13,11 +13,11 @@ website: githash: image: - repository: gcr.io/datcom-ci/datacommons-website + project: "datcom-ci" pullPolicy: Always tag: - flaskEnv: + flaskEnv: "custom" secretGCPProjectID: enableModel: false @@ -45,7 +45,6 @@ serviceAccount: ingress: name: website-ingress enabled: - annotations: { kubernetes.io/ingress.global-static-ip-name: mixer-ip } ############################################################################### # Config for Mixer helm chart @@ -55,7 +54,7 @@ mixer: githash: image: - repository: gcr.io/datcom-ci/datacommons-mixer + project: "datcom-ci" pullPolicy: Always tag: diff --git a/deploy/terraform-datacommons-website/examples/website_v1/.terraform.lock.hcl b/deploy/terraform-datacommons-website/examples/website_v1/.terraform.lock.hcl deleted file mode 100644 index 0caaddcea0..0000000000 --- a/deploy/terraform-datacommons-website/examples/website_v1/.terraform.lock.hcl +++ /dev/null @@ -1,79 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/external" { - version = "2.0.0" - constraints = "~> 2.0.0" - hashes = [ - "h1:6S7hqjmUnoAZ5D/0F1VlJZKSJsUIBh7Ro0tLjGpKO0g=", - "zh:07949780dd6a1d43e7b46950f6e6976581d9724102cb5388d3411a1b6f476bde", - "zh:0a4f4636ff93f0644affa8474465dd8c9252946437ad025b28fc9f6603534a24", - "zh:0dd7e05a974c649950d1a21d7015d3753324ae52ebdd1744b144bc409ca4b3e8", - "zh:2b881032b9aa9d227ac712f614056d050bcdcc67df0dc79e2b2cb76a197059ad", - "zh:38feb4787b4570335459ca75a55389df1a7570bdca8cdf5df4c2876afe3c14b4", - "zh:40f7e0aaef3b1f4c2ca2bb1189e3fe9af8c296da129423986d1d99ccc8cfb86c", - "zh:56b361f64f0f0df5c4f958ae2f0e6f8ba192f35b720b9d3ae1be068fabcf73d9", - "zh:5fadb5880cd31c2105f635ded92b9b16f918c1dd989627a4ce62c04939223909", - "zh:61fa0be9c14c8c4109cfb7be8d54a80c56d35dbae49d3231cddb59831e7e5a4d", - "zh:853774bf97fbc4a784d5af5a4ca0090848430781ae6cfc586adeb48f7c44af79", - ] -} - -provider "registry.terraform.io/hashicorp/google" { - version = "4.28.0" - constraints = ">= 3.43.0, ~> 4.28.0, < 5.0.0" - hashes = [ - "h1:GWIsjFFxrWk2kY+xrzfczjCCBL2m2WuI5/Kw3AF5y2Q=", - "zh:17664192fbeb733d6d6cfa17fbd1c54e6f1614f635f48adfae17557e121b63eb", - "zh:2993a3ba417c576ca9c6adccb6a6e914b4dedd3f91a735fd14ab8910936d8c11", - "zh:452323359fd64dc0fbf96da8c1df1df57cacef72cf2615631662bdec1d73d94e", - "zh:492c1d1bfbd9bef2a30fab0096ae642ceeeee81499cf5aa9f4505a884b0855a3", - "zh:611875b0246bdbd8815f8e81e744e31466559fec3b4566c9d2f3d1fd54c20292", - "zh:63c5084e1ac50165da1feebf2f51af3c8a7b61f817861418850b2b59b010b604", - "zh:6efb784223405839aa22fc6e40e37e08dd7ba37310e327dea1731299e5c67104", - "zh:ac51b5555bfdee282885475831bdc336f42294687e887f91cd339f15a4f69bc1", - "zh:c98e971f99f43aea9e0363cdd478e3b19f79b4553357a089bb10ba7ab897a932", - "zh:e9c29205674657f7b31f352a680a17262a797150bcbe76b26939d5cb39d19199", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f968998e7690cd508c1f7847d7fa3ba2ae448d70e94414ada85c1cee81b3bcd9", - ] -} - -provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.28.0" - constraints = ">= 3.43.0, ~> 4.28.0, < 5.0.0" - hashes = [ - "h1:OCnAHwByjG7Ck54UXweixWOKuQfheAgIbLvs3Rhttws=", - "zh:02049634b3dd7928628145c1993e9a6772b8229e94c0466943dd8a192c7dcf43", - "zh:113664260f56d0559c9f4c5b912dd80ee966d09ff3723fe6ae1a71fa4915fdc9", - "zh:28de139a2db9ccf280a92fa18ed41f36ea5ef4269fda4124288751eec45b6907", - "zh:303dec5be87bd935351bf991da4edff71bab9909ce410a819b3dd0849a27df8b", - "zh:579b6cf837488a0e6335c1ca0b81ce0936d2ea29c24b4fb8ba54018e81a0cabb", - "zh:77cdb315e9144739241f9ea3e55502104dece33ce0acd9694469a3a5df4e3906", - "zh:837c37d168dc557b474b5dac3b850e134779a27ee9df3f49a4427c569d0eae44", - "zh:9359bf058b95fa6b9337a3b55168517fd380e6752c383c964fb776513621aca4", - "zh:cf3cdef5ed5d4a321ffd2cac070a00ff0f8cee7bfd6a2697c494a1d06937bb67", - "zh:e4f647bd336260fc477f7ab77e48e825d49f3d4ed1391bf232b5039cfc411760", - "zh:ec3a02205594beeeedd090dd6c831a988fc0ff58fb353cc78dc6395eedf19979", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.1.1" - hashes = [ - "h1:Pctug/s/2Hg5FJqjYcTM0kPyx3AoYK1MpRWO0T9V2ns=", - "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", - "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", - "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8fdd792a626413502e68c195f2097352bdc6a0df694f7df350ed784741eb587e", - "zh:976bbaf268cb497400fd5b3c774d218f3933271864345f18deebe4dcbfcd6afa", - "zh:b21b78ca581f98f4cdb7a366b03ae9db23a73dfa7df12c533d7c19b68e9e72e5", - "zh:b7fc0c1615dbdb1d6fd4abb9c7dc7da286631f7ca2299fb9cd4664258ccfbff4", - "zh:d1efc942b2c44345e0c29bc976594cb7278c38cfb8897b344669eafbc3cddf46", - "zh:e356c245b3cd9d4789bab010893566acace682d7db877e52d40fc4ca34a50924", - "zh:ea98802ba92fcfa8cf12cbce2e9e7ebe999afbf8ed47fa45fc847a098d89468b", - "zh:eff8872458806499889f6927b5d954560f3d74bf20b6043409edf94d26cd906f", - ] -} diff --git a/deploy/terraform-datacommons-website/examples/website_v1/main.tf b/deploy/terraform-datacommons-website/examples/website_v1/main.tf index 9e3b8392dd..8dbf3ebe57 100644 --- a/deploy/terraform-datacommons-website/examples/website_v1/main.tf +++ b/deploy/terraform-datacommons-website/examples/website_v1/main.tf @@ -64,7 +64,7 @@ module "apikeys" { source = "../../modules/apikeys" project_id = var.project_id dc_website_domain = var.dc_website_domain - location = var.region + location = var.location resource_suffix = local.resource_suffix } @@ -78,7 +78,7 @@ module "esp" { module "cluster" { source = "../../modules/gke" project_id = var.project_id - region = var.region + location = var.location cluster_name_prefix = var.cluster_name_prefix web_robot_sa_email = local.web_robot_sa_email @@ -99,48 +99,3 @@ resource "google_compute_managed_ssl_certificate" "dc_website_cert" { domains = [format("%s.", var.dc_website_domain)] } } - -# IMPORTANT NOTE: This script assumes that -# "~/.kube/config" already exists. This is because provider cannot depend on data or resources, -# as provider blocks need to be determined before resources/data states are fetched. -# In install_custom_dc.sh, currentlythe kubeconfig is fetched before calling terraform apply. -# .kube/config is the location where gcloud command for GKE stores cluster config, which -# is required to access the cluster, including using helm. -provider "kubernetes" { - alias = "datcom" - kubernetes { - config_path = "~/.kube/config" - } -} - -provider "helm" { - alias = "datcom" - kubernetes { - config_path = "~/.kube/config" - } -} - -module "k8s_resources" { - providers = { - kubernetes = kubernetes.datcom - helm = helm.datcom - } - - resource_suffix = local.resource_suffix - website_githash = var.website_githash - mixer_githash = var.mixer_githash - - source = "../../modules/helm" - project_id = var.project_id - - cluster_name = module.cluster.name - cluster_region = var.region - dc_website_domain = var.dc_website_domain - global_static_ip_name = format("dc-website-ip%s", local.resource_suffix) - managed_cert_name = google_compute_managed_ssl_certificate.dc_website_cert.name - - depends_on = [ - google_compute_managed_ssl_certificate.dc_website_cert, - module.cluster - ] -} diff --git a/deploy/terraform-datacommons-website/examples/website_v1/outputs.tf b/deploy/terraform-datacommons-website/examples/website_v1/outputs.tf index 6eb1179fcc..416e1a50f7 100644 --- a/deploy/terraform-datacommons-website/examples/website_v1/outputs.tf +++ b/deploy/terraform-datacommons-website/examples/website_v1/outputs.tf @@ -2,6 +2,6 @@ output "cluster_name" { value = module.cluster.name } -output "cluster_region" { - value = module.cluster.region +output "cluster_location" { + value = module.cluster.location } diff --git a/deploy/terraform-datacommons-website/examples/website_v1/variables.tf b/deploy/terraform-datacommons-website/examples/website_v1/variables.tf index c60b40b28c..2c5e1a2a2f 100644 --- a/deploy/terraform-datacommons-website/examples/website_v1/variables.tf +++ b/deploy/terraform-datacommons-website/examples/website_v1/variables.tf @@ -45,10 +45,21 @@ variable "cluster_name_prefix" { default = "datacommons" } -variable "region" { +variable "location" { type = string - description = "GCP region where the cluster will be created in." - default = "us-central1" + description = <