Skip to content

Commit af1bd79

Browse files
authored
Merge pull request #18 from 3scale-sre/fix/creation-deletion-order
Fix dependency declaration
2 parents 1434ce2 + b7d6521 commit af1bd79

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

hosted-cluster.tf

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,26 @@ resource "helm_release" "hosted_cluster" {
102102

103103
depends_on = [
104104
aws_iam_openid_connect_provider.oidc,
105+
aws_iam_role.worker,
106+
aws_iam_role_policy.worker,
105107
aws_iam_instance_profile.worker,
106108
aws_iam_role.aws_ebs_csi_driver_controller,
109+
aws_iam_role_policy.aws_ebs_csi_driver_controller,
107110
aws_iam_role.cloud_controller,
111+
aws_iam_role_policy.cloud_controller,
108112
aws_iam_role.cloud_network_config_controller,
113+
aws_iam_role_policy.cloud_network_config_controller,
109114
aws_iam_role.control_plane_operator,
115+
aws_iam_role_policy.control_plane_operator,
110116
aws_iam_role.node_pool,
117+
aws_iam_role_policy.node_pool,
111118
aws_iam_role.openshift_image_registry,
119+
aws_iam_role_policy.openshift_image_registry,
112120
aws_iam_role.openshift_ingress,
113-
aws_security_group.worker,
114-
aws_route53_zone.private,
121+
aws_iam_role_policy.openshift_ingress,
115122
aws_route53_zone.internal,
123+
aws_route53_zone.private,
124+
aws_security_group.worker,
116125
random_bytes.etcd_encryption_key,
117126
null_resource.cleanup
118127
]

security_group.tf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ resource "aws_security_group" "worker" {
99
description = "worker security group"
1010
vpc_id = var.vpc_id
1111

12-
# lifecycle {
13-
# ignore_changes = [
14-
# # Ignore changes ingress rules, as they will be modified
15-
# # by openshift controllers
16-
# ingress,
17-
# ]
18-
# }
19-
2012
egress {
2113
cidr_blocks = ["0.0.0.0/0"]
2214
from_port = "0"

0 commit comments

Comments
 (0)