Merge branch 'master' into cloud-native-toolkit/terraform-ibm-activity-tracker

Sean Sundberg · web-flow · commit 229e3c85d398 · 2021-11-13T13:35:31.000-06:00
diff --git a/.github/workflows/verify-master.yaml b/.github/workflows/verify-master.yaml
@@ -13,7 +13,7 @@ on:
 jobs:
   verify:
     runs-on: ubuntu-latest
-    container: quay.io/ibmgaragecloud/cli-tools:v0.10.0-lite
+    container: quay.io/ibmgaragecloud/cli-tools:v0.15
 
     strategy:
       matrix:
diff --git a/.github/workflows/verify-pr.yaml b/.github/workflows/verify-pr.yaml
@@ -11,7 +11,7 @@ jobs:
   verify:
     if: ${{ !contains( github.event.pull_request.labels.*.name, 'skip ci' ) }}
     runs-on: ubuntu-latest
-    container: quay.io/ibmgaragecloud/cli-tools:v0.10.0-lite
+    container: quay.io/ibmgaragecloud/cli-tools:v0.15
 
     strategy:
       matrix:
diff --git a/install/install-ibm-toolkit.yaml b/install/install-ibm-toolkit.yaml
@@ -36,12 +36,12 @@ spec:
       labels:
         run: ibm-toolkit
     spec:
-      serviceAccount: ibm-toolkit
+      serviceAccountName: ibm-toolkit
       volumes:
       - name: source
         emptyDir: {}
       containers:
-      - image: quay.io/ibmgaragecloud/cli-tools:v0.10.0-lite
+      - image: quay.io/ibmgaragecloud/cli-tools:v0.15
         name: toolkit
         envFrom:
         - configMapRef:
diff --git a/launch.sh b/launch.sh
@@ -5,7 +5,7 @@
 SCRIPT_DIR="$(cd $(dirname $0); pwd -P)"
 SRC_DIR="$(cd "${SCRIPT_DIR}/terraform" ; pwd -P)"
 
-DOCKER_IMAGE="quay.io/ibmgaragecloud/cli-tools:v0.10.0-lite"
+DOCKER_IMAGE="quay.io/ibmgaragecloud/cli-tools:v0.15"
 
 helpFunction()
 {
diff --git a/terraform/stages-ocp4/stage1-buildah-unprivileged.tf b/terraform/stages-ocp4/stage1-buildah-unprivileged.tf
@@ -0,0 +1,6 @@
+module "buildah-unprivileged" {
+  source = "github.com/cloud-native-toolkit/terraform-ocp-buildah-unprivileged.git?ref=v1.1.0"
+
+  cluster_config_file = module.dev_cluster.config_file_path
+  namespace = module.toolkit_namespace.name
+}
diff --git a/terraform/stages-ocp4/stage1-namespaces.tf b/terraform/stages-ocp4/stage1-namespaces.tf
@@ -1,17 +1,20 @@
 module "dev_tools_namespace" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v2.8.1"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
 
-  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.tools_namespace
 }
 
 module "dev_sre_namespace" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v2.8.1"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
 
-  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.sre_namespace
 }
+
+module "toolkit_namespace" {
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
+
+  cluster_config_file_path = module.dev_cluster.config_file_path
+  name                     = var.toolkit_namespace
+}
diff --git a/terraform/stages-ocp4/stage2-artifactory.tf b/terraform/stages-ocp4/stage2-artifactory.tf
@@ -1,5 +1,5 @@
 module "dev_tools_artifactory" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-artifactory.git?ref=v1.10.1"
+  source = "github.com/cloud-native-toolkit/terraform-tools-artifactory.git?ref=v1.12.1"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
diff --git a/terraform/stages-ocp4/stage2-cicd.tf b/terraform/stages-ocp4/stage2-cicd.tf
@@ -1,5 +1,5 @@
 module "cicd" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-openshift-cicd.git?ref=v1.7.2"
+  source = "github.com/cloud-native-toolkit/terraform-tools-openshift-cicd.git?ref=v1.7.5"
 
   cluster_config_file = module.dev_cluster.config_file_path
   cluster_type        = module.dev_cluster.type_code
diff --git a/terraform/stages-ocp4/stage2-console-link-job.tf b/terraform/stages-ocp4/stage2-console-link-job.tf
@@ -0,0 +1,6 @@
+module "console-link-job" {
+  source = "github.com/cloud-native-toolkit/terraform-k8s-console-link-job.git?ref=v1.0.0"
+
+  namespace           = module.toolkit_namespace.name
+  cluster_config_file = module.dev_cluster.config_file_path
+}
diff --git a/terraform/stages-ocp4/stage2-image-registry.tf b/terraform/stages-ocp4/stage2-image-registry.tf
@@ -1,5 +1,5 @@
 module "dev_tools_ibm_image_registry" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-image-registry.git?ref=v1.4.0"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-image-registry.git?ref=v2.1.0"
 
   resource_group_name = module.dev_cluster.resource_group_name
   cluster_region      = module.dev_cluster.region
