Skip to content
Permalink
Browse files

Migrate nginx-ingress to GCR.

  • Loading branch information...
mrtyler committed Apr 6, 2019
1 parent 8be5540 commit c8bb57043893418fca07c8579c619a363d00704a
Showing with 25 additions and 3 deletions.
  1. +17 −3 gcp/modules/nginx-ingress/main.tf
  2. +3 −0 gcp/modules/nginx-ingress/values.yaml
  3. +5 −0 shared/versions.yml
@@ -7,6 +7,8 @@ variable "serviceaccount_key" {}
variable "project_id" {}
variable "secrets_dir" {}
variable "charts_dir" {}
variable "nginx_ingress_repository" {}
variable "nginx_ingress_tag" {}

data "terraform_remote_state" "network" {
backend = "gcs"
@@ -22,15 +24,27 @@ data "terraform_remote_state" "network" {
}
}

data "template_file" "nginx_ingress_values" {
template = "${file("values.yaml")}"

vars {
nginx_ingress_repository = "${var.nginx_ingress_repository}"
nginx_ingress_tag = "${var.nginx_ingress_tag}"
load_balancer_ip = "${data.terraform_remote_state.network.static_ip_address}"
}
}

module "nginx-ingress" {
source = "/exekube-modules/helm-release"
tiller_namespace = "kube-system"
client_auth = "${var.secrets_dir}/kube-system/helm-tls"

release_name = "nginx-ingress"
release_namespace = "gpii"
release_name = "nginx-ingress"
release_namespace = "gpii"
release_values = ""
release_values_rendered = "${data.template_file.nginx_ingress_values.rendered}"

chart_name = "${var.charts_dir}/nginx-ingress"

load_balancer_ip = "${data.terraform_remote_state.network.static_ip_address}"
load_balancer_ip = "${data.template_file.nginx_ingress_values.rendered.load_balancer_ip}"
}
@@ -1,4 +1,7 @@
controller:
image:
repository: ${nginx_ingress_repository}
tag: ${nginx_ingress_tag}
config:
server-tokens: "false"
service:
@@ -44,6 +44,11 @@ locust:
image: gcr.io/gpii2test-common-stg/gpii/locust
sha: sha256:e526da4f2243d7d0a330230f3c94be04ed558d0ed8946484faf7fce02ba95657
tag: 0.9.0-gpii.2
nginx_ingress:
upstream_image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0
image: gcr.io/gpii2test-common-stg/quay.io/kubernetes-ingress-controller/nginx-ingress-controller
sha: sha256:7b79e1bc6437e6376dadf558e012adde6395bb28dee4a38ce08c7e5c9f220178
tag: 0.15.0
preferences:
upstream_image: gpii/universal:latest
sha: sha256:eab9307f4b1549077c97646848e54b49fc6ceed42d98185882e2258b409f0770

0 comments on commit c8bb570

Please sign in to comment.
You can’t perform that action at this time.