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

Jump to bottom

fix(anthos-attached-clusters): add providers and lint #692

Merged
merged 2 commits into from
Aug 28, 2024
Merged

fix(anthos-attached-clusters): add providers and lint #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7c334
fix(anthos-attached-clusters): add providers and lint
apeabody Aug 27, 2024
6f38773
Merge branch 'main' into ap/attached-lint
apeabody Aug 28, 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
15 changes: 6 additions & 9 deletions anthos-attached-clusters/aks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ locals {
}
}

data "azurerm_subscription" "current" {
}

apeabody marked this conversation as resolved.
Show resolved Hide resolved
resource "azurerm_resource_group" "aks" {
name = "${var.name_prefix}-rg"
location = var.azure_region
Expand Down Expand Up @@ -59,12 +56,12 @@ data "google_project" "project" {
provider "helm" {
alias = "bootstrap_installer"
kubernetes {
host = azurerm_kubernetes_cluster.aks.kube_config.0.host
username = azurerm_kubernetes_cluster.aks.kube_config.0.username
password = azurerm_kubernetes_cluster.aks.kube_config.0.password
client_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_certificate)
client_key = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_key)
cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.cluster_ca_certificate)
host = azurerm_kubernetes_cluster.aks.kube_config[0].host
username = azurerm_kubernetes_cluster.aks.kube_config[0].username
password = azurerm_kubernetes_cluster.aks.kube_config[0].password
client_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_certificate)
client_key = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_key)
cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].cluster_ca_certificate)
}
}

Expand Down
3 changes: 2 additions & 1 deletion anthos-attached-clusters/aks/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ terraform {
version = ">=5.0.0"
}
helm = {
source = "hashicorp/helm"
source = "hashicorp/helm"
version = "~> 2.0"
apeabody marked this conversation as resolved.
Show resolved Hide resolved
}
}
required_version = ">= 0.13"
Expand Down
3 changes: 2 additions & 1 deletion anthos-attached-clusters/eks/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ terraform {
version = ">=5.0.0"
}
helm = {
source = "hashicorp/helm"
source = "hashicorp/helm"
version = "~> 2.0"
}
}
required_version = ">= 0.13"
Expand Down
4 changes: 3 additions & 1 deletion anthos-attached-clusters/kind/oidc/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
terraform {
required_providers {
http-full = {
source = "salrashid123/http-full"
source = "salrashid123/http-full"
version = "~> 1.3"
}
}
required_version = ">= 0.13"
}

12 changes: 11 additions & 1 deletion anthos-attached-clusters/kind/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,18 @@
terraform {
required_providers {
kind = {
source = "tehcyx/kind"
source = "tehcyx/kind"
version = "~> 0.6"
}
google = {
source = "hashicorp/google"
version = "~> 5.0"
}
helm = {
source = "hashicorp/helm"
version = "~> 2.0"
}
}
required_version = ">= 0.13"
}

4 changes: 4 additions & 0 deletions anthos-attached-clusters/modules/attached-install-manifest/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ terraform {
source = "hashicorp/helm"
version = ">=2.13.1"
}
local = {
source = "hashicorp/local"
version = "~> 2.2"
}
}
required_version = ">= 0.13"
}
Loading