diff --git a/terraform/stages-ocp4/stage2-pactbroker.tf b/terraform/stages-ocp4/stage2-pactbroker.tf
@@ -1,5 +1,5 @@
 module "dev_tools_pactbroker_release" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-pactbroker.git?ref=v1.4.2"
+  source = "github.com/cloud-native-toolkit/terraform-tools-pactbroker.git?ref=v1.5.0"
 
   cluster_ingress_hostname                      = module.dev_cluster.ingress_hostname
   cluster_config_file                           = module.dev_cluster.config_file_path
diff --git a/terraform/stages-ocp4/stage2-pipelines.tf b/terraform/stages-ocp4/stage2-pipelines.tf
@@ -1,7 +1,8 @@
 module "dev_tools_tekton_resources" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-tekton-resources.git?ref=v2.2.22"
+  source = "github.com/cloud-native-toolkit/terraform-tools-tekton-resources.git?ref=v2.3.0"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
   resource_namespace       = module.dev_tools_namespace.name
+  support_namespace        = module.buildah-unprivileged.namespace
 }
diff --git a/terraform/stages-ocp4/stage2-sourcecontrol.tf b/terraform/stages-ocp4/stage2-sourcecontrol.tf
@@ -1,5 +1,5 @@
 module "dev_tools_sourcecontrol" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-source-control.git?ref=v1.2.3"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-source-control.git?ref=v1.3.0"
 
   config_file_path  = module.dev_cluster.config_file_path
   cluster_type_code = module.dev_cluster.type_code
diff --git a/terraform/stages-ocp4/stage2-swagger-editor.tf b/terraform/stages-ocp4/stage2-swagger-editor.tf
@@ -1,12 +1,10 @@
 module "dev_tools_swagger" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-swaggereditor.git?ref=v1.4.1"
+  source = "github.com/cloud-native-toolkit/terraform-tools-swaggereditor.git?ref=v1.5.0"
 
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   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_tools_namespace.name
-  image_tag                = "v3.8.0"
   enable_sso               = true
-  chart_version            = "1.3.0"
 }
diff --git a/terraform/stages-ocp4/variables.tf b/terraform/stages-ocp4/variables.tf
@@ -86,3 +86,8 @@ variable "storage_class" {
   description = "The storage class of the persistence volume claim"
   default     = ""
 }
+
+variable "toolkit_namespace" {
+  default     = "cntk"
+  type        = string
+}
diff --git a/terraform/stages-sre/stage-logdna.tf b/terraform/stages-sre/stage-logdna.tf
@@ -1,5 +1,5 @@
 module "dev_infrastructure_logdna" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-logdna.git?ref=v2.4.3"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-logdna.git?ref=v4.0.0"
 
   resource_group_name      = var.resource_group_name
   resource_location        = var.region
diff --git a/terraform/stages-sre/stage-sysdig.tf b/terraform/stages-sre/stage-sysdig.tf
@@ -1,5 +1,5 @@
 module "dev_infrastructure_sysdig" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-sysdig.git?ref=v2.3.3"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-sysdig.git?ref=v4.0.1"
 
   resource_group_name      = var.resource_group_name
   resource_location        = var.region
diff --git a/terraform/stages/provider.tf b/terraform/stages/provider.tf
@@ -0,0 +1,18 @@
+provider "ibm" {
+  region           = var.region
+  ibmcloud_api_key = var.ibmcloud_api_key
+}
+
+provider "ibm" {
+  alias = "logdna"
+
+  region           = var.logdna_region
+  ibmcloud_api_key = var.ibmcloud_api_key
+}
+
+provider "ibm" {
+  alias = "sysdig"
+
+  region           = var.sysdig_region
+  ibmcloud_api_key = var.ibmcloud_api_key
+}
diff --git a/terraform/stages/stage0.tf b/terraform/stages/stage0.tf
@@ -1,7 +1,8 @@
 terraform {
-  required_version = "> 0.12.0"
-}
-
-provider "helm" {
-  version = "2.1.1"
+  required_providers {
+    ibm = {
+      source = "ibm-cloud/ibm"
+    }
+  }
+  required_version = "> 0.13.0"
 }
