Skip to content

Update AWS XNetwork dependency to allow custom network configuration #30

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.

Sign up for GitHub

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

Open
irizzant wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update AWS XNetwork dependency to allow custom network configuration #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5c108
chore: update dependencies and remove unused code
irizzant May 28, 2024
ce88b8b
feat: Update network configuration parameters in composition.yaml
irizzant May 28, 2024
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
9 changes: 6 additions & 3 deletions apis/composition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,17 @@ spec:
- type: FromCompositeFieldPath
fromFieldPath: spec.parameters.providerConfigName
toFieldPath: spec.parameters.providerConfigName
- type: FromCompositeFieldPath
fromFieldPath: spec.parameters.networkSelector
toFieldPath: spec.compositionSelector.matchLabels[type]
- type: ToCompositeFieldPath
fromFieldPath: status.subnetIds
policy:
fromFieldPath: Required
toFieldPath: status.subnetIds
- type: FromCompositeFieldPath
fromFieldPath: spec.parameters.networkConfig.cidrBlock
toFieldPath: spec.parameters.vpcCidrBlock
- type: FromCompositeFieldPath
fromFieldPath: spec.parameters.networkConfig.subnets
toFieldPath: spec.parameters.subnets

- name: XEKS
condition: observed.composite.resource.spec.parameters.cloud == "aws"
Expand Down
40 changes: 40 additions & 0 deletions apis/definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,46 @@ spec:
enum:
- basic
default: basic
networkConfig:
type: object
description: Network configuration parameters. Only used when provider is AWS.
properties:
cidrBlock:
type: string
description: CIDR block for the Network
default: 192.168.0.0/16
subnets:
type: array
items:
type: object
properties:
availabilityZone:
type: string
type:
type: string
enum:
- public
- private
cidrBlock:
type: string
description: Subnets to create in the VPC
required:
- availabilityZone
- type
- cidrBlock
default:
- availabilityZone: us-west-2a
type: public
cidrBlock: 192.168.0.0/18
- availabilityZone: us-west-2b
type: public
cidrBlock: 192.168.64.0/18
- availabilityZone: us-west-2a
type: private
cidrBlock: 192.168.128.0/18
- availabilityZone: us-west-2b
type: private
cidrBlock: 192.168.192.0/18
deletionPolicy:
description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete
enum:
Expand Down
2 changes: 1 addition & 1 deletion crossplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
dependsOn:
- configuration: xpkg.upbound.io/upbound/configuration-aws-network
# renovate: datasource=github-releases depName=upbound/configuration-aws-network
version: "v0.11.0"
version: "v0.15.0"
- configuration: xpkg.upbound.io/upbound/configuration-aws-eks
# renovate: datasource=github-releases depName=upbound/configuration-aws-eks
version: "v0.9.0"
Expand Down