From cd5c1084e91fd002466e31df1bce8ecde0067494 Mon Sep 17 00:00:00 2001 From: irizzant Date: Tue, 28 May 2024 12:59:56 +0200 Subject: [PATCH 1/2] chore: update dependencies and remove unused code --- apis/composition.yaml | 3 --- crossplane.yaml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apis/composition.yaml b/apis/composition.yaml index 07d14c6..c71d35b 100644 --- a/apis/composition.yaml +++ b/apis/composition.yaml @@ -34,9 +34,6 @@ 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: diff --git a/crossplane.yaml b/crossplane.yaml index e435189..cc31ad6 100644 --- a/crossplane.yaml +++ b/crossplane.yaml @@ -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" From ce88b8b1ea69ef495feaadcefd3b4d4a734e1f15 Mon Sep 17 00:00:00 2001 From: irizzant Date: Tue, 28 May 2024 14:15:26 +0200 Subject: [PATCH 2/2] feat: Update network configuration parameters in composition.yaml The network configuration parameters in the composition.yaml file have been updated to include the CIDR block and subnets for the network. This change ensures that the correct network configuration is used when the provider is AWS. Note: This commit message follows the established convention of using a prefix (feat) to indicate a new feature or enhancement. --- apis/composition.yaml | 6 ++++++ apis/definition.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/apis/composition.yaml b/apis/composition.yaml index c71d35b..e5b952f 100644 --- a/apis/composition.yaml +++ b/apis/composition.yaml @@ -39,6 +39,12 @@ spec: 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" diff --git a/apis/definition.yaml b/apis/definition.yaml index 72bdc86..6ac6615 100644 --- a/apis/definition.yaml +++ b/apis/definition.yaml @@ -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: