Skip to content

Commit c7dff46

Browse files
authored
feat: integrate with ipam via values created by NetworkAllocation XRDs (#5)
* feat: cidr + allocations for subnets from ipam pools * fix: Removed unused $deletionPolicy variable + separate file for ipv4/6 cidr and allocations * feat: subnet pool * feat: move network allocation out of xrd to separate NetworkAllocation XRDs
1 parent 8c17a98 commit c7dff46

37 files changed

Lines changed: 835 additions & 1316 deletions

.github/workflows/on-pr.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@ jobs:
3131
examples: |
3232
[
3333
{ "example": "examples/networks/minimal.yaml" },
34-
{ "example": "examples/networks/minimal.yaml", "observed_resources": "examples/test/mocks/observed-resources/minimal/steps/1" },
35-
{ "example": "examples/networks/private-only.yaml" },
36-
{ "example": "examples/networks/manual-cidr.yaml" },
37-
{ "example": "examples/networks/dual-stack.yaml" },
38-
{ "example": "examples/networks/enterprise.yaml" },
39-
{ "example": "examples/networks/ipam-subnets.yaml" },
40-
{ "example": "examples/networks/ipam-subnets.yaml", "observed_resources": "examples/test/mocks/observed-resources/ipam-subnets/steps/1" }
34+
{ "example": "examples/networks/standard.yaml" },
35+
{ "example": "examples/networks/dual-stack-ula.yaml" },
36+
{ "example": "examples/networks/dual-stack-amazon.yaml" },
37+
{ "example": "examples/networks/high-availability.yaml" }
4138
]
4239
api_path: apis/networks
4340
error_on_missing_schemas: true

.github/workflows/on-push-main.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ jobs:
2828
examples: |
2929
[
3030
{ "example": "examples/networks/minimal.yaml" },
31-
{ "example": "examples/networks/minimal.yaml", "observed_resources": "examples/test/mocks/observed-resources/minimal/steps/1" },
32-
{ "example": "examples/networks/private-only.yaml" },
33-
{ "example": "examples/networks/manual-cidr.yaml" },
34-
{ "example": "examples/networks/dual-stack.yaml" },
35-
{ "example": "examples/networks/enterprise.yaml" },
36-
{ "example": "examples/networks/ipam-subnets.yaml" },
37-
{ "example": "examples/networks/ipam-subnets.yaml", "observed_resources": "examples/test/mocks/observed-resources/ipam-subnets/steps/1" }
31+
{ "example": "examples/networks/standard.yaml" },
32+
{ "example": "examples/networks/dual-stack-ula.yaml" },
33+
{ "example": "examples/networks/dual-stack-amazon.yaml" },
34+
{ "example": "examples/networks/high-availability.yaml" }
3835
]
3936
api_path: apis/networks
4037
error_on_missing_schemas: true

Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@ E2E_TESTS := $(wildcard tests/e2etest-*)
1212
# Format: example_path::observed_resources_path (observed_resources_path is optional)
1313
EXAMPLES := \
1414
examples/networks/minimal.yaml:: \
15-
examples/networks/minimal.yaml::examples/test/mocks/observed-resources/minimal/steps/1 \
16-
examples/networks/dual-stack.yaml:: \
17-
examples/networks/e2e.yaml:: \
18-
examples/networks/enterprise.yaml:: \
19-
examples/networks/manual-cidr.yaml:: \
20-
examples/networks/private-only.yaml:: \
21-
examples/networks/ipam-subnets.yaml:: \
22-
examples/networks/ipam-subnets.yaml::examples/test/mocks/observed-resources/ipam-subnets/steps/1
15+
examples/networks/standard.yaml:: \
16+
examples/networks/dual-stack-ula.yaml:: \
17+
examples/networks/dual-stack-amazon.yaml:: \
18+
examples/networks/high-availability.yaml::
2319

2420
clean:
2521
rm -rf _output

apis/networks/configuration.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ apiVersion: meta.pkg.crossplane.io/v1alpha1
22
kind: Configuration
33
metadata:
44
name: configuration-network
5+
annotations:
6+
meta.crossplane.io/maintainer: Hops Platform Team <platform@hops.ops.com.ai>
7+
meta.crossplane.io/source: github.com/hops-ops/configuration-network
8+
meta.crossplane.io/description: |
9+
Network creates AWS VPCs with subnets, routing, NAT gateways, and optional
10+
enterprise features. Supports IPv4, IPv6, and dual-stack configurations.
511
spec:
612
dependsOn:
713
- provider: xpkg.crossplane.io/crossplane-contrib/provider-aws-ec2

0 commit comments

Comments
 (0)