diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 29d84353..49f02bc6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -135,4 +135,6 @@ - RD-2124 Refactor cloudify.nodes.aws.eks.Cluster to expose existing clusters connection information. - RD-2127 Provide external cluster blueprint. 2.9.1: - - Fix issue in Node Group start up. \ No newline at end of file + - Fix issue in Node Group start up. +2.9.2: + - Add back AWS Account that was overwritten. diff --git a/cloudify_aws/eks/resources/cluster.py b/cloudify_aws/eks/resources/cluster.py index fe7423e5..3505a251 100644 --- a/cloudify_aws/eks/resources/cluster.py +++ b/cloudify_aws/eks/resources/cluster.py @@ -307,6 +307,8 @@ def poststart(ctx, iface, resource_config, **_): ctx.logger.warn( 'Skipping assignment of labels due to ' 'incompatible Cloudify version.') + ctx.instance.runtime_properties['resource'] = utils.JsonCleanuper( + iface.properties).to_dict() @decorators.aws_resource(EKSCluster, RESOURCE_TYPE) diff --git a/plugin.yaml b/plugin.yaml index 02a7999f..a7ba7e95 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -2,9 +2,9 @@ plugins: aws: executor: central_deployment_agent - source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.9.1.zip + source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.9.2.zip package_name: cloudify-aws-plugin - package_version: '2.9.1' + package_version: '2.9.2' data_types: @@ -3552,6 +3552,32 @@ node_types: implementation: aws.cloudify_aws.codepipeline.resources.pipeline.execute inputs: *operation_inputs + cloudify.nodes.resources.AmazonWebServices: + derived_from: cloudify.nodes.Root + properties: + <<: *client_config + regions: + type: list + default: [] + resource_config: + type: dict + default: + resource_types: + - AWS::EKS::CLUSTER + interfaces: + cloudify.interfaces.lifecycle: + create: + implementation: aws.cloudify_aws.workflows.resources.initialize + inputs: + resource_config: + default: { get_property: [ SELF, resource_config ] } + regions: + default: { get_property: [ SELF, regions ] } + delete: + implementation: aws.cloudify_aws.workflows.resources.deinitialize + inputs: *operation_inputs + + relationships: cloudify.relationships.aws.connected_to: