Merge pull request crossplane-contrib#883 from djeremiah/vpc-ipam-cid…

…r-block ignore cidr_block on lateinitialize to avoid conflicts when using ipam
spanio · Sep 19, 2023 · b815340 · b815340
2 parents 6bbeee5 + 86d8944
commit b815340
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 0 deletions.
diff --git a/apis/ec2/v1beta1/zz_generated_terraformed.go b/apis/ec2/v1beta1/zz_generated_terraformed.go
diff --git a/config/ec2/config.go b/config/ec2/config.go
@@ -325,6 +325,7 @@ func Configure(p *config.Provider) {
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{
 				"ipv6_cidr_block",
+				"cidr_block",
 			},
 		}
 		r.UseAsync = true

diff --git a/examples/ec2/vpc-ipampool.yaml b/examples/ec2/vpc-ipampool.yaml
@@ -0,0 +1,81 @@
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPC
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/vpc-ipampool
+  name: sample-vpc
+spec:
+  forProvider:
+    region: us-west-1
+    ipv4IpamPoolIdSelector:
+      matchLabels: 
+        testing.upbound.io/example-name: ipampool
+    ipv4NetmaskLength: 28
+    tags:
+      Name: DemoVpc
+---
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPCIpamPoolCidr
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/vpc-ipampool
+  labels:
+    testing.upbound.io/example-name: ipampool
+  name: example
+spec:
+  forProvider:
+    cidr: 172.2.0.0/16
+    ipamPoolIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: ipampool
+    region: us-west-1
+---
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPCIpamPool
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/vpc-ipampool
+  labels:
+    testing.upbound.io/example-name: ipampool
+  name: example
+spec:
+  forProvider:
+    addressFamily: ipv4
+    ipamScopeIdSelector: 
+      matchLabels:
+        testing.upbound.io/example-name: ipampool
+    locale: us-west-1 
+    region: us-west-1
+---
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPCIpamScope
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/vpc-ipampool
+  labels:
+    testing.upbound.io/example-name: ipampool
+  name: example
+spec:
+  forProvider:
+    description: Another Scope
+    ipamIdSelector: 
+      matchLabels:
+        testing.upbound.io/example-name: ipampool
+    region: us-west-1
+---
+apiVersion: ec2.aws.upbound.io/v1beta1
+kind: VPCIpam
+metadata:
+  annotations:
+    meta.upbound.io/example-id: ec2/v1beta1/vpc-ipampool
+  labels:
+    testing.upbound.io/example-name: ipampool
+  name: main
+spec:
+  forProvider:
+    description: My IPAM
+    operatingRegions:
+    - regionName: us-west-1 
+    region: us-west-1
+    tags:
+      Test: Main