Skip to content

Commit 332155d

Browse files
akashcldcvrakashcldcvr
authored
Merge pull request #63 from ollionorg/release-v2
GCP Lz Release v2
2 parents 36edf07 + 1b7d6b3 commit 332155d

File tree

8 files changed

+309
-143
lines changed

8 files changed

+309
-143
lines changed

‎0-bootstrap/terraform.tfvars

+54-57
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,54 @@
1-
group_org_admins = "" # DL
2-
group_billing_admins = "" # DL
3-
billing_data_users = "" # DL
4-
monitoring_workspace_users = "" # DL
5-
6-
#deploy groups
7-
cto_build_group = "" #TODO
8-
cto_security_build_group = "" #TODO
9-
cto_elevated_security_build_group = "" #TODO
10-
cto_core_networking_build_group = "" #TODO
11-
12-
#ops_user_groups
13-
cto_security_operations_group = ""
14-
cto_elevated_security_operations_group = ""
15-
cto_operations_group = ""
16-
cto_core_networking_operations_group = ""
17-
cto_user_management_operations_group = "" #TODO
18-
cto_audit_compliance_operations_group = "" #TODO
19-
20-
#other group
21-
cfo = "" #has access to billing
22-
23-
24-
org_id = "" # 12 digit gcp org id
25-
billing_account = "" # billing account id in the format XXXXXX-YYYYYY-ZZZZZZ
26-
default_region = "" # example: asia-southeast1
27-
parent_folder = "" # used if LZ to be deployed under a folder
28-
project_prefix = "" # example: prj
29-
folder_prefix = "" # example: fldr
30-
bucket_prefix = "" # example: bkt
31-
log_sink_prefix = "" # example: sk
32-
project_name = "" # example: cldcvr
33-
primary_contact = "" # example: varun_at_cldcvr_com
34-
secondary_contact = "" # example: sachi_at_cldcvr_com
35-
vpc_prefix = "vpc"
36-
37-
#bootstrap
38-
runner_repo_name = "" # example: `gcp-lz` part of https://github.com/cldcvr/gcp-lz repo
39-
runner_repo_owner = "" # example: `cldcvr` part of https://github.com/cldcvr/gcp-lz repo
40-
runner_machine_type = "n1-standard-1" # example: f1-micro or e2-medium
41-
num_instances = 3 # count of runners required to run the workflows
42-
gar_repo_name = "" # example: gcf-lz-image (Name of the artifactory repo to be created in `cicd` project
43-
44-
domains_to_allow = ["<DOMAIN NAME>"] # example: godmode.in
45-
default_region2 = "" # 2nd region required for peering; example: us-west1
46-
domain = "" # The DNS name of peering managed zone. Must end with a period. For example: cldcvr.com.
47-
enable_env_log_sink = true # Enable environment level log sink.
48-
enable_restricted_network = false # Restriceted network, project and service perimeter
49-
enable_interconnect_projects = true
50-
d_enable_dedicated_interconnect = false
51-
restricted_enable_partner_interconnect = false
52-
shared_enable_partner_interconnect = false
53-
runner_subnet_ip = "192.168.0.0/24"
54-
git_pvt_key_scrt_name = ""
55-
custom_labels = {}
56-
57-
1+
group_org_admins = "" # Distribution List (DL) for Google Group of GCP Organization Administrators.
2+
group_billing_admins = "" # Distribution List (DL) for Google Group of GCP Billing Administrators.
3+
billing_data_users = "" # Distribution List (DL) for Google Workspace or Cloud Identity group with access to the billing data set.
4+
monitoring_workspace_users = "" # Distribution List (DL) for Google Workspace or Cloud Identity group with access to Monitoring Workspaces.
5+
6+
# Deploy groups
7+
cto_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group of guild users.
8+
cto_security_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity security build group.
9+
cto_elevated_security_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for elevated security build users.
10+
cto_core_networking_build_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity networking build group.
11+
12+
# Ops user groups
13+
cto_security_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for security operations.
14+
cto_elevated_security_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for elevated security operations.
15+
cto_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for operations.
16+
cto_core_networking_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for network operations.
17+
cto_user_management_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for management operations.
18+
cto_audit_compliance_operations_group = "" # Distribution List (DL) for Google Workspace or Cloud Identity group responsible for audit and compliance.
19+
20+
# Other group
21+
cfo = "" # Distribution List (DL) for Google Workspace or Cloud Identity group of billing data users.
22+
23+
org_id = "" # 12-digit GCP organization ID.
24+
billing_account = "" # Billing account ID in the format XXXXXX-YYYYYY-ZZZZZZ.
25+
default_region = "" # Example: asia-southeast1.
26+
parent_folder = "" # Used if LZ is to be deployed under a folder.
27+
project_prefix = "" # Example: prj.
28+
folder_prefix = "" # Example: fldr.
29+
bucket_prefix = "" # Example: bkt.
30+
log_sink_prefix = "" # Example: sk.
31+
project_name = "" # Example: cldcvr.
32+
primary_contact = "" # Example: varun_at_cldcvr_com.
33+
secondary_contact = "" # Example: sachi_at_cldcvr_com.
34+
vpc_prefix = "vpc" # VPC prefix used to create the vpc
35+
36+
# Bootstrap
37+
runner_repo_name = "" # Example: `gcp-lz` part of https://github.com/cldcvr/gcp-lz repo.
38+
runner_repo_owner = "" # Example: `cldcvr` part of https://github.com/cldcvr/gcp-lz repo.
39+
runner_machine_type = "n1-standard-1" # Example: f1-micro or e2-medium.
40+
num_instances = 3 # Count of runners required to run the workflows.
41+
gar_repo_name = "" # Example: gcf-lz-image (Name of the artifactory repo to be created in `cicd` project).
42+
43+
domains_to_allow = ["<DOMAIN NAME>"] # Example: godmode.in.
44+
default_region2 = "" # 2nd region required for peering; example: us-west1.
45+
domain = "" # The DNS name of the peering managed zone. Must end with a period. For example: cldcvr.com.
46+
enable_env_log_sink = True # Enable environment-level log sink.
47+
enable_restricted_network = False # Restricted network, project, and service perimeter.
48+
enable_interconnect_projects = True # Enable to create interconnect projects.
49+
d_enable_dedicated_interconnect = False # Set to true if you want to create a dedicated interconnect.
50+
restricted_enable_partner_interconnect = False # Set to true if you want to create a restricted partner interconnect.
51+
shared_enable_partner_interconnect = False # Set to true if you want to create a shared partner interconnect.
52+
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.
53+
git_pvt_key_scrt_name = "" # The name/secret ID that holds the private key for the deploy keys added to the GitHub repo.
54+
custom_labels = {} # Customer-designed labels for the project.

