Skip to content

Commit

Permalink
Remove fields from metadata that are not relevant to Marketplace (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
gibbleyg authored Jul 27, 2023
1 parent 2d399bf commit 1b375ce
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 120 deletions.
55 changes: 1 addition & 54 deletions examples/terraform/wordpress/README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
# terraform-google-canonical-mp
# Wordpress

This module deploys a [WordPress Google Click to Deploy Solution](https://console.cloud.google.com/marketplace/product/click-to-deploy-images/wordpress) from Marketplace.

## Description
### Tagline
WordPress Google Click to Deploy Solution

### Detailed
This module deploys a WordPress Google Click to Deploy Solution from Marketplace.

### PreDeploy
To deploy this blueprint you must have an active billing account and billing permissions.

## Architecture
![Wordpress Architecture](assets/wp-architecture.png)
1. Clients request content by querying the web url.
2. Requests reach GCP via a public IP and are evaluated by the firewall.
3. Valid requests pass through the firewall and reach the wordpress GCE instance to serve content.

## Documentation
- [Hosting a Static Website](https://cloud.google.com/storage/docs/hosting-static-website)

## Deployment Duration
Configuration: 1 mins
Deployment: 5 mins

## Cost
[Wordpress cost details](https://cloud.google.com/products/calculator#id=d2a82f67-ff05-4179-9e15-9682ef77a663)

<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

| Name | Description | Type | Default | Required |
Expand Down Expand Up @@ -68,29 +41,3 @@ Deployment: 5 mins
| mysql\_password | Password for the MySql user |
| root\_password | Password for the root user |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

## Requirements

These sections describe requirements for using this module.

### Software

The following dependencies must be available:

- [Terraform][terraform] v0.13
- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0

### Service Account

A service account with the following roles must be used to provision
the resources of this module:

- Storage Admin: `roles/compute.admin`

### APIs

A project with the following APIs enabled must be used to host the
resources of this module:

- Google Compute API: `compute.googleapis.com`
Binary file not shown.
17 changes: 1 addition & 16 deletions examples/terraform/wordpress/metadata.display.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
config.kubernetes.io/local-config: "true"
spec:
info:
title: terraform-google-canonical-mp
title: Wordpress
source:
repo: https://github.com/GoogleCloudPlatform/marketplace-tools.git
sourceType: git
Expand Down Expand Up @@ -169,18 +169,3 @@ spec:
- name: operations
title: Operations
subtext: Monitoring and management for services, containers, applications, and infrastructure
runtime:
outputMessage: Deployment can take several minutes to complete.
suggestedActions:
- heading: No external IP configured
description: "The VM instance has been configured with no external IP or internet access. Connecting \nto it directly may not be possible. Consider using a <a href=\"https://cloud.google.com/compute/docs/instances/connecting-advanced#bastion_host\">bastion host</a> \nto access this VM."
showIf: '!outputs.has_external_ip'
- heading: Access the phpMyAdmin web interface
description: Visit <a href="http://outputs.instance_self_link/phpmyadmin">http://outputs.instance_self_link/phpmyadmin</a>
showIf: variables.install_phpmyadmin
- heading: Change the temporary passwords
description: For additional security, it is recommended that you change the passwords.
- heading: Open HTTPS traffic
description: "'This firewall rule is not enabled. To allow specific network traffic from the Internet, \ncreate a firewall rule to open HTTPS traffic for target tag \"variables.name-deployment\". \n<a href=\"https://cloud.google.com/compute/docs/networking\">Learn more</a><br> If you are \nusing Google Cloud SDK, type the following command in the terminal:'"
snippet: "gcloud --project=variables.project_id compute firewall-rules create \"variables.name-tcp-443\" \n--network outputs.instance_network \n--allow tcp:443 \n--target-tags \"variables.name-deployment\""
showIf: '!variables.enableTcp443'
52 changes: 2 additions & 50 deletions examples/terraform/wordpress/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
config.kubernetes.io/local-config: "true"
spec:
info:
title: terraform-google-canonical-mp
title: Wordpress
source:
repo: https://github.com/GoogleCloudPlatform/marketplace-tools.git
sourceType: git
Expand All @@ -29,55 +29,7 @@ spec:
actuationTool:
flavor: Terraform
version: '>= 0.13'
description:
tagline: WordPress Google Click to Deploy Solution
detailed: This module deploys a WordPress Google Click to Deploy Solution from Marketplace.
preDeploy: To deploy this blueprint you must have an active billing account and billing permissions.
deploymentDuration:
configurationSecs: 60
deploymentSecs: 300
costEstimate:
description: Wordpress cost details
url: https://cloud.google.com/products/calculator#id=d2a82f67-ff05-4179-9e15-9682ef77a663
cloudProducts:
- productId: Compute Engine
pageUrl: compute
author:
title: click-to-deploy-images
softwareGroups:
- type: SG_OS
software:
- title: Debian
version: "11.6"
- software:
- title: Apache2
version: 2.4.56
- title: MySQL-Client
version: 8.0.32
- title: MySQL-Community-Client
version: 8.0.32
- title: MySQL-Community-Server
version: 8.0.32
- title: MySQL-Server
version: 8.0.32
- title: PHP
version: 8.1.17
- title: WP-CLI
version: 2.7.1
- title: WordPress
version: "6.2"
- title: phpMyAdmin
version: 5.0.2
content:
architecture:
diagramUrl: assets/wp-architecture.png
description:
- 1. Clients request content by querying the web url.
- 2. Requests reach GCP via a public IP and are evaluated by the firewall.
- 3. Valid requests pass through the firewall and reach the wordpress GCE instance to serve content.
documentation:
- title: Hosting a Static Website
url: https://cloud.google.com/storage/docs/hosting-static-website
description: {}
interfaces:
variables:
- name: boot_disk_size
Expand Down

0 comments on commit 1b375ce

Please sign in to comment.