From 2876c5ba71543a07acc10cfec3215226209c2dfc Mon Sep 17 00:00:00 2001 From: Tossaporn Jiw <30390987+deejiw@users.noreply.github.com> Date: Thu, 21 Jul 2022 17:10:55 +0700 Subject: [PATCH] docs(catalog-info): add service catalog (#78) --- .pre-commit-config.yaml | 12 ++++-------- README.md | 3 +-- catalog-info.yaml | 13 +++++++++++++ modules/gcp-gke/README.md | 12 ++++++------ 4 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 catalog-info.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa5f077..90b45b6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,14 +2,14 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 # Get the latest version from: https://github.com/pre-commit/pre-commit-hooks/releases + rev: v4.3.0 # Get the latest version from: https://github.com/pre-commit/pre-commit-hooks/releases hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.68.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases + rev: v1.74.1 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases hooks: - id: terraform_fmt - id: terraform_docs @@ -18,10 +18,6 @@ repos: # Running `terraform validate` inside the component module folder also will not pass. - id: terraform_validate - id: terraform_tfsec - exclude: "test/" + exclude: test/ - id: terraform_checkov - args: - - --args=--config-file .checkov.yaml - - --args=--skip-path test/ - - --args=--quiet - exclude: "test/" + exclude: test/ diff --git a/README.md b/README.md index f9d1d16..efdb29d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ role in the shared VPC host project. | Name | Version | |------|---------| -| [random](#provider\_random) | 3.3.1 | +| [random](#provider\_random) | 3.3.2 | ## Modules @@ -105,7 +105,6 @@ role in the shared VPC host project. | [cluster\_name](#output\_cluster\_name) | The GKE cluster name that was built | | [cluster\_project](#output\_cluster\_project) | The project hosting the GKE cluster. | | [gke\_cluster\_istio\_gatekeeper\_firewall\_rule\_self\_link](#output\_gke\_cluster\_istio\_gatekeeper\_firewall\_rule\_self\_link) | The tags applied to the primary node pool of the GKE cluster. | -| [gke\_cluster\_primary\_node\_pool\_all\_tags](#output\_gke\_cluster\_primary\_node\_pool\_all\_tags) | List of tags applied to the node pool instances. This included the managed-by-GCP tags. | | [gke\_cluster\_primary\_node\_pool\_tag](#output\_gke\_cluster\_primary\_node\_pool\_tag) | Tag applied to the node pool instances - used for network/firewall rules. | | [kubernetes\_endpoint](#output\_kubernetes\_endpoint) | n/a | | [service\_account](#output\_service\_account) | The default service account used for running nodes. | diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 0000000..02fed8f --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,13 @@ +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: terraform-gcp-gke + description: TF Component for creating Google Kubernetes Engine in Google Cloud Platform + annotations: + github.com/project-slug: honestbank/terraform-gcp-gke + github.com/team-slug: honestbank/devops-engineers +spec: + type: tf-component + lifecycle: production + system: infrastructure + owner: group:devops-engineers diff --git a/modules/gcp-gke/README.md b/modules/gcp-gke/README.md index 29e2f72..f91f0f0 100644 --- a/modules/gcp-gke/README.md +++ b/modules/gcp-gke/README.md @@ -24,11 +24,11 @@ To run E2E tests, navigate to the [test folder](../test) and run `go test -v -ti | Name | Version | |------|---------| -| [google](#provider\_google) | ~> 4.0 | -| [google.compute](#provider\_google.compute) | ~> 4.0 | -| [google.vpc](#provider\_google.vpc) | ~> 4.0 | -| [google-beta.compute-beta](#provider\_google-beta.compute-beta) | ~> 4.0 | -| [random](#provider\_random) | ~> 3.0 | +| [google](#provider\_google) | 4.29.0 | +| [google.compute](#provider\_google.compute) | 4.29.0 | +| [google.vpc](#provider\_google.vpc) | 4.29.0 | +| [google-beta.compute-beta](#provider\_google-beta.compute-beta) | 4.29.0 | +| [random](#provider\_random) | 3.3.2 | ## Modules @@ -89,8 +89,8 @@ No modules. |------|-------------| | [ca\_certificate](#output\_ca\_certificate) | n/a | | [client\_token](#output\_client\_token) | n/a | +| [cluster\_all\_primary\_node\_pool\_tags](#output\_cluster\_all\_primary\_node\_pool\_tags) | List of tags applied to the node pool instances. This included the managed-by-GCP tags. | | [cluster\_name](#output\_cluster\_name) | The GKE cluster name that was built | -| [cluster\_primary\_node\_pool\_all\_tags](#output\_cluster\_primary\_node\_pool\_all\_tags) | List of tags applied to the node pool instances. This included the managed-by-GCP tags. | | [cluster\_primary\_node\_pool\_tag](#output\_cluster\_primary\_node\_pool\_tag) | Tag applied to the node pool instances - used for network/firewall rules. | | [cluster\_project](#output\_cluster\_project) | The project hosting the GKE cluster. | | [istio\_gatekeeper\_firewall\_rule\_self\_link](#output\_istio\_gatekeeper\_firewall\_rule\_self\_link) | The self\_link attribute of the firewall rule created to allow Gatekeeper and Istio to function. |