feat: add gcp_filestore_csi_driver_config to addons config #1161
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidspek
requested review from
a team,
Jberlinsky and
bharathkkb
as code owners
davidspek
force-pushed
the
filestore-csi
branch
from
f82cb9c
to
75d551d
Compare
|
@bharathkkb Is there a way to see what's causing the failure? I think it might be caused by the provider bump. |
|
Thanks for the PR! 🚀
Running terraform fmt
Running terraform validate
terraform_validate .
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/acm-terraform-blog-part1/terraform
Success!
The configuration is valid.
terraform_validate ./examples/acm-terraform-blog-part2/terraform
Success!
The configuration is valid.
terraform_validate ./examples/acm-terraform-blog-part3/terraform
Success!
The configuration is valid.
terraform_validate ./examples/deploy_service
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/disable_client_cert
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/node_pool
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-public-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/node_pool_update_variant
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster-update-variant/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/node_pool_update_variant_beta
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-private-cluster-update-variant/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/node_pool_update_variant_public_beta
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-public-cluster-update-variant/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/private_zonal_with_networking
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/regional_private_node_pool_oauth_scopes
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/safer_cluster
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/safer_cluster_iap_bastion
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/shared_vpc
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_autopilot_private
Success!
The configuration is valid.
terraform_validate ./examples/simple_autopilot_public
Success!
The configuration is valid.
terraform_validate ./examples/simple_regional
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_regional_beta
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-public-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_regional_private
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_regional_private_beta
╷
│
Error:
Unsupported block type
│
│
on ../../modules/beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_regional_with_kubeconfig
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_regional_with_networking
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_zonal_private
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_zonal_with_acm
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_zonal_with_asm
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_zonal_with_hub
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/simple_zonal_with_hub_kubeconfig
Success!
The configuration is valid.
terraform_validate ./examples/stub_domains
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/stub_domains_private
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/stub_domains_upstream_nameservers
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/upstream_nameservers
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/workload_identity
╷
│
Error:
Unsupported block type
│
│
on ../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./examples/workload_metadata_config
╷
│
Error:
Unsupported block type
│
│
on ../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/acm
Success!
The configuration is valid.
terraform_validate ./modules/asm
Success!
The configuration is valid.
terraform_validate ./modules/auth
Success!
The configuration is valid.
terraform_validate ./modules/beta-autopilot-private-cluster
Success!
The configuration is valid.
terraform_validate ./modules/beta-autopilot-public-cluster
Success!
The configuration is valid.
terraform_validate ./modules/beta-private-cluster
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/beta-private-cluster-update-variant
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/beta-public-cluster
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/beta-public-cluster-update-variant
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/binary-authorization
Success!
The configuration is valid.
terraform_validate ./modules/config-sync
Success!
The configuration is valid.
terraform_validate ./modules/hub
Success!
The configuration is valid.
terraform_validate ./modules/k8s-operator-crd-support
Success!
The configuration is valid.
terraform_validate ./modules/private-cluster
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/private-cluster-update-variant
╷
│
Error:
Unsupported block type
│
│
on cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/safer-cluster
╷
│
Error:
Unsupported block type
│
│
on ../beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/safer-cluster-update-variant
╷
│
Error:
Unsupported block type
│
│
on ../beta-private-cluster-update-variant/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./modules/services
Success!
The configuration is valid.
terraform_validate ./modules/workload-identity
Success!
The configuration is valid.
terraform_validate ./test/fixtures/beta_cluster
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/beta-public-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/deploy_service
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/disable_client_cert
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/node_pool
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/beta-public-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/node_pool_update_variant
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster-update-variant/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/private_zonal_with_networking
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/safer_cluster
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/safer_cluster_iap_bastion
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/beta-private-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/sandbox_enabled
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/beta-public-cluster/cluster.tf line 164, in resource "google_container_cluster" "primary":
│
164:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_autopilot_private
Success!
The configuration is valid.
terraform_validate ./test/fixtures/simple_autopilot_public
Success!
The configuration is valid.
terraform_validate ./test/fixtures/simple_regional
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_regional_private
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_regional_with_kubeconfig
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_regional_with_networking
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_zonal
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_zonal_private
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/simple_zonal_with_asm
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/stub_domains
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/stub_domains_private
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/stub_domains_upstream_nameservers
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/upstream_nameservers
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/workload_identity
╷
│
Error:
Unsupported block type
│
│
on ../../../cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/fixtures/workload_metadata_config
╷
│
Error:
Unsupported block type
│
│
on ../../../modules/private-cluster/cluster.tf line 113, in resource "google_container_cluster" "primary":
│
113:
gcp_filestore_csi_driver_config
{
│
│
Blocks of type "gcp_filestore_csi_driver_config" are not expected here.
╵
terraform_validate ./test/setup
Success!
The configuration is valid. |
bharathkkb
approved these changes
Feb 24, 2022
There was a problem hiding this comment.
@davidspek thanks for working on this! The error should be fixed in #1159
|
@bharathkkb should I rebase on that PR? |
|
@davidspek so it was actually fixed in #1148 which was merged to main. If you could rebase on main that would be great |
Signed-off-by: DavidSpek <vanderspek.david@gmail.com>
|
@bharathkkb Just rebased it again, let's see what the CI does. |
bharathkkb
reviewed
Mar 3, 2022
There was a problem hiding this comment.
Thanks for rebasing @davidspek
A few comments below and could you run make build to regenerate?
autogen/main/cluster.tf.tmpl
Outdated
| @@ -185,6 +185,11 @@ resource "google_container_cluster" "primary" { | |||
| horizontal_pod_autoscaling { | |||
| disabled = !var.horizontal_pod_autoscaling | |||
| } | |||
|
|
|||
| gcp_filestore_csi_driver_config { | |||
There was a problem hiding this comment.
I see a conflit with autopilot, so we will need to move this into the % if autopilot_cluster != true %} block
autogen/main/main.tf.tmpl
Outdated
| @@ -186,6 +186,7 @@ locals { | |||
| cluster_http_load_balancing_enabled = ! local.cluster_output_http_load_balancing_enabled | |||
| cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_output_horizontal_pod_autoscaling_enabled | |||
| workload_identity_enabled = ! (var.identity_namespace == null || var.identity_namespace == "null") | |||
| cluster_filestore_csi_driver_config = var.filestore_csi_driver | |||
There was a problem hiding this comment.
I noticed that this looks unused?
|
@bharathkkb I think the changes I've just pushed resolve your comments. My familiarity with this code base isn't great, since all I really did was rebase the original PR. If it still doesn't look good I'll dive into it deeper. |
|
@davidspek no problem, I was trying to push to your branch but looks like I dont have access. I will open a PR with the fixes. |
|
@bharathkkb Thanks for jumping on this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased version of #1145
#1030
Signed-off-by: DavidSpek vanderspek.david@gmail.com