Adds ocp-vpc dependency and updates tests (#17)

Signed-off-by: Sean Sundberg <[email protected]>

Author: Sean Sundberg

.github/workflows/verify.yaml

@@ -13,7 +13,7 @@ jobs:
   verify:
     if: ${{ !contains( github.event.pull_request.labels.*.name, 'skip ci' ) }}
     runs-on: ubuntu-latest
-    container: quay.io/ibmgaragecloud/cli-tools:v0.9.0-lite
+    container: quay.io/ibmgaragecloud/cli-tools:v0.12.0-lite
 
     strategy:
       matrix:

.gitignore

@@ -1 +1,2 @@
 .idea/
+*.iml

main.tf

@@ -1,13 +1,3 @@
-provider "helm" {
-  version = ">= 1.1.1"
-
-  kubernetes {
-    config_path = var.cluster_config_file
-  }
-}
-
-provider "null" {
-}
 
 locals {
   tmp_dir      = "${path.cwd}/.tmp"

module.yaml

@@ -16,6 +16,8 @@ versions:
       refs:
         - source: github.com/ibm-garage-cloud/terraform-ibm-container-platform
           version: ">= 1.7.0"
+        - source: github.com/ibm-garage-cloud/terraform-ibm-ocp-vpc
+          version: ">= 1.0.0"
         - source: github.com/ibm-garage-cloud/terraform-k8s-ocp-cluster
           version: ">= 2.0.0"
     - id: namespace
@@ -26,19 +28,19 @@ versions:
     - name: cluster_type
       moduleRef:
         id: cluster
-        output: type_code
+        output: platform.type_code
     - name: cluster_ingress_hostname
       moduleRef:
         id: cluster
-        output: ingress_hostname
+        output: platform.ingress
     - name: cluster_config_file
       moduleRef:
         id: cluster
         output: config_file_path
     - name: tls_secret_name
       moduleRef:
         id: cluster
-        output: tls_secret_name
+        output: platform.tls_secret
     - name: releases_namespace
       moduleRef:
         id: namespace

outputs.tf

@@ -1,35 +1,35 @@
 output "ingress_host" {
   description = "The ingress host for the SonarQube instance"
   value       = local.ingress_host
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }
 
 output "ingress_url" {
   description = "The ingress url for the SonarQube instance"
   value       = local.ingress_url
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }
 
 output "config_name" {
   description = "The name of the configmap created to store the url"
   value       = local.config_name
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }
 
 output "secret_name" {
   description = "The name of the secret created to store the credentials"
   value       = local.secret_name
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }
 
 output "service_account" {
   description = "The service account name that was used"
   value       = var.service_account_name
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }
 
 output "namespace" {
   description = "The namespace where sonarqube has been installed"
   value       = var.releases_namespace
-  depends_on  = [helm_release.sonarqube-config]
+  depends_on  = [helm_release.sonarqube]
 }

providers.tf

@@ -0,0 +1,5 @@
+provider "helm" {
+  kubernetes {
+    config_path = var.cluster_config_file
+  }
+}

test/stages/stage1-cluster.tf

@@ -1,18 +1,14 @@
 module "dev_cluster" {
-  source = "github.com/ibm-garage-cloud/terraform-ibm-container-platform.git"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-ocp-vpc.git"
 
   resource_group_name     = var.resource_group_name
-  cluster_name            = var.cluster_name
-  cluster_region          = var.region
-  cluster_type            = substr(var.cluster_type, 0, 3) == "iks" ? "kubernetes" : var.cluster_type
-  cluster_exists          = true
+  region                  = var.region
   ibmcloud_api_key        = var.ibmcloud_api_key
+  name                    = var.cluster_name
+  worker_count            = 2
   name_prefix             = var.name_prefix
-  is_vpc                  = var.vpc_cluster
-  private_vlan_id         = ""
-  public_vlan_id          = ""
-  vlan_datacenter         = ""
-  cluster_machine_type    = ""
-  cluster_worker_count    = 3
-  cluster_hardware        = ""
+  exists                  = true
+  cos_id                  = ""
+  vpc_subnet_count        = 1
+  vpc_name                = ""
 }

test/stages/stage1-namespaces.tf

@@ -1,8 +1,6 @@
 module "dev_tools_namespace" {
   source = "github.com/ibm-garage-cloud/terraform-cluster-namespace.git"
 
-  cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
-  tls_secret_name          = module.dev_cluster.tls_secret_name
   name                     = var.namespace
 }

test/stages/stage1b-capture-state.tf

@@ -1,7 +1,7 @@
 module "dev_capture_state" {
   source = "github.com/ibm-garage-cloud/terraform-k8s-capture-state"
 
-  cluster_type             = module.dev_cluster.type_code
+  cluster_type             = module.dev_cluster.platform.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
   namespace                = module.dev_tools_namespace.name
   output_path              = "${path.cwd}/cluster-state/before"

test/stages/stage2-sonarqube.tf

@@ -1,12 +1,12 @@
 module "dev_tools_sonarqube" {
   source = "./module"
 
-  cluster_type             = module.dev_cluster.type_code
-  cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   cluster_config_file      = module.dev_cluster.config_file_path
+  cluster_type             = module.dev_cluster.platform.type_code
+  cluster_ingress_hostname = module.dev_cluster.platform.ingress
+  tls_secret_name          = module.dev_cluster.platform.tls_secret
   releases_namespace       = module.dev_capture_state.namespace
   service_account_name     = "sonarqube"
-  tls_secret_name          = module.dev_cluster.tls_secret_name
   postgresql               = {
     external      = false
     username      = ""