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

fix: reformat subnetwork secondary range block #187

Merged
merged 8 commits into from
Sep 20, 2024
Merged

fix: reformat subnetwork secondary range block #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b44f4b
fix: reformat secondary range
gtsorbo Sep 20, 2024
c9589a6
fix: bump GKE and add OIDC condition
gtsorbo Sep 20, 2024
3d8f0be
fix: revert and add provider constraint
gtsorbo Sep 20, 2024
8d64b9d
fix: OIDC fix
gtsorbo Sep 20, 2024
a769d6f
fix: provider constraint
gtsorbo Sep 20, 2024
b23eeb0
fix: beta provider
gtsorbo Sep 20, 2024
2c1e98e
fix: adjust provider version constraint
gtsorbo Sep 20, 2024
c5a9bf8
fix: adjust version
gtsorbo Sep 20, 2024
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
8 changes: 6 additions & 2 deletions examples/gh-runner-gke-dind-rootless/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

terraform {
required_providers {
# TODO: undo version constraint pending provider bug
# https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 4.3.0, < 5.44"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = ">= 4.3.0, < 5.44"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
8 changes: 6 additions & 2 deletions examples/gh-runner-gke-dind/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

terraform {
required_providers {
# TODO: undo version constraint pending provider bug
# https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 4.3.0, < 5.44"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = ">= 4.3.0, < 5.44"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
8 changes: 6 additions & 2 deletions examples/gh-runner-gke-simple/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

terraform {
required_providers {
# TODO: undo version constraint pending provider bug
# https://github.com/GoogleCloudPlatform/magic-modules/pull/11688
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 4.3.0, < 5.44"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = ">= 4.3.0, < 5.44"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
7 changes: 4 additions & 3 deletions examples/oidc-simple/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ module "oidc" {
source = "terraform-google-modules/github-actions-runners/google//modules/gh-oidc"
version = "~> 3.0"

project_id = var.project_id
pool_id = "example-pool"
provider_id = "example-gh-provider"
project_id = var.project_id
pool_id = "example-pool"
provider_id = "example-gh-provider"
attribute_condition = "assertion.repository_owner_id=='1342004'"
sa_mapping = {
(google_service_account.sa.account_id) = {
sa_name = google_service_account.sa.name
Expand Down
19 changes: 10 additions & 9 deletions modules/gh-runner-gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ resource "google_compute_subnetwork" "gh-subnetwork" {
ip_cidr_range = var.subnet_ip
region = var.region
network = google_compute_network.gh-network[0].name
secondary_ip_range = [
{
range_name = var.ip_range_pods_name
ip_cidr_range = var.ip_range_pods_cidr
},
{ range_name = var.ip_range_services_name
ip_cidr_range = var.ip_range_services_cider
}
]

secondary_ip_range {
range_name = var.ip_range_pods_name
ip_cidr_range = var.ip_range_pods_cidr
}

secondary_ip_range {
range_name = var.ip_range_services_name
ip_cidr_range = var.ip_range_services_cider
}
}
/*****************************************
Runner GKE
Expand Down
5 changes: 5 additions & 0 deletions modules/gh-runner-gke/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ terraform {
version = ">= 4.3.0, < 7"
}

google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.3.0, < 7"
}

kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 2.0"
Expand Down
Loading