Skip to content

Commit

Permalink
Merge pull request #63 from ollionorg/release-v2
Browse files Browse the repository at this point in the history
GCP Lz Release v2
  • Loading branch information
akashcldcvr authored Apr 12, 2024
2 parents 36edf07 + 1b7d6b3 commit 332155d
Show file tree
Hide file tree
Showing 8 changed files with 309 additions and 143 deletions.
111 changes: 54 additions & 57 deletions 0-bootstrap/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,57 +1,54 @@
group_org_admins = "" # DL
group_billing_admins = "" # DL
billing_data_users = "" # DL
monitoring_workspace_users = "" # DL

#deploy groups
cto_build_group = "" #TODO
cto_security_build_group = "" #TODO
cto_elevated_security_build_group = "" #TODO
cto_core_networking_build_group = "" #TODO

#ops_user_groups
cto_security_operations_group = ""
cto_elevated_security_operations_group = ""
cto_operations_group = ""
cto_core_networking_operations_group = ""
cto_user_management_operations_group = "" #TODO
cto_audit_compliance_operations_group = "" #TODO

#other group
cfo = "" #has access to billing


org_id = "" # 12 digit gcp org id
billing_account = "" # billing account id in the format XXXXXX-YYYYYY-ZZZZZZ
default_region = "" # example: asia-southeast1
parent_folder = "" # used if LZ to be deployed under a folder
project_prefix = "" # example: prj
folder_prefix = "" # example: fldr
bucket_prefix = "" # example: bkt
log_sink_prefix = "" # example: sk
project_name = "" # example: cldcvr
primary_contact = "" # example: varun_at_cldcvr_com
secondary_contact = "" # example: sachi_at_cldcvr_com
vpc_prefix = "vpc"

#bootstrap
runner_repo_name = "" # example: `gcp-lz` part of https://github.com/cldcvr/gcp-lz repo
runner_repo_owner = "" # example: `cldcvr` part of https://github.com/cldcvr/gcp-lz repo
runner_machine_type = "n1-standard-1" # example: f1-micro or e2-medium
num_instances = 3 # count of runners required to run the workflows
gar_repo_name = "" # example: gcf-lz-image (Name of the artifactory repo to be created in `cicd` project

domains_to_allow = ["<DOMAIN NAME>"] # example: godmode.in
default_region2 = "" # 2nd region required for peering; example: us-west1
domain = "" # The DNS name of peering managed zone. Must end with a period. For example: cldcvr.com.
enable_env_log_sink = true # Enable environment level log sink.
enable_restricted_network = false # Restriceted network, project and service perimeter
enable_interconnect_projects = true
d_enable_dedicated_interconnect = false
restricted_enable_partner_interconnect = false
shared_enable_partner_interconnect = false
runner_subnet_ip = "192.168.0.0/24"
git_pvt_key_scrt_name = ""
custom_labels = {}


group_org_admins = "" # Distribution List (DL) for Google Group of GCP Organization Administrators.
group_billing_admins = "" # Distribution List (DL) for Google Group of GCP Billing Administrators.
billing_data_users = "" # Distribution List (DL) for Google Workspace or Cloud Identity group with access to the billing data set.
monitoring_workspace_users = "" # Distribution List (DL) for Google Workspace or Cloud Identity group with access to Monitoring Workspaces.

# Deploy groups
cto_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group of guild users.
cto_security_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity security build group.
cto_elevated_security_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for elevated security build users.
cto_core_networking_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity networking build group.

# Ops user groups
cto_security_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for security operations.
cto_elevated_security_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for elevated security operations.
cto_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for operations.
cto_core_networking_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for network operations.
cto_user_management_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for management operations.
cto_audit_compliance_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for audit and compliance.

# Other group
cfo = "" # Distribution List (DL) for Google Workspace or Cloud Identity group of billing data users.

org_id = "" # 12-digit GCP organization ID.
billing_account = "" # Billing account ID in the format XXXXXX-YYYYYY-ZZZZZZ.
default_region = "" # Example: asia-southeast1.
parent_folder = "" # Used if LZ is to be deployed under a folder.
project_prefix = "" # Example: prj.
folder_prefix = "" # Example: fldr.
bucket_prefix = "" # Example: bkt.
log_sink_prefix = "" # Example: sk.
project_name = "" # Example: cldcvr.
primary_contact = "" # Example: varun_at_cldcvr_com.
secondary_contact = "" # Example: sachi_at_cldcvr_com.
vpc_prefix = "vpc" # VPC prefix used to create the vpc

# Bootstrap
runner_repo_name = "" # Example: `gcp-lz` part of https://github.com/cldcvr/gcp-lz repo.
runner_repo_owner = "" # Example: `cldcvr` part of https://github.com/cldcvr/gcp-lz repo.
runner_machine_type = "n1-standard-1" # Example: f1-micro or e2-medium.
num_instances = 3 # Count of runners required to run the workflows.
gar_repo_name = "" # Example: gcf-lz-image (Name of the artifactory repo to be created in `cicd` project).

