Skip to content

Commit

Permalink
Merge pull request #354 from cloudify-cosmo/RD-2388-EKS-Discovery-Auth
Browse files Browse the repository at this point in the history
bump version __NODOCS__
  • Loading branch information
EarthmanT authored Jun 3, 2021
2 parents a293f50 + ca36e3d commit 5a86655
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
- Fix issue in Node Group start up.
2.9.2:
- Add back AWS Account that was overwritten.
2 changes: 2 additions & 0 deletions cloudify_aws/eks/resources/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
30 changes: 28 additions & 2 deletions plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 5a86655

Please sign in to comment.