‎CODEOWNERS

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
* @tridev-cldcvr
22
* @vishal-kapse
33
* @amansingh14
4-
* @sujatak97
4+
* @sujatak97
5+
* @prathame
6+
* @shwetanshu-cldcvr
7+
* @akashcldcvr

‎CODE_OF_CONDUCT.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Code of Conduct
2+
3+
## Our Pledge
4+
5+
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.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
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.
28+
29+
## Enforcement
30+
31+
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.
32+
33+
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.
34+
35+
## Attribution
36+
37+
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

‎CONTRIBUTING.md

+56-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Contribute
22
​
3-
This article explains how to contribute to the GCIFI Landing Zone.
3+
This article explains how to contribute to the GCP Landing Zone.
44
Please read through the following guidelines.
55
​
6-
> �� **Note**: before participating in our community, please read our
6+
> **Note**: before participating in our community, please read our
77
> [code of conduct][coc].
88
> By interacting with this repository, organization, or community you agree to
99
> abide by its terms.
1010
​
1111
## Contributions
1212
​
1313
There’s several ways to contribute, not just by writing code.
14-
If you have questions, see [support][].
14+
If you have questions, see [support](https://github.com/ollionorg/gcp-landing-zone/blob/main/SUPPORT.md).
1515
​
1616
### Improve docs
1717
​
@@ -25,6 +25,8 @@ If you identified an inaccuracy please raise a documentation issue.
2525
Some issues lack information, aren’t reproducible, or are just incorrect.
2626
You can help by trying to make them easier to resolve.
2727
Existing issues might benefit from your unique experience or opinions.
28+
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).
29+
2830
​
2931
### Write code
3032
​
@@ -55,27 +57,70 @@ bug or suggest a new feature before creating a pull request.
5557
* Test before submitting code by running `terraform plan` and `terraform validate`
5658
* Write a convincing description of why we should land your pull request:
5759
it’s your job to convince us
60+
61+
## Styleguides
62+
63+
### Git Commit Messages
64+
65+
* Use the present tense ("Add feature" not "Added feature")
66+
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
67+
* Limit the first line to 72 characters or less
68+
* Reference issues and pull requests liberally after the first line
69+
* Pull request title should be: <type>([optional scope]): <description>
70+
71+
```
72+
feat(ui): Add `Button` component
73+
^ ^ ^
74+
| | |__ Subject
75+
| |_______ Scope
76+
|____________ Type
77+
```
78+
**Type**
79+
```
80+
build - Changes that affect the build system or external dependencies (dependencies update)
81+
ci - Changes to our CI configuration files and scripts (basically directory .github/workflows)
82+
docs - Documentation only changes
83+
feat - A new feature
84+
fix - A bug fix
85+
chore - Changes which does not touch the code (ex. manual update of release notes). It will not generate release notes changes
86+
refactor - A code change that contains refactor
87+
style - Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
88+
test - Adding missing tests or correcting existing tests and also changes for our test app
89+
perf - A code change that improves performance (I do not think we will use it)
90+
```
91+
**Example**
92+
```
93+
feat: Add locales description command for ios and android
94+
fix: rate limit exceeded
95+
ci: Added leading V to version name
96+
refactor: config entities and arguments
97+
docs: Add secrets and vision doc
98+
build: Disable Auto Doc Generation
99+
test: added multi modules to test app
100+
chore: Release v20.08.1
101+
```
102+
58103
​
59104
## Resources
60105
​
61106
* [How to contribute to open source](https://opensource.guide/how-to-contribute/)
62107
* [Making your first contribution](https://medium.com/@vadimdemedes/making-your-first-contribution-de6576ddb190)
63108
* [Using pull requests](https://help.github.com/articles/about-pull-requests/)
64109
* [GitHub help](https://help.github.com)
65-
* [CloudCover](https://cldcvr.com/)
110+
* [Ollion](https://ollion.com/)
66111
​
67112
## License
68113
​
69-
[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
114+
[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
70115
​
71-
<!-- Definitions -->
116+
## Definitions
72117
​
73-
[license]: https://creativecommons.org/licenses/by/4.0/
118+
[license]: https://creativecommons.org/licenses/by/4.0/
74119
​
75-
[author]: https://cldcvr.com/
120+
[author]: https://ollion.com/
76121
​
77-
[coc]: https://github.com/remarkjs/.github/blob/main/code-of-conduct.md
122+
[coc]: https://github.com/remarkjs/.github/blob/main/code-of-conduct.md
78123
​
79-
[support]: support.md
124+
[support]: [support.md](https://github.com/ollionorg/gcp-landing-zone/blob/main/SUPPORT.md)
80125
​
81-
[collective]: https://opencollective.com/unified
126+
[collective]: https://opencollective.com/unified

‎CONTRIBUTORS.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Contributors
2+
3+
We'd like to thank all the contributors who have helped to make this project what it is today!
4+
5+
## Core Contributors
6+
7+
- [Aman Singh](https://github.com/amansingh14)
8+
- [Akash Jaiswal](https://github.com/akashcldcvr)
9+
- [Aries Youssefian](https://github.com/ariesyous)
10+
- [Fahad Khan](https://github.com/tradark)
11+
- [Sujata Kale](https://github.com/sujatak97)
12+
- [Sanket Nadkarni](https://github.com/sanketnadkarni)
13+
- [Vishal Kapse](https://github.com/vishal-kapse)
14+
15+
16+
## All Contributors
17+
18+
In alphabetical order:
19+
- [Akash Jaiswal](https://github.com/akashcldcvr)
20+
- [Aman Singh](https://github.com/amansingh14)
21+
- [Aries Youssefian](https://github.com/ariesyous)
22+
- [Fahad Khan](https://github.com/tradark)
23+
- [Sujata Kale](https://github.com/sujatak97)
24+
- [Sanket Nadkarni](https://github.com/sanketnadkarni)
25+
- [Vishal Kapse](https://github.com/vishal-kapse)
26+
27+
## Contributions of any kind welcome!
28+
29+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind are welcome!

0 commit comments

Comments
 (0)