diff --git a/terraform/stages/stage1-access_group.tf b/terraform/stages/stage1-access_group.tf
@@ -0,0 +1,6 @@
+module "access_groups" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-access-group.git?ref=v3.0.0"
+
+  resource_group_name = module.resource_group.name
+  provision           = var.access_group_provision
+}
diff --git a/terraform/stages/stage1-buildah-unprivileged.tf b/terraform/stages/stage1-buildah-unprivileged.tf
@@ -0,0 +1,6 @@
+module "buildah-unprivileged" {
+  source = "github.com/cloud-native-toolkit/terraform-ocp-buildah-unprivileged.git?ref=v1.1.0"
+
+  cluster_config_file = module.dev_cluster.config_file_path
+  namespace = module.toolkit_namespace.name
+}
diff --git a/terraform/stages/stage1-cluster.tf b/terraform/stages/stage1-cluster.tf
@@ -1,5 +1,5 @@
 module "dev_cluster" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-container-platform.git?ref=v1.20.8"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-container-platform.git?ref=v1.21.0"
 
   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,17 +1,20 @@
 module "dev_tools_namespace" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v2.8.1"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
 
-  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.tools_namespace
 }
 
 module "dev_sre_namespace" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v2.8.1"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
 
-  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.sre_namespace
 }
+
+module "toolkit_namespace" {
+  source = "github.com/cloud-native-toolkit/terraform-k8s-namespace.git?ref=v3.1.3"
+
+  cluster_config_file_path = module.dev_cluster.config_file_path
+  name                     = var.toolkit_namespace
+}
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/cloud-native-toolkit/terraform-k8s-olm.git?ref=v1.3.1"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-olm.git?ref=v1.3.2"
 
   cluster_config_file      = module.dev_cluster.config_file_path
   cluster_version          = ""
diff --git a/terraform/stages/stage1-resource_group.tf b/terraform/stages/stage1-resource_group.tf
@@ -0,0 +1,6 @@
+module "resource_group" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-resource-group.git?ref=v3.0.0"
+
+  provision           = var.resource_group_provision
+  resource_group_name = var.resource_group_name
+}
diff --git a/terraform/stages/stage2-artifactory.tf b/terraform/stages/stage2-artifactory.tf
@@ -1,5 +1,5 @@
 module "dev_tools_artifactory" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-artifactory.git?ref=v1.10.1"
+  source = "github.com/cloud-native-toolkit/terraform-tools-artifactory.git?ref=v1.12.1"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
diff --git a/terraform/stages/stage2-cicd.tf b/terraform/stages/stage2-cicd.tf
@@ -1,5 +1,5 @@
 module "dev_tools_cicd" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-openshift-cicd.git?ref=v1.7.2"
+  source = "github.com/cloud-native-toolkit/terraform-tools-openshift-cicd.git?ref=v1.7.5"
 
   cluster_config_file = module.dev_cluster.config_file_path
   cluster_type        = module.dev_cluster.type_code
diff --git a/terraform/stages/stage2-console-link-job.tf b/terraform/stages/stage2-console-link-job.tf
@@ -0,0 +1,6 @@
+module "console-link-job" {
+  source = "github.com/cloud-native-toolkit/terraform-k8s-console-link-job"
+
+  namespace           = module.toolkit_namespace.name
+  cluster_config_file = module.dev_cluster.config_file_path
+}
diff --git a/terraform/stages/stage2-image-registry.tf b/terraform/stages/stage2-image-registry.tf
@@ -1,8 +1,8 @@
 module "dev_tools_ibm_image_registry" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-image-registry.git?ref=v1.4.0"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-image-registry.git?ref=v2.1.0"
 
   resource_group_name = module.dev_cluster.resource_group_name
-  cluster_region      = module.dev_cluster.region
+  region              = module.dev_cluster.region
   cluster_type_code   = module.dev_cluster.type_code
   config_file_path    = module.dev_cluster.config_file_path
   cluster_namespace   = module.dev_tools_namespace.name
diff --git a/terraform/stages/stage2-pactbroker.tf b/terraform/stages/stage2-pactbroker.tf
@@ -1,5 +1,5 @@
 module "dev_tools_pactbroker_release" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-pactbroker.git?ref=v1.4.2"
+  source = "github.com/cloud-native-toolkit/terraform-tools-pactbroker.git?ref=v1.5.0"
 
   cluster_ingress_hostname                      = module.dev_cluster.ingress_hostname
   cluster_config_file                           = module.dev_cluster.config_file_path
diff --git a/terraform/stages/stage2-pipelines.tf b/terraform/stages/stage2-pipelines.tf
@@ -1,7 +1,8 @@
 module "dev_tools_tekton_resources" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-tekton-resources.git?ref=v2.2.22"
+  source = "github.com/cloud-native-toolkit/terraform-tools-tekton-resources.git?ref=v2.3.0"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file_path = module.dev_cluster.config_file_path
   resource_namespace       = module.dev_tools_namespace.name
+  support_namespace        = module.buildah-unprivileged.namespace
 }
