Skip to content

add: add eks add-ons data #169

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

Merged
merged 1 commit into from
Nov 18, 2025
Merged

add: add eks add-ons data #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
270 changes: 180 additions & 90 deletions src/spaceone/inventory/connector/aws_eks_connector/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,21 @@
from typing import List

from spaceone.core.utils import *
from spaceone.inventory.connector.aws_eks_connector.schema.data import Cluster, NodeGroup, Update
from spaceone.inventory.connector.aws_eks_connector.schema.resource import ClusterResource, ClusterResponse, \
NodeGroupResource, NodeGroupResponse
from spaceone.inventory.connector.aws_eks_connector.schema.service_type import CLOUD_SERVICE_TYPES
from spaceone.inventory.connector.aws_eks_connector.schema.data import (
Cluster,
NodeGroup,
Update,
AddOn,
)
from spaceone.inventory.connector.aws_eks_connector.schema.resource import (
ClusterResource,
ClusterResponse,
NodeGroupResource,
NodeGroupResponse,
)
from spaceone.inventory.connector.aws_eks_connector.schema.service_type import (
CLOUD_SERVICE_TYPES,
)
from spaceone.inventory.libs.connector import SchematicAWSConnector
from spaceone.inventory.libs.schema.resource import ReferenceModel, CloudWatchModel
from spaceone.inventory.conf.cloud_service_conf import *
Expand All @@ -15,9 +26,9 @@


class EKSConnector(SchematicAWSConnector):
service_name = 'eks'
cloud_service_group = 'EKS'
cloud_service_type = 'Cluster'
service_name = "eks"
cloud_service_group = "EKS"
cloud_service_type = "Cluster"
cloud_service_types = CLOUD_SERVICE_TYPES

def get_resources(self):
Expand All @@ -29,153 +40,203 @@ def get_resources(self):
resources.extend(self.set_cloud_service_types())

collect_resource = {
'request_method': self.request_data,
'resource': ClusterResource,
'response_schema': ClusterResponse
"request_method": self.request_data,
"resource": ClusterResource,
"response_schema": ClusterResponse,
}

for region_name in self.region_names:
try:
self.reset_region(region_name)
resources.extend(self.collect_data_by_region(self.service_name, region_name, collect_resource))
resources.extend(
self.collect_data_by_region(
self.service_name, region_name, collect_resource
)
)

# For Node Group
for node_group_vo in self.node_groups:
resources.append(NodeGroupResponse(
{'resource': NodeGroupResource({
'name': node_group_vo.nodegroup_name,
'launched_at': self.datetime_to_iso8601(node_group_vo.created_at),
'data': node_group_vo,
'tags': node_group_vo.tags,
'region_code': region_name,
'reference': ReferenceModel(node_group_vo.reference(region_name))})}
))
resources.append(
NodeGroupResponse(
{
"resource": NodeGroupResource(
{
"name": node_group_vo.nodegroup_name,
"launched_at": self.datetime_to_iso8601(
node_group_vo.created_at
),
"data": node_group_vo,
"tags": node_group_vo.tags,
"region_code": region_name,
"reference": ReferenceModel(
node_group_vo.reference(region_name)
),
}
)
}
)
)

self.node_groups = []
except Exception as e:
error_resource_response = self.generate_error(region_name, '', e)
error_resource_response = self.generate_error(region_name, "", e)
resources.append(error_resource_response)

_LOGGER.debug(f'[get_resources][account_id: {self.account_id}] FINISHED: EKS ({time.time() - start_time} sec)')
_LOGGER.debug(
f"[get_resources][account_id: {self.account_id}] FINISHED: EKS ({time.time() - start_time} sec)"
)
return resources

def request_data(self, region_name) -> List[Cluster]:
self.cloud_service_type = 'Cluster'
cloudtrail_resource_type = 'AWS::EKS::Cluster'
self.cloud_service_type = "Cluster"
cloudtrail_resource_type = "AWS::EKS::Cluster"

paginator = self.client.get_paginator('list_clusters')
paginator = self.client.get_paginator("list_clusters")
response_iterator = paginator.paginate(
PaginationConfig={
'MaxItems': 10000,
'PageSize': 50,
"MaxItems": 10000,
"PageSize": 50,
}
)

