Changes by create-pull-request action (#116)

github-actions[bot] · Sean Sundberg · web-flow · commit 4d3c4e7249d0 · 2020-07-07T12:52:48.000-05:00
* Bumps ibm-container-platform to v1.11.2 (and picks up kubeconfig update)
* Updates olm path to k8s-olm and bumps to v1.2.0
* Bumps argocd module to v2.8.0
* Bumps tekton module to v1.3.3
* Updates namespace repo to k8s-namespace and bumps to v2.2.0 for tools_namespace and sre_namespace
* Updates references to tools_namespace in other modules
* Removes unused release namespaces variable (dev, test, and staging)
* Updates runTerraform to remove reference to dev, test, and staging namespaces
* Updates serviceaccount repo path to k8s-serviceaccount and bumps to v1.4.0
* Updates verify-pr workflow to skip destroy for now
* Removes ocp3 from test matrix

Co-authored-by: github-actions[bot] &lt;41898282+github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: Sean Sundberg &lt;seansund@us.ibm.com&gt;
diff --git a/.github/workflows/verify-pr.yaml b/.github/workflows/verify-pr.yaml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        platform: [iks118_vpc, ocp3, ocp4]
+        platform: [iks118_vpc, ocp4_vpc]
       #      max-parallel: 1
       fail-fast: false
 
@@ -70,10 +70,10 @@ jobs:
 #          ./validate-deploy.sh ${{ matrix.platform }} ${{ env.NAMESPACE }}
 
       # Destroy
-      - name: Destroy ${{ matrix.platform }}
-        run: |
-          cd /tmp/workspace
-          ./destroy.sh
+#      - name: Destroy ${{ matrix.platform }}
+#        run: |
+#          cd /tmp/workspace
+#          ./destroy.sh
 
       # Test destroy
 #      - name: Validate destroy ${{ matrix.platform }}
diff --git a/terraform/runTerraform.sh b/terraform/runTerraform.sh
@@ -153,7 +153,7 @@ if [[ "${CLUSTER_EXISTS}" == "false" ]]; then
 else
     echo -e "  - Use an existing \033[1;33m${CLUSTER_TYPE}\033[0m cluster instance named \033[1;33m${CLUSTER_NAME}\033[0m${MANAGED_BY}"
     echo ""
-    echo -e "\033[1;31mBefore configuring the environment the following namespaces and their contents will be destroyed: tools, dev, test, staging\033[0m"
+    echo -e "\033[1;31mBefore configuring the environment the following namespaces and their contents will be destroyed: tools and ibm-observe\033[0m"
 fi
 
 if [[ "crc" ==  "${CLUSTER_MANAGEMENT}" ]]; then
diff --git a/terraform/stages/catalog/stage3-appid.tf b/terraform/stages/catalog/stage3-appid.tf
@@ -4,8 +4,8 @@ module "dev_infrastructure_appid" {
   resource_group_name = module.dev_cluster.resource_group_name
   resource_location   = module.dev_cluster.region
   cluster_id          = module.dev_cluster.id
-  namespaces          = concat([module.dev_cluster_namespaces.tools_namespace_name], module.dev_cluster_namespaces.release_namespaces)
-  namespace_count     = var.release_namespace_count+1
+  namespaces          = [module.dev_tools_namespace.name]
+  namespace_count     = 1
   name_prefix         = var.name_prefix
   tags                = [module.dev_cluster.tag]
 }
diff --git a/terraform/stages/catalog/stage3-cloud_object_storage.tf b/terraform/stages/catalog/stage3-cloud_object_storage.tf
@@ -4,7 +4,7 @@ module "dev_infrastructure_cos" {
   resource_group_name = module.dev_cluster.resource_group_name
   resource_location   = module.dev_cluster.region
   cluster_id          = module.dev_cluster.id
-  namespaces          = module.dev_cluster_namespaces.release_namespaces
+  namespaces          = module.dev_tools_namespace.name
   namespace_count     = var.release_namespace_count
   name_prefix         = var.name_prefix
 }
diff --git a/terraform/stages/catalog/stage3-cloudant.tf b/terraform/stages/catalog/stage3-cloudant.tf
@@ -4,7 +4,7 @@ module "dev_infrastructure_cloudant" {
   resource_group_name = module.dev_cluster.resource_group_name
   resource_location   = module.dev_cluster.region
   cluster_id          = module.dev_cluster.id
-  namespaces          = module.dev_cluster_namespaces.release_namespaces
+  namespaces          = module.dev_tools_namespace.name
   namespace_count     = var.release_namespace_count
   name_prefix         = var.name_prefix
 }
diff --git a/terraform/stages/catalog/stage3-postgres.tf b/terraform/stages/catalog/stage3-postgres.tf
@@ -5,8 +5,8 @@ module "dev_infrastructure_postgres" {
   resource_location   = var.region
   server_exists       = var.postgres_server_exists
   cluster_id          = module.dev_cluster.id
-  namespaces          = concat([module.dev_cluster_namespaces.tools_namespace_name], module.dev_cluster_namespaces.release_namespaces)
-  namespace_count     = var.release_namespace_count+1
+  namespaces          = [module.dev_tools_namespace.name]
+  namespace_count     = 1
   name_prefix         = var.name_prefix
   tags                = [module.dev_cluster.tag]
 }
diff --git a/terraform/stages/stage1-cluster.tf b/terraform/stages/stage1-cluster.tf
@@ -1,5 +1,5 @@
 module "dev_cluster" {
-  source = "github.com/ibm-garage-cloud/terraform-ibm-container-platform.git?ref=v1.11.0"
+  source = "github.com/ibm-garage-cloud/terraform-ibm-container-platform.git?ref=v1.11.2"
 
   resource_group_name     = var.resource_group_name
   cluster_name            = var.cluster_name
diff --git a/terraform/stages/stage1-namespaces.tf b/terraform/stages/stage1-namespaces.tf
@@ -1,15 +1,14 @@
-module "dev_cluster_namespaces" {
-  source = "github.com/ibm-garage-cloud/terraform-cluster-namespace.git?ref=v1.1.0"
+module "dev_tools_namespace" {
+  source = "github.com/ibm-garage-cloud/terraform-k8s-namespace.git?ref=v2.2.0"
 
   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
-  tools_namespace          = var.tools_namespace
-  release_namespaces       = var.release_namespaces
+  name                     = var.tools_namespace
 }
 
 module "dev_sre_namespace" {
-  source = "github.com/ibm-garage-cloud/terraform-cluster-namespace.git?ref=v2.1.0"
+  source = "github.com/ibm-garage-cloud/terraform-k8s-namespace.git?ref=v2.2.0"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
diff --git a/terraform/stages/stage1-olm.tf b/terraform/stages/stage1-olm.tf
@@ -1,5 +1,5 @@
 module "dev_software_olm" {
-  source = "github.com/ibm-garage-cloud/terraform-software-olm.git?ref=v1.1.0"
+  source = "github.com/ibm-garage-cloud/terraform-k8s-olm.git?ref=v1.2.0"
 
   cluster_config_file      = module.dev_cluster.config_file_path
   cluster_version          = ""
diff --git a/terraform/stages/stage2-argocd.tf b/terraform/stages/stage2-argocd.tf
@@ -1,11 +1,11 @@
 module "dev_tools_argocd" {
-  source = "github.com/ibm-garage-cloud/terraform-tools-argocd.git?ref=v2.7.0"
+  source = "github.com/ibm-garage-cloud/terraform-tools-argocd.git?ref=v2.8.0"
 
   cluster_config_file = module.dev_cluster.config_file_path
   cluster_type        = module.dev_cluster.type_code
   olm_namespace       = module.dev_software_olm.olm_namespace
   operator_namespace  = module.dev_software_olm.target_namespace
-  app_namespace       = module.dev_cluster_namespaces.tools_namespace_name
   ingress_subdomain   = module.dev_cluster.ingress_hostname
+  app_namespace       = module.dev_tools_namespace.name
   name                = "argocd"
 }
diff --git a/terraform/stages/stage2-artifactory.tf b/terraform/stages/stage2-artifactory.tf
@@ -2,9 +2,9 @@ module "dev_tools_artifactory" {
   source = "github.com/ibm-garage-cloud/terraform-tools-artifactory.git?ref=v1.4.0"
 
   cluster_type             = module.dev_cluster.type_code
-  service_account          = "artifactory-artifactory"
-  releases_namespace       = module.dev_cluster_namespaces.tools_namespace_name
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   cluster_config_file      = module.dev_cluster.config_file_path
   tls_secret_name          = module.dev_cluster.tls_secret_name
+  releases_namespace       = module.dev_tools_namespace.name
+  service_account          = "artifactory-artifactory"
 }
diff --git a/terraform/stages/stage2-dashboard.tf b/terraform/stages/stage2-dashboard.tf
@@ -5,6 +5,6 @@ module "dev_tools_dashboard" {
   cluster_config_file      = module.dev_cluster.config_file_path
   cluster_type             = module.dev_cluster.type_code
   tls_secret_name          = module.dev_cluster.tls_secret_name
-  releases_namespace       = module.dev_cluster_namespaces.tools_namespace_name
+  releases_namespace       = module.dev_tools_namespace.name
   image_tag                = "1.0.31"
 }
diff --git a/terraform/stages/stage2-jaeger.tf b/terraform/stages/stage2-jaeger.tf
@@ -3,9 +3,9 @@ module "dev_tools_jaeger" {
 
   cluster_config_file = module.dev_cluster.config_file_path
   cluster_type        = module.dev_cluster.type_code
+  ingress_subdomain   = module.dev_cluster.ingress_hostname
   olm_namespace       = module.dev_software_olm.olm_namespace
   operator_namespace  = module.dev_software_olm.target_namespace
-  app_namespace       = module.dev_cluster_namespaces.tools_namespace_name
-  ingress_subdomain   = module.dev_cluster.ingress_hostname
+  app_namespace       = module.dev_tools_namespace.name
   name                = "jaeger"
 }
diff --git a/terraform/stages/stage2-jenkins.tf b/terraform/stages/stage2-jenkins.tf
@@ -6,5 +6,5 @@ module "dev_tools_jenkins" {
   cluster_type             = module.dev_cluster.type
   tls_secret_name          = module.dev_cluster.tls_secret_name
   server_url               = module.dev_cluster.server_url
-  tools_namespace          = module.dev_cluster_namespaces.tools_namespace_name
+  tools_namespace          = module.dev_tools_namespace.name
 }
diff --git a/terraform/stages/stage2-pactbroker.tf b/terraform/stages/stage2-pactbroker.tf
@@ -4,6 +4,6 @@ module "dev_tools_pactbroker_release" {
   cluster_ingress_hostname                      = module.dev_cluster.ingress_hostname
   cluster_config_file                           = module.dev_cluster.config_file_path
   cluster_type                                  = module.dev_cluster.type_code
-  releases_namespace                            = module.dev_cluster_namespaces.tools_namespace_name
   tls_secret_name                               = module.dev_cluster.tls_secret_name
+  releases_namespace                            = module.dev_tools_namespace.name
 }
diff --git a/terraform/stages/stage2-sonarqube.tf b/terraform/stages/stage2-sonarqube.tf
@@ -2,11 +2,11 @@ module "dev_tools_sonarqube" {
   source = "github.com/ibm-garage-cloud/terraform-tools-sonarqube.git?ref=v1.5.2"
 
   cluster_type             = module.dev_cluster.type_code
-  cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   cluster_config_file      = module.dev_cluster.config_file_path
-  releases_namespace       = module.dev_cluster_namespaces.tools_namespace_name
-  service_account_name     = "sonarqube"
+  cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   tls_secret_name          = module.dev_cluster.tls_secret_name
+  releases_namespace       = module.dev_tools_namespace.name
+  service_account_name     = "sonarqube"
   postgresql               = {
     external      = false
     username      = ""
diff --git a/terraform/stages/stage2-swagger.tf b/terraform/stages/stage2-swagger.tf
@@ -5,7 +5,7 @@ module "dev_tools_swagger" {
   cluster_config_file      = module.dev_cluster.config_file_path
   cluster_type             = module.dev_cluster.type_code
   tls_secret_name          = module.dev_cluster.tls_secret_name
-  releases_namespace       = module.dev_cluster_namespaces.tools_namespace_name
+  releases_namespace       = module.dev_tools_namespace.name
   image_tag                = "v3.8.0"
   enable_sso               = true
   chart_version            = "1.3.0"
diff --git a/terraform/stages/stage2-tekton.tf b/terraform/stages/stage2-tekton.tf
@@ -1,10 +1,10 @@
 module "dev_tools_tekton_release" {
-  source = "github.com/ibm-garage-cloud/terraform-tools-tekton.git?ref=v1.3.2"
+  source = "github.com/ibm-garage-cloud/terraform-tools-tekton.git?ref=v1.3.3"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
-  tools_namespace          = module.dev_cluster_namespaces.tools_namespace_name
+  tools_namespace          = module.dev_tools_namespace.name
 }
 
 module "dev_tools_tekton_resources" {
@@ -13,5 +13,5 @@ module "dev_tools_tekton_resources" {
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
   tekton_namespace         = module.dev_tools_tekton_release.namespace
-  resource_namespace       = module.dev_cluster_namespaces.tools_namespace_name
+  resource_namespace       = module.dev_tools_namespace.name
 }
diff --git a/terraform/stages/stage3-logdna.tf b/terraform/stages/stage3-logdna.tf
@@ -1,5 +1,5 @@
 module "dev_serviceaccount_logdna-agent" {
-  source = "github.com/ibm-garage-cloud/terraform-cluster-serviceaccount.git?ref=v1.3.0"
+  source = "github.com/ibm-garage-cloud/terraform-k8s-serviceaccount.git?ref=v1.4.0"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
diff --git a/terraform/stages/variables.tf b/terraform/stages/variables.tf
@@ -85,18 +85,6 @@ variable "sre_namespace" {
   default     = "ibm-observe"
 }
 
-variable "release_namespaces" {
-  type        = list(string)
-  description = "Namespace for dev"
-  default     = ["dev", "test", "staging"]
-}
-
-variable "release_namespace_count" {
-  type        = number
-  description = "Namespace for dev"
-  default     = 3
-}
-
 variable "cluster_name" {
   type        = string
   description = "The name of the cluster"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ module "dev_infrastructure_cos" {`
`4`	`4`	`resource_group_name = module.dev_cluster.resource_group_name`
`5`	`5`	`resource_location = module.dev_cluster.region`
`6`	`6`	`cluster_id = module.dev_cluster.id`
`7`		`- namespaces = module.dev_cluster_namespaces.release_namespaces`
	`7`	`+ namespaces = module.dev_tools_namespace.name`
`8`	`8`	`namespace_count = var.release_namespace_count`
`9`	`9`	`name_prefix = var.name_prefix`
`10`	`10`	`}`