Skip to content

Commit

Permalink
Merge pull request #26 from BrownUniversity/patch-pin-infoblox-version
Browse files Browse the repository at this point in the history
patch: use version of infoblox that pins provider due to bug
  • Loading branch information
mirestrepo authored Jan 11, 2023
2 parents ca53a02 + 76e0761 commit 9eed22d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
terraform 1.2.5
ruby 3.0.4-r0
ruby 3.0.4
1 change: 1 addition & 0 deletions examples/sample-jhub/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module "sample-jhub" {
record_domain = local.jhub_domain

# ---------------- CLUSTER VARIABLES -----------------------
kubernetes_version = 1.24
regional = false
region = local.gcp_region
gcp_zone = local.gcp_zone
Expand Down
4 changes: 4 additions & 0 deletions examples/sample-jhub/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
hub:
db:
pvc:
storageClassName: standard-rwo
prePuller:
continuous:
enabled: true
Expand Down
7 changes: 4 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ resource "google_compute_address" "static" {

# Assign Brown-DNS via infoblox
module "production_infoblox_record" {
source = "git::https://github.com/BrownUniversity/terraform-infoblox-record-a.git?ref=v0.1.3"
source = "git::https://github.com/BrownUniversity/terraform-infoblox-record-a.git?ref=v0.1.4"
record_ip = google_compute_address.static.address
record_hostname = var.record_hostname
record_domain = var.record_domain
record_dns_view = "production"
}

module "external_infoblox_record" {
source = "git::https://github.com/BrownUniversity/terraform-infoblox-record-a.git?ref=v0.1.3"
source = "git::https://github.com/BrownUniversity/terraform-infoblox-record-a.git?ref=v0.1.4"
record_ip = google_compute_address.static.address
record_hostname = var.record_hostname
record_domain = var.record_domain
Expand All @@ -68,9 +68,10 @@ module "external_infoblox_record" {

# Create the cluster
module "jhub_cluster" {
source = "git::https://github.com/BrownUniversity/terraform-gcp-cluster.git?ref=v0.1.4"
source = "git::https://github.com/BrownUniversity/terraform-gcp-cluster.git?ref=v0.1.5"
cluster_name = var.cluster_name
project_id = module.jhub_project.project_id
kubernetes_version = var.kubernetes_version
regional = var.regional
region = var.region
node_zones = [var.gcp_zone]
Expand Down
5 changes: 5 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,11 @@ variable "helm_values_file" {
description = "Relative path and file name. Example: values.yaml"
}

variable "kubernetes_version" {
type = string
description = "The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region."
}

variable "jhub_helm_version" {
type = string
description = "Version of the JupyterHub Helm Chart Release"
Expand Down

0 comments on commit 9eed22d

Please sign in to comment.