errors = []

for data in response_iterator:
for _cluster_name in data.get('clusters', []):
for _cluster_name in data.get("clusters", []):
try:
raw = self.client.describe_cluster(name=_cluster_name)

if cluster := raw.get('cluster'):
cluster.update({
'updates': list(self.list_updates(_cluster_name)),
'cloudwatch': self.eks_cluster_cloudwatch(cluster, region_name),
'cloudtrail': self.set_cloudtrail(region_name, cloudtrail_resource_type, cluster['name'])
})

node_groups, node_group_errors = self.list_node_groups(_cluster_name, cluster.get('arn'),
region_name)

cluster.update({
'node_groups': node_groups
})
if cluster := raw.get("cluster"):
cluster.update(
{
"updates": list(self.list_updates(_cluster_name)),
"add_ons": list(self.list_add_ons(_cluster_name)),
"cloudwatch": self.eks_cluster_cloudwatch(
cluster, region_name
),
"cloudtrail": self.set_cloudtrail(
region_name,
cloudtrail_resource_type,
cluster["name"],
),
}
)

node_groups, node_group_errors = self.list_node_groups(
_cluster_name, cluster.get("arn"), region_name
)

cluster.update({"node_groups": node_groups})

self.node_groups.extend(node_groups)
errors.extend(node_group_errors)

cluster_vo = Cluster(cluster, strict=False)

yield {
'data': cluster_vo,
'name': cluster_vo.name,
'launched_at': self.datetime_to_iso8601(cluster_vo.created_at),
'account': self.account_id,
'tags': cluster.get('tags',)
"data": cluster_vo,
"name": cluster_vo.name,
"launched_at": self.datetime_to_iso8601(
cluster_vo.created_at
),
"account": self.account_id,
"tags": cluster.get(
"tags",
),
}

except Exception as e:
resource_id = _cluster_name
errors.append(self.generate_error(region_name, resource_id, e))

for error in errors:
yield {'data': error}
yield {"data": error}

def list_node_groups(self, cluster_name, cluster_arn, region_name):
self.cloud_service_type = 'NodeGroup'
cloudtrail_resource_type = 'AWS::EKS::Nodegroup'
self.cloud_service_type = "NodeGroup"
cloudtrail_resource_type = "AWS::EKS::Nodegroup"

asgs = self.get_auto_scaling_groups()
paginator = self.client.get_paginator('list_nodegroups')
paginator = self.client.get_paginator("list_nodegroups")
response_iterator = paginator.paginate(
clusterName=cluster_name,
PaginationConfig={
'MaxItems': 10000,
'PageSize': 50,
}
"MaxItems": 10000,
"PageSize": 50,
},
)

node_groups = []
errors = []

for data in response_iterator:
for node_group in data.get('nodegroups', []):
for node_group in data.get("nodegroups", []):
try:
node_group_response = self.client.describe_nodegroup(clusterName=cluster_name, nodegroupName=node_group)
node_group = node_group_response.get('nodegroup', {})
node_group.update({
'cluster_arn': cluster_arn,
'cloudtrail': self.set_cloudtrail(region_name, cloudtrail_resource_type,
node_group['nodegroupName'])
})
asg_names = [asg.get("name", "") for asg in
node_group.get("resources", "").get("autoScalingGroups", [])]
node_group_response = self.client.describe_nodegroup(
clusterName=cluster_name, nodegroupName=node_group
)
node_group = node_group_response.get("nodegroup", {})
node_group.update(
{
"cluster_arn": cluster_arn,
"cloudtrail": self.set_cloudtrail(
region_name,
cloudtrail_resource_type,
node_group["nodegroupName"],
),
}
)
asg_names = [
asg.get("name", "")
for asg in node_group.get("resources", "").get(
"autoScalingGroups", []
)
]
if len(asg_names) > 0:
node_group["resources"]["autoScalingGroups"] = self.get_matched_auto_scaling_groups(asgs, asg_names)
node_group["resources"]["autoScalingGroups"] = (
self.get_matched_auto_scaling_groups(asgs, asg_names)
)
node_groups.append(NodeGroup(node_group, strict=False))

