@hiiretail/gcp-infra-cli 0.87.3 → 0.88.0

package/generators/organization/clan-project/templates/clan-project/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.1.0"
+  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v2.0.0-autopilot"
 }
 
 dependency "parent_folder" {
@@ -9,32 +9,6 @@ dependency "parent_folder" {
   }
 }
 
-dependency "tribe_project" {
-  config_path = "../../../resources/${local.env_name}"
-  mock_outputs = {
-    project_id = "project-dummy-id"
-  }
-}
-
-dependency "tribe_network" {
-  config_path = "../../../resources/${local.env_name}/network"
-  mock_outputs = {
-    subnets = {
-      "europe-west1/clan-resources" = {
-        id = "projects/project-name/regions/region-name/subnetworks/subnet-name"
-      }
-    }
-  }
-}
-
-dependency "gke" {
-  config_path = "../../../resources/${local.env_name}/gke"
-  mock_outputs = {
-    endpoint       = "dummy-endpoint"
-    ca_certificate = "dummy-ca-certificate"
-   }
-}
-
 locals {
   tribe_name  = basename(dirname(dirname(dirname(get_terragrunt_dir()))))
   clan_name   = basename(dirname(get_terragrunt_dir()))
@@ -67,16 +41,9 @@ inputs = merge(
     bucket_name = local.bucket_name
     folder_id   = dependency.parent_folder.outputs.folder_id
 
-    service_group_name  = local.service_group_name
-    clan_gsuite_group   = local.clan_gsuite_group
-    env_name            = local.env_name
-    parent_project_id   = dependency.tribe_project.outputs.project_id
-    gke_ca_certificate  = dependency.gke.outputs.ca_certificate
-    gke_host            = dependency.gke.outputs.endpoint
-    shared_vpc          = dependency.tribe_project.outputs.project_id
-    shared_vpc_subnets  = [
-      dependency.tribe_network.outputs.subnets["europe-west1/clan-resources"].id
-    ]
+    service_group_name = local.service_group_name
+    clan_gsuite_group  = local.clan_gsuite_group
+    env_name           = local.env_name
     bucket_labels = {
       cc = local.tribe_yaml.costcenter
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-cli",
-  "version": "0.87.3",
+  "version": "0.88.0",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {

package/generators/resources/spanner/validate.js

@@ -1,27 +0,0 @@
-const validName = (input) => {
-  if (input.replace(/\s/g, '').length >= 6 && input.length <= 30) {
-    return { valid: true };
-  }
-  return { valid: false, message: 'Name must be between 6 and 30 characters in length' };
-};
-
-const validRetentionPeriod = (input) => {
-  const validFormats = /^(84000s|1h|2d|7d)$/;
-
-  if (input === '') {
-    return { valid: true };
-  }
-  if (validFormats.test(input)) {
-    return { valid: true };
-  }
-
-  return {
-    valid: false,
-    message: 'Invalid retention period format. Possible values are 84000s, 1h, 2d, or leave empty for default value 1h',
-  };
-};
-
-module.exports = {
-  validName,
-  validRetentionPeriod,
-};

package/generators/tribe-resources/tribe-project/generator.json

@@ -1,4 +0,0 @@
-{
-  "name": "Tribe project with GKE",
-  "description": "Create Tribe project with GKE cluster"
-}

package/generators/tribe-resources/tribe-project/index.js

@@ -1,106 +0,0 @@
-const path = require('path');
-const chalk = require('chalk');
-const BaseGenerator = require('../../../src/BaseGenerator');
-const { required } = require('../../../src/validators');
-
-module.exports = class extends BaseGenerator {
-  constructor(args, opts) {
-    super(args, opts);
-
-    // Output directory relative to the tf-infra-gcp directory.
-    this.destinationRoot('organization');
-  }
-
-  prompting() {
-    const prompts = [
-      {
-        type: 'list',
-        name: 'domain',
-        default: 'extendaretail-com',
-        message: 'Choose GCP Organization',
-        store: true,
-        choices: this.listSubDirectories(this.destinationPath()),
-        validate: required,
-      },
-      {
-        type: 'list',
-        name: 'department',
-        message: 'Choose department',
-        store: true,
-        choices: (answers) => this.listSubDirectories(
-          path.join(this.destinationPath(), answers.domain, 'departments'),
-        ),
-        validate: required,
-      },
-      {
-        type: 'list',
-        name: 'tribe',
-        message: 'Choose tribe',
-        store: true,
-        choices: (answers) => this.listSubDirectories(
-          path.join(this.destinationPath(), answers.domain, 'departments', answers.department),
-        ),
-        validate: required,
-      },
-    ];
-
-    return this.prompt(prompts).then((props) => {
-      this.answers = props;
-    });
-  }
-
-  writing() {
-    const {
-      domain,
-      department,
-      tribe,
-    } = this.answers;
-
-    this.fs.copyTpl(
-      this.templatePath('terragrunt.hcl'),
-      this.destinationPath(path.join(domain, 'departments', department, tribe, 'resources', 'terragrunt.hcl')),
-      this.answers,
-    );
-
-    ['prod', 'staging'].forEach((env) => {
-      this.copyDir(
-        'project',
-        path.join(domain, 'departments', department, tribe, 'resources', env),
-        {
-          ...this.answers,
-          network: {
-            // TODO These cannot be hard coded!
-            k8s_subnet_cidr: env === 'prod' ? '10.90.0.0/24' : '10.89.0.0/24',
-            tribe_subnet_cidr: env === 'prod' ? '10.90.2.0/23' : '10.89.2.0/23',
-            clan_subnet_cidr: env === 'prod' ? '10.90.4.0/22' : '10.89.4.0/22',
-            k8s_pods_cidr: env === 'prod' ? '172.20.0.0/17' : '172.19.0.0/17',
-            k8s_services_cidr: env === 'prod' ? '10.90.8.0/21' : '10.89.8.0/21',
-          },
-          gke: {
-            preemptible: env === 'staging',
-          },
-          env,
-        },
-      );
-    });
-  }
-
-  end() {
-    const {
-      domain,
-      department,
-      tribe,
-    } = this.answers;
-    const tribeDir = path.join(domain, 'departments', department, tribe, 'resources');
-    this.log(`
-${chalk.green(`Your tribe GKE projects have now been created. To finalize your configuration, please continue
-with manual editing of the generated files.`)}
-${chalk.green('1.')} Review Network and Kubernetes configuration
-   \u2192 ${chalk.cyan(path.join(tribeDir, 'prod', 'network', 'spec.hcl'))}
-   \u2192 ${chalk.cyan(path.join(tribeDir, 'prod', 'gke', 'spec.hcl'))}
-   \u2192 ${chalk.cyan(path.join(tribeDir, 'staging', 'network', 'spec.hcl'))}
-   \u2192 ${chalk.cyan(path.join(tribeDir, 'staging', 'gke', 'spec.hcl'))}
-${chalk.green('2.')} Push this change in a feature branch and open a pull request.
-`);
-  }
-};

package/generators/tribe-resources/tribe-project/templates/project/gke/opa/config/main.tf

@@ -1,33 +0,0 @@
-resource "null_resource" "setup_opa_config" {
-  triggers = {
-    cluster_name   = var.cluster_name
-    cluster_region = var.cluster_region
-    project_id     = var.project_id
-  }
-
-  provisioner "local-exec" {
-    command = <<EOT
-      gcloud container clusters get-credentials ${self.triggers.cluster_name} --region ${self.triggers.cluster_region} --project ${self.triggers.project_id}
-      cd $(git rev-parse --show-toplevel)/platform/opa-gke-installation/
-      gcloud config set project ${self.triggers.project_id}
-      gcloud compute firewall-rules update $(gcloud compute firewall-rules list --format='value(NAME)' --filter='NAME:master') --allow=TCP:9443,TCP:10250,TCP:443,TCP:15017
-      kubectl apply -f .
-      kubectl patch cm config-domainmapping -n knative-serving -p '{"data":{"autoTLS":"Enabled"}}'
-      if [[ ${self.triggers.project_id} == *"-prod"* ]]; then
-        kubectl patch hpa cluster-local-gateway -n gke-system -p '{"spec": { "minReplicas": 3 }}'
-        kubectl patch hpa istio-ingress -n gke-system -p '{"spec": { "minReplicas": 3 }}'
-      fi
-      cd envoy-filters && sleep 15 && kubectl apply -f .
-  EOT
-  }
-
-  provisioner "local-exec" {
-    when    = destroy
-    command = <<EOT
-      gcloud container clusters get-credentials ${self.triggers.cluster_name} --region ${self.triggers.cluster_region} --project ${self.triggers.project_id}
-      cd $(git rev-parse --show-toplevel)/platform/opa-gke-installation/
-      kubectl delete -f .
-      kubectl patch cm config-domainmapping -n knative-serving -p '{"data":{"autoTLS":"Disabled"}}'
-  EOT
-  }
-}

package/generators/tribe-resources/tribe-project/templates/project/gke/opa/config/vars.tf

@@ -1,14 +0,0 @@
-variable "cluster_name" {
-  description = "Cluster name"
-  type        = string
-}
-
-variable "cluster_region" {
-  description = "Cluster region."
-  type        = string
-}
-
-variable "project_id" {
-  description = "Tribe project id where cluster is created."
-  type        = string
-}

package/generators/tribe-resources/tribe-project/templates/project/gke/opa/terragrunt.hcl

@@ -1,34 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "config/"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-dependency "tribe_project" {
-  config_path = "../../"
-  mock_outputs = {
-    project_id = "dymmy-id"
-  }
-}
-
-dependency "gke" {
-  config_path = "../"
-  mock_outputs = {
-    name = "dummy-name"
-    region = "region-name"
-  }
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(
-  {
-    cluster_name   = dependency.gke.outputs.name
-    cluster_region = dependency.gke.outputs.region
-    project_id     = dependency.tribe_project.outputs.project_id
-  }
-)

package/generators/tribe-resources/tribe-project/templates/project/gke/spec.hcl

@@ -1,35 +0,0 @@
-locals {
-  name                         = "k8s-cluster"
-  regional                     = true
-  region                       = "europe-west1"
-  zones                        = ["europe-west1-d"]
-  ip_range_pods                = "pods-cidr"
-  ip_range_services            = "services-cidr"
-  create_service_account       = true
-  grant_registry_access        = true
-  http_load_balancing          = true
-  network_policy               = true
-  istio                        = false
-  cloudrun                     = true
-  node_metadata                = "GKE_METADATA_SERVER"
-  enable_private_nodes         = true
-  master_global_access_enabled = false
-  release_channel              = "REGULAR"
-  maintenance_start_time       = "01:00" #UTC
-  node_pools = [
-    {
-      name               = "custom-node-pool"
-      machine_type       = "n1-standard-2"
-      min_count          = 1
-      max_count          = 15
-      local_ssd_count    = 0
-      disk_size_gb       = 20
-      disk_type          = "pd-ssd"
-      image_type         = "COS"
-      auto_repair        = true
-      auto_upgrade       = true
-      preemptible        = <%- gke.preemptible %>
-      initial_node_count = 1
-    }
-  ]
-}

package/generators/tribe-resources/tribe-project/templates/project/gke-ingress-static-ip/spec.hcl

@@ -1,7 +0,0 @@
-locals {
-  address_type = "EXTERNAL"
-  region       = "europe-west1"
-  names = [
-    "gke-istio-ingress",
-  ]
-}

package/generators/tribe-resources/tribe-project/templates/project/gke-ingress-static-ip/terragrunt.hcl

@@ -1,25 +0,0 @@
-terraform {
-  source = "git::https://github.com/terraform-google-modules/terraform-google-address//?ref=v2.1.0"
-}
-
-dependency "project" {
-  config_path = "../"
-  mock_outputs = {
-    project_id = "project-dummy-id"
-  }
-}
-
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-locals {
-  spec_vars = read_terragrunt_config("${get_terragrunt_dir()}/spec.hcl")
-}
-
-inputs = merge(
-  local.spec_vars.locals,
-  {
-    project_id = dependency.project.outputs.project_id
-  }
-)

package/generators/tribe-resources/tribe-project/templates/project/network/firewall-rules/config/vars.tf

@@ -1,9 +0,0 @@
-variable "network" {
-  description = "network uri"
-  type        = string
-}
-
-variable "project" {
-  description = "project id"
-  type        = string
-}

package/generators/tribe-resources/tribe-project/templates/project/network/spec.hcl

@@ -1,40 +0,0 @@
-// Network for Kubernetes cluster
-locals {
-
-  shared_vpc_host = true
-  network_name    = "tribe-network"
-
-  subnets = [
-    {
-      subnet_name   = "k8s-subnet"
-      subnet_ip     = "<%- network.k8s_subnet_cidr %>"
-      subnet_region = "europe-west1"
-      subnet_private_access = true
-    },
-    {
-      subnet_name   = "tribe-resources"
-      subnet_ip     = "<%- network.tribe_subnet_cidr %>"
-      subnet_region = "europe-west1"
-      subnet_private_access = true
-    },
-    {
-      subnet_name   = "clan-resources"
-      subnet_ip     = "<%- network.clan_subnet_cidr %>"
-      subnet_region = "europe-west1"
-      subnet_private_access = true
-    }
-  ]
-
-  secondary_ranges = {
-    "k8s-subnet" = [
-      {
-        range_name    = "pods-cidr"
-        ip_cidr_range = "<%- network.k8s_pods_cidr %>"
-      },
-      {
-        range_name    = "services-cidr"
-        ip_cidr_range = "<%- network.k8s_services_cidr %>"
-      }
-    ]
-  }
-}

package/generators/tribe-resources/tribe-project/templates/project/project.yaml

@@ -1,7 +0,0 @@
-activate_apis:
-  - cloudapis.googleapis.com                                     # Google Cloud APIs
-  - container.googleapis.com                                     # Kubernetes
-  - monitoring.googleapis.com                                    # Stackdriver Monitoring API
-  - run.googleapis.com                                           # Cloud Run API
-  - storage-api.googleapis.com                                   # Cloud Storage
-  - servicenetworking.googleapis.com                             # Service Networking API

package/generators/tribe-resources/tribe-project/templates/project/terragrunt.hcl

@@ -1,51 +0,0 @@
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-project//?ref=v1.1.0"
-}
-
-dependency "tribe_folder" {
-  config_path = "../../"
-  mock_outputs = {
-    folder_id = "folder-dummy-id"
-  }
-}
-
-locals {
-  tribe_name  = basename(dirname(dirname(get_terragrunt_dir())))
-  env_name    = basename(get_terragrunt_dir())
-  name        = "${local.tribe_name}-${local.env_name}"
-  bucket_name = "tf-state-${local.name}"
-  tribe_yaml  = yamldecode(file(find_in_parent_folders("tribe.yaml")))
-}
-
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-inputs = merge(
-
-yamldecode(
-file("${get_terragrunt_dir()}/project.yaml")),
-{
-  labels = {
-    cc          = local.tribe_yaml.costcenter
-    tribe       = local.tribe_name
-    environment = local.env_name
-  }
-
-  name        = local.name
-  bucket_name = local.bucket_name
-  folder_id   = dependency.tribe_folder.outputs.folder_id
-  env_name    = local.env_name
-
-  project_type                    = "tribe_project"
-  create_ci_cd_service_account    = false
-  create_cloudrun_service_account = false
-  create_service_sa               = false
-
-  clan_gsuite_group = ""
-
-  bucket_labels = {
-    cc = local.tribe_yaml.costcenter
-  }
-}
-)