domains_to_allow = ["<DOMAIN NAME>"] # Example: godmode.in.
default_region2 = "" # 2nd region required for peering; example: us-west1.
domain = "" # The DNS name of the peering managed zone. Must end with a period. For example: cldcvr.com.
enable_env_log_sink = True # Enable environment-level log sink.
enable_restricted_network = False # Restricted network, project, and service perimeter.
enable_interconnect_projects = True # Enable to create interconnect projects.
d_enable_dedicated_interconnect = False # Set to true if you want to create a dedicated interconnect.
restricted_enable_partner_interconnect = False # Set to true if you want to create a restricted partner interconnect.
shared_enable_partner_interconnect = False # Set to true if you want to create a shared partner interconnect.
runner_subnet_ip = "192.168.0.0/24" # The subnet range in which the runner instances will be built. For example, 192.168.168.0/24.
git_pvt_key_scrt_name = "" # The name/secret ID that holds the private key for the deploy keys added to the GitHub repo.
custom_labels = {} # Customer-designed labels for the project.
5 changes: 4 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
* @tridev-cldcvr
* @vishal-kapse
* @amansingh14
* @sujatak97
* @sujatak97
* @prathame
* @shwetanshu-cldcvr
* @akashcldcvr
37 changes: 37 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html), version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
67 changes: 56 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Contribute
This article explains how to contribute to the GCIFI Landing Zone.
This article explains how to contribute to the GCP Landing Zone.
Please read through the following guidelines.
> �� **Note**: before participating in our community, please read our
> **Note**: before participating in our community, please read our
> [code of conduct][coc].
> By interacting with this repository, organization, or community you agree to
> abide by its terms.
## Contributions
There’s several ways to contribute, not just by writing code.
If you have questions, see [support][].
If you have questions, see [support](https://github.com/ollionorg/gcp-landing-zone/blob/main/SUPPORT.md).
### Improve docs
Expand All @@ -25,6 +25,8 @@ If you identified an inaccuracy please raise a documentation issue.
Some issues lack information, aren’t reproducible, or are just incorrect.
You can help by trying to make them easier to resolve.
Existing issues might benefit from your unique experience or opinions.
Before creating bug reports, please check [here](https://github.com/ollionorg/gcp-landing-zone/issues) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report).

### Write code
Expand Down Expand Up @@ -55,27 +57,70 @@ bug or suggest a new feature before creating a pull request.
* Test before submitting code by running `terraform plan` and `terraform validate`
* Write a convincing description of why we should land your pull request:
it’s your job to convince us

## Styleguides

### Git Commit Messages

* Use the present tense ("Add feature" not "Added feature")
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
* Limit the first line to 72 characters or less
* Reference issues and pull requests liberally after the first line
* Pull request title should be: <type>([optional scope]): <description>

```
feat(ui): Add `Button` component
^ ^ ^
| | |__ Subject
| |_______ Scope
|____________ Type
```
**Type**
```
build - Changes that affect the build system or external dependencies (dependencies update)
ci - Changes to our CI configuration files and scripts (basically directory .github/workflows)
docs - Documentation only changes
feat - A new feature
fix - A bug fix
chore - Changes which does not touch the code (ex. manual update of release notes). It will not generate release notes changes
refactor - A code change that contains refactor
style - Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
test - Adding missing tests or correcting existing tests and also changes for our test app
perf - A code change that improves performance (I do not think we will use it)
```
**Example**
```
feat: Add locales description command for ios and android
fix: rate limit exceeded
ci: Added leading V to version name
refactor: config entities and arguments
docs: Add secrets and vision doc
build: Disable Auto Doc Generation
test: added multi modules to test app
chore: Release v20.08.1
```

## Resources
* [How to contribute to open source](https://opensource.guide/how-to-contribute/)
* [Making your first contribution](https://medium.com/@vadimdemedes/making-your-first-contribution-de6576ddb190)
* [Using pull requests](https://help.github.com/articles/about-pull-requests/)
* [GitHub help](https://help.github.com)
* [CloudCover](https://cldcvr.com/)
* [Ollion](https://ollion.com/)
## License
[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
<!-- Definitions -->
## Definitions
[license]: https://creativecommons.org/licenses/by/4.0/
[license]: https://creativecommons.org/licenses/by/4.0/
[author]: https://cldcvr.com/
[author]: https://ollion.com/
[coc]: https://github.com/remarkjs/.github/blob/main/code-of-conduct.md
[coc]: https://github.com/remarkjs/.github/blob/main/code-of-conduct.md
[support]: support.md
[support]: [support.md](https://github.com/ollionorg/gcp-landing-zone/blob/main/SUPPORT.md)
[collective]: https://opencollective.com/unified
[collective]: https://opencollective.com/unified
29 changes: 29 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Contributors

We'd like to thank all the contributors who have helped to make this project what it is today!

## Core Contributors

- [Aman Singh](https://github.com/amansingh14)
- [Akash Jaiswal](https://github.com/akashcldcvr)
- [Aries Youssefian](https://github.com/ariesyous)
- [Fahad Khan](https://github.com/tradark)
- [Sujata Kale](https://github.com/sujatak97)
- [Sanket Nadkarni](https://github.com/sanketnadkarni)
- [Vishal Kapse](https://github.com/vishal-kapse)


## All Contributors

In alphabetical order:
- [Akash Jaiswal](https://github.com/akashcldcvr)
- [Aman Singh](https://github.com/amansingh14)
- [Aries Youssefian](https://github.com/ariesyous)
- [Fahad Khan](https://github.com/tradark)
- [Sujata Kale](https://github.com/sujatak97)
- [Sanket Nadkarni](https://github.com/sanketnadkarni)
- [Vishal Kapse](https://github.com/vishal-kapse)

## Contributions of any kind welcome!

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind are welcome!
Loading

0 comments on commit 332155d

Please sign in to comment.