except Exception as e:
resource_id = node_group.get('nodegroupArn', '')
resource_id = node_group.get("nodegroupArn", "")
errors.append(self.generate_error(region_name, resource_id, e))

return node_groups, errors

def list_updates(self, cluster_name):
paginator = self.client.get_paginator('list_updates')
paginator = self.client.get_paginator("list_updates")
response_iterator = paginator.paginate(
name=cluster_name,
PaginationConfig={
'MaxItems': 10000,
'PageSize': 50,
}
"MaxItems": 10000,
"PageSize": 50,
},
)

for data in response_iterator:
for update_id in data.get('updateIds', []):
response = self.client.describe_update(name=cluster_name, updateId=update_id)
yield Update(response.get('update', {}), strict=False)
for update_id in data.get("updateIds", []):
response = self.client.describe_update(
name=cluster_name, updateId=update_id
)
yield Update(response.get("update", {}), strict=False)

def eks_cluster_cloudwatch(self, cluster, region_name):
cloudwatch_kubernetes = self.set_cloudwatch('Kubernetes', 'CLUSTER_ID', cluster['name'], region_name)
cloudwatch_container_insights = self.set_cloudwatch('ContainerInsights', 'ClusterName',
cluster['name'], region_name)
cloudwatch_kubernetes = self.set_cloudwatch(
"Kubernetes", "CLUSTER_ID", cluster["name"], region_name
)
cloudwatch_container_insights = self.set_cloudwatch(
"ContainerInsights", "ClusterName", cluster["name"], region_name
)

cloudwatch_vo = CloudWatchModel({
'region_name': region_name,
'metrics_info': cloudwatch_kubernetes.metrics_info +
cloudwatch_container_insights.metrics_info
}, strict=False)
cloudwatch_vo = CloudWatchModel(
{
"region_name": region_name,
"metrics_info": cloudwatch_kubernetes.metrics_info
+ cloudwatch_container_insights.metrics_info,
},
strict=False,
)

return cloudwatch_vo

Expand All @@ -184,27 +245,31 @@ def _convert_tag_format(tags):
list_tags = []

for _key in tags:
list_tags.append({'key': _key, 'value': tags[_key]})
list_tags.append({"key": _key, "value": tags[_key]})

return list_tags

def get_auto_scaling_groups(self):
auto_scaling_client = self.session.client('autoscaling', verify=BOTO3_HTTPS_VERIFIED)
paginator = auto_scaling_client.get_paginator('describe_auto_scaling_groups')
auto_scaling_client = self.session.client(
"autoscaling", verify=BOTO3_HTTPS_VERIFIED
)
paginator = auto_scaling_client.get_paginator("describe_auto_scaling_groups")
response_iterator = paginator.paginate(
PaginationConfig={
'MaxItems': 10000,
'PageSize': 50,
"MaxItems": 10000,
"PageSize": 50,
}
)

asgs = []
for data in response_iterator:
for asg in data.get('AutoScalingGroups', []):
asgs.append({
"name": asg.get("AutoScalingGroupName", ""),
"arn": asg.get("AutoScalingGroupARN", "")
})
for asg in data.get("AutoScalingGroups", []):
asgs.append(
{
"name": asg.get("AutoScalingGroupName", ""),
"arn": asg.get("AutoScalingGroupARN", ""),
}
)
return asgs

@staticmethod
Expand All @@ -214,3 +279,28 @@ def get_matched_auto_scaling_groups(asgs, asg_names):
if asg.get("name", "") in asg_names:
matched_asgs.append(asg)
return matched_asgs

def list_add_ons(self, cluster_name):
paginator = self.client.get_paginator("list_addons")
response_iterator = paginator.paginate(
clusterName=cluster_name,
PaginationConfig={
"MaxItems": 10000,
"PageSize": 50,
},
)

errors = []

for data in response_iterator:
for addon_name in data.get("addons", []):
try:
add_on_response = self.client.describe_addon(
clusterName=cluster_name,
addonName=addon_name,
)

yield AddOn(add_on_response.get("addon", {}), strict=False)

except Exception as e:
errors.append(self.generate_error(cluster_name, addon_name, e))
Loading
Loading