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.

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

NOJIRA: Adjusting examples to require subscription_id and have consistent desc #419

Merged
merged 4 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@ jobs:
TF_VAR_castai_api_token: ${{ secrets.CASTAI_TOKEN }}
TF_VAR_castai_api_url: ${{ secrets.CASTAI_URL }}
TF_VAR_cluster_region: "germanywestcentral"
TF_VAR_subscription_id: ${{ secrets.AZURE_TF_ACCEPTANCE_TEST_ARM_SUBSCRIPTION_ID }}
id: aks_plan_examples
run: cd examples/aks/aks_cluster && terraform plan 1> /dev/null
22 changes: 22 additions & 0 deletions castai/sdk/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 27 additions & 7 deletions castai/sdk/client.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions castai/sdk/mock/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/aks/aks_cluster/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Following providers required by AKS and Vnet resources.
provider "azurerm" {
features {}
subscription_id = var.subscription_id
}

provider "azuread" {
Expand Down
1 change: 1 addition & 0 deletions examples/aks/aks_cluster/tf.vars.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cluster_name = "<place-holder>"
cluster_region = "<place-holder>"
castai_api_token = "<place-holder>"
subscription_id = "<place-holder>"
5 changes: 5 additions & 0 deletions examples/aks/aks_cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ variable "tags" {
description = "Optional tags for new cluster nodes. This parameter applies only to new nodes - tags for old nodes are not reconciled."
default = {}
}

variable "subscription_id" {
type = string
description = "Azure subscription ID"
}
1 change: 1 addition & 0 deletions examples/aks/aks_cluster_arm_template/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Following providers required by AKS and Vnet resources.
provider "azurerm" {
features {}
subscription_id = var.subscription_id
}

provider "azuread" {
Expand Down
1 change: 1 addition & 0 deletions examples/aks/aks_cluster_arm_template/tf.vars.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cluster_name = "<placeholder>"
cluster_region = "<placeholder>"
castai_api_token = "<placeholder>"
subscription_id = "<place-holder>"
5 changes: 5 additions & 0 deletions examples/aks/aks_cluster_arm_template/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ variable "tags" {
description = "Optional tags for new cluster nodes. This parameter applies only to new nodes - tags for old nodes are not reconciled."
default = {}
}

variable "subscription_id" {
type = string
description = "Azure subscription ID"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cluster_name = "<place-holder>"
cluster_region = "<place-holder>"
castai_api_token = "<place-holder>"
subscription_id = "<place-holder>"
1 change: 1 addition & 0 deletions examples/aks/aks_cluster_azure_cni/providers.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Following providers required by AKS and Vnet resources.
provider "azurerm" {
features {}
subscription_id = var.subscription_id
}

provider "azuread" {
Expand Down
1 change: 1 addition & 0 deletions examples/aks/aks_cluster_azure_cni/tf.vars.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cluster_name = "<place-holder>"
cluster_region = "<place-holder>"
castai_api_token = "<place-holder>"
subscription_id = "<place-holder>"
5 changes: 5 additions & 0 deletions examples/aks/aks_cluster_azure_cni/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,8 @@ variable "tags" {
description = "Optional tags for new cluster nodes. This parameter applies only to new nodes - tags for old nodes are not reconciled."
default = {}
}

variable "subscription_id" {
type = string
description = "Azure subscription ID"
}
11 changes: 6 additions & 5 deletions examples/aks/aks_cluster_existing/tf.vars.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
cluster_name = ""
cluster_rg = ""
cluster_region = ""
castai_api_token = ""
subnets = [""]
cluster_name = "<place-holder>"
cluster_rg = "<place-holder>"
cluster_region = "<place-holder>"
castai_api_token = "<place-holder>"
subscription_id = "<place-holder>"
subnets = ["<place-holder>"]
2 changes: 1 addition & 1 deletion examples/aks/aks_cluster_existing/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variable "resource_group" {

variable "subscription_id" {
type = string
description = "subscription id"
description = "Azure subscription ID"
}

variable "cluster_region" {
Expand Down
Loading