Skip to content

Bump Terraform provider for aaa #2012

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

Merged
k8s-ci-robot merged 3 commits into from
May 7, 2021
+10 −10
Merged

Bump Terraform provider for aaa #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44dd786
Improve terraform version constraint
ameukam May 6, 2021
66bd4a4
Bump version of the terraform provider
ameukam May 6, 2021
20572a4
Revert hardcoded field
ameukam May 6, 2021
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
6 changes: 3 additions & 3 deletions infra/gcp/clusters/projects/kubernetes-public/aaa/00-inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This file defines:
*/

terraform {
required_version = ">= 0.13.6"
required_version = "~> 0.13.6"

backend "gcs" {
bucket = "k8s-infra-tf-public-clusters"
Expand All @@ -16,10 +16,10 @@ terraform {

required_providers {
google = {
version = "~> 3.1.0"
version = "~> 3.46.0"
}
google-beta = {
version = "~> 3.1.0"
version = "~> 3.46.0"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions infra/gcp/clusters/projects/kubernetes-public/aaa/10-cluster-configuration.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@ locals {

// Create SA for nodes
resource "google_service_account" "cluster_node_sa" {
project = "kubernetes-public"
project = data.google_project.project.project_id
account_id = "gke-nodes-${local.cluster_name}"
display_name = "Nodes in GKE cluster '${local.cluster_name}'"
}

// Add roles for SA
resource "google_project_iam_member" "cluster_node_sa_logging" {
project = "kubernetes-public"
project = data.google_project.project.project_id
role = "roles/logging.logWriter"
member = "serviceAccount:${google_service_account.cluster_node_sa.email}"
}
resource "google_project_iam_member" "cluster_node_sa_monitoring_viewer" {
project = "kubernetes-public"
project = data.google_project.project.project_id
role = "roles/monitoring.viewer"
member = "serviceAccount:${google_service_account.cluster_node_sa.email}"
}
resource "google_project_iam_member" "cluster_node_sa_monitoring_metricwriter" {
project = "kubernetes-public"
project = data.google_project.project.project_id
role = "roles/monitoring.metricWriter"
member = "serviceAccount:${google_service_account.cluster_node_sa.email}"
}

// BigQuery dataset for usage data
resource "google_bigquery_dataset" "usage_metering" {
dataset_id = replace("usage_metering_${local.cluster_name}", "-", "_")
project = "kubernetes-public"
project = data.google_project.project.project_id
description = "GKE Usage Metering for cluster '${local.cluster_name}'"
location = local.bigquery_location

Expand All @@ -64,7 +64,7 @@ resource "google_container_cluster" "cluster" {
location = local.cluster_location

provider = google-beta
project = "kubernetes-public"
project = data.google_project.project.project_id

// GKE clusters are critical objects and should not be destroyed
// IMPORTANT: should be false on test clusters
Expand Down Expand Up @@ -108,7 +108,7 @@ resource "google_container_cluster" "cluster" {

// Enable workload identity for GCP IAM
workload_identity_config {
identity_namespace = "kubernetes-public.svc.id.goog"
identity_namespace = "${data.google_project.project.project_id}.svc.id.goog"
}

// Enable Stackdriver Kubernetes Monitoring
Expand Down