diff --git a/terraform/stages/stage2-sonarqube.tf b/terraform/stages/stage2-sonarqube.tf
@@ -1,5 +1,5 @@
 module "dev_tools_sonarqube" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-sonarqube.git?ref=v1.9.2"
+  source = "github.com/cloud-native-toolkit/terraform-tools-sonarqube.git?ref=v1.9.4"
 
   cluster_type             = module.dev_cluster.type_code
   cluster_config_file      = module.dev_cluster.config_file_path
diff --git a/terraform/stages/stage2-sourcecontrol.tf b/terraform/stages/stage2-sourcecontrol.tf
@@ -1,5 +1,5 @@
 module "dev_tools_sourcecontrol" {
-  source = "github.com/cloud-native-toolkit/terraform-k8s-source-control.git?ref=v1.2.3"
+  source = "github.com/cloud-native-toolkit/terraform-k8s-source-control.git?ref=v1.3.0"
 
   config_file_path  = module.dev_cluster.config_file_path
   cluster_type_code = module.dev_cluster.type_code
diff --git a/terraform/stages/stage2-swagger.tf b/terraform/stages/stage2-swagger.tf
@@ -1,12 +1,10 @@
 module "dev_tools_swagger" {
-  source = "github.com/cloud-native-toolkit/terraform-tools-swaggereditor.git?ref=v1.4.1"
+  source = "github.com/cloud-native-toolkit/terraform-tools-swaggereditor.git?ref=v1.5.0"
 
   cluster_ingress_hostname = module.dev_cluster.ingress_hostname
   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_tools_namespace.name
-  image_tag                = "v3.8.0"
   enable_sso               = true
-  chart_version            = "1.3.0"
 }
diff --git a/terraform/stages/stage3-logdna-bind.tf b/terraform/stages/stage3-logdna-bind.tf
@@ -0,0 +1,12 @@
+module "ibm-logdna-bind" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-logdna-bind?ref=v1.2.1"
+
+  cluster_id = module.dev_cluster.id
+  cluster_name = module.dev_cluster.name
+  resource_group_name = module.resource_group.name
+  sync = module.sysdig-bind.sync
+  logdna_id = module.logdna.guid
+  region = var.region
+  private_endpoint = var.private_endpoint
+  ibmcloud_api_key = var.ibmcloud_api_key
+}
diff --git a/terraform/stages/stage3-logdna.tf b/terraform/stages/stage3-logdna.tf
@@ -1,14 +1,8 @@
-module "dev_infrastructure_logdna" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-logdna.git?ref=v2.4.3"
+module "logdna" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-logdna.git?ref=v4.0.0"
 
-  cluster_name             = module.dev_cluster.name
-  cluster_id               = module.dev_cluster.id
+  region                   = var.region
   resource_group_name      = module.dev_cluster.resource_group_name
-  resource_location        = var.logdna_region != "" ? var.logdna_region : module.dev_cluster.region
-  cluster_type             = module.dev_cluster.type_code
-  cluster_config_file_path = module.dev_cluster.config_file_path
-  namespace                = module.dev_sre_namespace.name
-  tools_namespace          = module.dev_tools_namespace.name
   name_prefix              = var.name_prefix
   provision                = var.provision_logdna == "true"
   name                     = var.logdna_name
diff --git a/terraform/stages/stage3-sysdig-bind.tf b/terraform/stages/stage3-sysdig-bind.tf
@@ -0,0 +1,13 @@
+module "sysdig-bind" {
+  source = "github.com/cloud-native-toolkit/terraform-ibm-sysdig-bind?ref=v1.2.2"
+
+  resource_group_name = module.resource_group.name
+  cluster_id = module.dev_cluster.id
+  cluster_name = module.dev_cluster.name
+  region = var.region
+  private_endpoint = var.private_endpoint
+  guid = module.sysdig.guid
+  access_key = module.sysdig.access_key
+  ibmcloud_api_key = var.ibmcloud_api_key
+  namespace = var.observe_namespace
+}
diff --git a/terraform/stages/stage3-sysdig.tf b/terraform/stages/stage3-sysdig.tf
diff --git a/terraform/stages/variables.tf b/terraform/stages/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`SCRIPT_DIR="$(cd $(dirname $0); pwd -P)"`
`6`	`6`	`SRC_DIR="$(cd "${SCRIPT_DIR}/terraform" ; pwd -P)"`
`7`	`7`
`8`		`-DOCKER_IMAGE="quay.io/ibmgaragecloud/cli-tools:v0.10.0-lite"`
	`8`	`+DOCKER_IMAGE="quay.io/ibmgaragecloud/cli-tools:v0.15"`
`9`	`9`
`10`	`10`	`helpFunction()`
`11`	`11`	`{`