Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#338 - branch dan-fix-versions-upgrade - Fixed Provider bugs, TF upgrade. from v1.0.10 to v1.6.0 #338

Merged
merged 4 commits into from
Nov 8, 2023
Merged

#338 - branch dan-fix-versions-upgrade - Fixed Provider bugs, TF upgrade. from v1.0.10 to v1.6.0 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa4aeb8
fixed-terraform-version-provider-bug-as-well
Nov 7, 2023
480b8e3
added changes to README.md
Nov 7, 2023
0185066
added back iam-groups aand roles
Nov 7, 2023
de7d173
mod lz.env and auto.tfvars for iam
Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ See the following example of a landing zone deployment.
The Bootstrap script is currently written for common linux distributions. It requires the following tools to be installed:
- GCloud SDK
- JQ (for JSON queries)
- Terraform >= 1.0
- Terraform >= 1.3.0

[Install GCloud](https://cloud.google.com/sdk/docs/install#linux)

Expand All @@ -36,36 +36,35 @@ sudo apt-get install jq -q -y

Move Terraform to a PATH usable location, usually like this:
```
# until advised otherwise - keep the version at 1.0.10 just for bootstrap
VER=1.0.10
# until advised otherwise - keep the version between "1.3.0 and 1.6.0" just for bootstrap
VER=1.3.0
# replace VER above with a desired value, its been tested upto 1.6.0, so any value >= 1.3.0 is ok.
wget https://releases.hashicorp.com/terraform/${VER}/terraform_${VER}_linux_amd64.zip
unzip terraform_${VER}_linux_amd64.zip
# keep the older 1.5.x version
# keep the older 1.6.x version
cp /usr/bin/terraform terraform_original

# check versions
michael@cloudshell:~/lz-oe$ ./terraform --version
Terraform v1.0.10
on linux_amd64
Your version of Terraform is out of date! The latest version
is 1.5.7. You can update by downloading from https://www.terraform.io/downloads.html
michael@cloudshell:~/lz-oe$ terraform --version
Terraform v1.5.5
danish@cloudshell:~/lz-oe$ ./terraform --version
terraform version
Terraform v1.6.0
on linux_amd64

Your version of Terraform is out of date! The latest version
is 1.5.7. You can update by downloading from https://www.terraform.io/downloads.html
is 1.6.3. You can update by downloading from https://www.terraform.io/downloads.html

# downgrade terraform
sudo cp ./terraform /usr/bin
sudo chmod +x /usr/bin/terraform

# check downdraded version
michael@cloudshell:~/lz-oe$ terraform --version
Terraform v1.0.10
danish@cloudshell:~/lz-oe$ terraform --version
Terraform v1.3.0
on linux_amd64

Your version of Terraform is out of date! The latest version
is 1.5.7. You can update by downloading from https://www.terraform.io/downloads.html
is 1.6.3. You can update by downloading from https://www.terraform.io/downloads.html


```
#
Expand Down
20 changes: 0 additions & 20 deletions environments/bootstrap/terraform.tf
View file
Open in desktop

This file was deleted.

72 changes: 36 additions & 36 deletions environments/common/iam-groups.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,69 +16,69 @@

# when updating - recreate the entire group - authorative vs additive
iam-group_opsadmin = {
id = "opsadmin@DOMAIN_NAME"
id = "opsadmin@REPLACE_DOMAIN_NAME"
display_name = "opsadmin"
description = "ops admin group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["root@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["root@REPLACE_DOMAIN_NAME"]
}

iam-group_networkadmin = {
id = "networkadmin@DOMAIN_NAME"
id = "networkadmin@REPLACE_DOMAIN_NAME"
display_name = "networkadmin"
description = "network admin group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["root@DOMAIN_NAME", "developer@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["root@REPLACE_DOMAIN_NAME", "developer@REPLACE_DOMAIN_NAME"]
}

iam-group_telcoadmin = {
id = "telcoadmin@DOMAIN_NAME"
id = "telcoadmin@REPLACE_DOMAIN_NAME"
display_name = "telcoadmin"
description = "telco admin group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["root@DOMAIN_NAME", "developer@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["root@REPLACE_DOMAIN_NAME", "developer@REPLACE_DOMAIN_NAME"]
}


iam-group_secadmin = {
id = "secadmin@DOMAIN_NAME"
id = "secadmin@REPLACE_DOMAIN_NAME"
display_name = "secadmin"
description = "security admin group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["root@DOMAIN_NAME", "developer@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["root@REPLACE_DOMAIN_NAME", "developer@REPLACE_DOMAIN_NAME"]
}

iam-group_read = {
id = "read@DOMAIN_NAME"
id = "read@REPLACE_DOMAIN_NAME"
display_name = "read"
description = "read group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["developer@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["developer@REPLACE_DOMAIN_NAME"]
}

iam-group_billing = {
id = "billing@DOMAIN_NAME"
id = "billing@REPLACE_DOMAIN_NAME"
display_name = "billing"
description = "billing group"
domain = "DOMAIN_NAME"
#owners = ["root@DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@DOMAIN_NAME"]
members = ["developer@DOMAIN_NAME"]
domain = "REPLACE_DOMAIN_NAME"
#owners = ["root@REPLACE_DOMAIN_NAME"]#, "tfsa0131@tzpe-tlz-tlz-de.iam.gserviceaccount.com"] # var.service_accounts
#managers = ["root@REPLACE_DOMAIN_NAME"]
members = ["developer@REPLACE_DOMAIN_NAME"]
}

organization_iam_group_secadmin = [
{
member = "group:secadmin@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:secadmin@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
Expand All @@ -88,7 +88,7 @@ organization_iam_group_secadmin = [

organization_iam_group_networkadmin = [
{
member = "group:networkadmin@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:networkadmin@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
Expand All @@ -98,7 +98,7 @@ organization_iam_group_networkadmin = [

organization_iam_group_telcoadmin = [
{
member = "group:telcoadmin@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:telcoadmin@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
Expand All @@ -108,7 +108,7 @@ organization_iam_group_telcoadmin = [

organization_iam_group_read = [
{
member = "group:read@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:read@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
Expand All @@ -119,7 +119,7 @@ organization_iam_group_read = [

organization_iam_group_billing = [
{
member = "group:billing@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:billing@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
Expand All @@ -129,7 +129,7 @@ organization_iam_group_billing = [

organization_iam_group_opsadmin = [
{
member = "group:opsadmin@DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
member = "group:opsadmin@REPLACE_DOMAIN_NAME" # REQUIRED EDIT. group:user@google.com
organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/bigquery.admin",
Expand Down
20 changes: 0 additions & 20 deletions environments/common/terraform.tf
View file
Open in desktop

This file was deleted.

Loading