From 77442ae743379e84d3bb8ae871d144c6f983d310 Mon Sep 17 00:00:00 2001 From: artych <1912947+artych@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:12:41 +0000 Subject: [PATCH 1/2] Bump Upbound AWS Provider to 1.14 --- libs/crossplane/Makefile | 4 ++-- libs/crossplane/config.jsonnet | 4 ++-- libs/crossplane/upbound_aws_crds.libsonnet | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/libs/crossplane/Makefile b/libs/crossplane/Makefile index 97eab3c..bf326a6 100644 --- a/libs/crossplane/Makefile +++ b/libs/crossplane/Makefile @@ -1,6 +1,6 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) TMP:=$(shell mktemp -d) -AWS_VERSION?=v1.7.0 +AWS_VERSION?=v1.14.0 .PHONY: upbound_aws_crds.libsonnet upbound_aws_crds.libsonnet: @@ -9,7 +9,7 @@ upbound_aws_crds.libsonnet: jb install github.com/crossplane-contrib/provider-upjet-aws/package/crds@$(AWS_VERSION) && \ echo '[' > $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ cd vendor/github.com/crossplane-contrib/provider-upjet-aws/package/crds && \ - find . -type f -printf "%f\n" | sort | xargs -I {} echo "'{}'," >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ + gfind . -type f -printf "%f\n" | sort | xargs -I {} echo "'{}'," >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ echo ']' >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ jsonnetfmt -i $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ rm -rf $(TMP) || \ diff --git a/libs/crossplane/config.jsonnet b/libs/crossplane/config.jsonnet index eea4ac7..48e1004 100644 --- a/libs/crossplane/config.jsonnet +++ b/libs/crossplane/config.jsonnet @@ -101,9 +101,9 @@ config.new( // WARNING: When bumping the version, ensure that you also update the // version in the Makefile and run `make upbound_aws_crds.libsonnet` to update the CRDs list. { - output: 'upbound-provider-aws/1.7', + output: 'upbound-provider-aws/1.14', prefix: '^io\\.upbound\\.aws\\..*', - crds: ['https://raw.githubusercontent.com/crossplane-contrib/provider-upjet-aws/v1.7.0/package/crds/%s' % crd for crd in upbound_aws_crds], + crds: ['https://raw.githubusercontent.com/crossplane-contrib/provider-upjet-aws/v1.14.0/package/crds/%s' % crd for crd in upbound_aws_crds], localName: 'upbound_aws', }, { diff --git a/libs/crossplane/upbound_aws_crds.libsonnet b/libs/crossplane/upbound_aws_crds.libsonnet index d96e373..8bdf7b8 100644 --- a/libs/crossplane/upbound_aws_crds.libsonnet +++ b/libs/crossplane/upbound_aws_crds.libsonnet @@ -2,6 +2,7 @@ 'accessanalyzer.aws.upbound.io_analyzers.yaml', 'accessanalyzer.aws.upbound.io_archiverules.yaml', 'account.aws.upbound.io_alternatecontacts.yaml', + 'account.aws.upbound.io_regions.yaml', 'acm.aws.upbound.io_certificates.yaml', 'acm.aws.upbound.io_certificatevalidations.yaml', 'acmpca.aws.upbound.io_certificateauthorities.yaml', @@ -172,6 +173,10 @@ 'cloudwatchlogs.aws.upbound.io_resourcepolicies.yaml', 'cloudwatchlogs.aws.upbound.io_streams.yaml', 'cloudwatchlogs.aws.upbound.io_subscriptionfilters.yaml', + 'codeartifact.aws.upbound.io_domainpermissionspolicies.yaml', + 'codeartifact.aws.upbound.io_domains.yaml', + 'codeartifact.aws.upbound.io_repositories.yaml', + 'codeartifact.aws.upbound.io_repositorypermissionspolicies.yaml', 'codecommit.aws.upbound.io_approvalruletemplateassociations.yaml', 'codecommit.aws.upbound.io_approvalruletemplates.yaml', 'codecommit.aws.upbound.io_repositories.yaml', @@ -276,6 +281,7 @@ 'dynamodb.aws.upbound.io_contributorinsights.yaml', 'dynamodb.aws.upbound.io_globaltables.yaml', 'dynamodb.aws.upbound.io_kinesisstreamingdestinations.yaml', + 'dynamodb.aws.upbound.io_resourcepolicies.yaml', 'dynamodb.aws.upbound.io_tableitems.yaml', 'dynamodb.aws.upbound.io_tablereplicas.yaml', 'dynamodb.aws.upbound.io_tables.yaml', @@ -302,6 +308,7 @@ 'ec2.aws.upbound.io_egressonlyinternetgateways.yaml', 'ec2.aws.upbound.io_eipassociations.yaml', 'ec2.aws.upbound.io_eips.yaml', + 'ec2.aws.upbound.io_fleets.yaml', 'ec2.aws.upbound.io_flowlogs.yaml', 'ec2.aws.upbound.io_hosts.yaml', 'ec2.aws.upbound.io_instances.yaml', @@ -401,6 +408,8 @@ 'efs.aws.upbound.io_filesystems.yaml', 'efs.aws.upbound.io_mounttargets.yaml', 'efs.aws.upbound.io_replicationconfigurations.yaml', + 'eks.aws.upbound.io_accessentries.yaml', + 'eks.aws.upbound.io_accesspolicyassociations.yaml', 'eks.aws.upbound.io_addons.yaml', 'eks.aws.upbound.io_clusterauths.yaml', 'eks.aws.upbound.io_clusters.yaml', @@ -409,8 +418,10 @@ 'eks.aws.upbound.io_nodegroups.yaml', 'eks.aws.upbound.io_podidentityassociations.yaml', 'elasticache.aws.upbound.io_clusters.yaml', + 'elasticache.aws.upbound.io_globalreplicationgroups.yaml', 'elasticache.aws.upbound.io_parametergroups.yaml', 'elasticache.aws.upbound.io_replicationgroups.yaml', + 'elasticache.aws.upbound.io_serverlesscaches.yaml', 'elasticache.aws.upbound.io_subnetgroups.yaml', 'elasticache.aws.upbound.io_usergroups.yaml', 'elasticache.aws.upbound.io_users.yaml', @@ -437,6 +448,7 @@ 'elbv2.aws.upbound.io_lbs.yaml', 'elbv2.aws.upbound.io_lbtargetgroupattachments.yaml', 'elbv2.aws.upbound.io_lbtargetgroups.yaml', + 'elbv2.aws.upbound.io_lbtruststores.yaml', 'emr.aws.upbound.io_securityconfigurations.yaml', 'emrserverless.aws.upbound.io_applications.yaml', 'evidently.aws.upbound.io_features.yaml', @@ -626,6 +638,7 @@ 'mq.aws.upbound.io_brokers.yaml', 'mq.aws.upbound.io_configurations.yaml', 'mq.aws.upbound.io_users.yaml', + 'mwaa.aws.upbound.io_environments.yaml', 'neptune.aws.upbound.io_clusterendpoints.yaml', 'neptune.aws.upbound.io_clusterinstances.yaml', 'neptune.aws.upbound.io_clusterparametergroups.yaml', @@ -686,6 +699,7 @@ 'organizations.aws.upbound.io_policyattachments.yaml', 'pinpoint.aws.upbound.io_apps.yaml', 'pinpoint.aws.upbound.io_smschannels.yaml', + 'pipes.aws.upbound.io_pipes.yaml', 'qldb.aws.upbound.io_ledgers.yaml', 'qldb.aws.upbound.io_streams.yaml', 'quicksight.aws.upbound.io_groups.yaml', @@ -780,6 +794,7 @@ 's3.aws.upbound.io_bucketserversideencryptionconfigurations.yaml', 's3.aws.upbound.io_bucketversionings.yaml', 's3.aws.upbound.io_bucketwebsiteconfigurations.yaml', + 's3.aws.upbound.io_directorybuckets.yaml', 's3.aws.upbound.io_objectcopies.yaml', 's3.aws.upbound.io_objects.yaml', 's3control.aws.upbound.io_accesspointpolicies.yaml', From 690c3f346a5a0f0682dc23c44af23e9eb88e2921 Mon Sep 17 00:00:00 2001 From: artych <1912947+artych@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:14:23 +0000 Subject: [PATCH 2/2] fix --- libs/crossplane/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/crossplane/Makefile b/libs/crossplane/Makefile index bf326a6..7f51260 100644 --- a/libs/crossplane/Makefile +++ b/libs/crossplane/Makefile @@ -9,7 +9,7 @@ upbound_aws_crds.libsonnet: jb install github.com/crossplane-contrib/provider-upjet-aws/package/crds@$(AWS_VERSION) && \ echo '[' > $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ cd vendor/github.com/crossplane-contrib/provider-upjet-aws/package/crds && \ - gfind . -type f -printf "%f\n" | sort | xargs -I {} echo "'{}'," >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ + find . -type f -printf "%f\n" | sort | xargs -I {} echo "'{}'," >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ echo ']' >> $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ jsonnetfmt -i $(ROOT_DIR)/upbound_aws_crds.libsonnet && \ rm -rf $(TMP) || \