Enable adopted resource and add an integration test

Author: mbaijal

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,14 +1,14 @@
 ack_generate_info:
-  build_date: "2021-08-25T09:34:48Z"
+  build_date: "2021-08-26T08:51:22Z"
   build_hash: be9e3abf09e334d8585d14404a99d8adae0daec7
   go_version: go1.14.14 darwin/amd64
   version: v0.12.0
 api_directory_checksum: 8697d12182de3cc93f7263c2a5d45e480b77bf05
 api_version: v1alpha1
 aws_sdk_go_version: v1.37.10
 generator_config_info:
-  file_checksum: c7e5f39c1278b0b0061103439a4075073bf19403
+  file_checksum: 1a255ab098ba83f9aa791d130d2d8e4169d0b399
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
-  timestamp: 2021-08-25 09:34:57.503447 +0000 UTC
+  timestamp: 2021-08-26 08:51:32.146215 +0000 UTC

apis/v1alpha1/generator.yaml

@@ -14,7 +14,6 @@ operations:
     primary_identifier_field_name: ResourceID
 resources:
   ScalableTarget:
-    is_adoptable: false
     hooks:
         sdk_read_many_post_build_request:
           code: rm.customDescribeScalableTarget(ctx, r, input)
@@ -24,7 +23,6 @@ resources:
       ResourceID:
         is_name: true
   ScalingPolicy:
-    is_adoptable: false
     fields:
       ResourceID:
         is_name: true

generator.yaml

@@ -14,7 +14,6 @@ operations:
     primary_identifier_field_name: ResourceID
 resources:
   ScalableTarget:
-    is_adoptable: false
     hooks:
         sdk_read_many_post_build_request:
           code: rm.customDescribeScalableTarget(ctx, r, input)
@@ -24,7 +23,6 @@ resources:
       ResourceID:
         is_name: true
   ScalingPolicy:
-    is_adoptable: false
     fields:
       ResourceID:
         is_name: true

helm/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/applicationautoscaling-controller
-  tag: v0.0.1-master
+  tag: v0.0.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -41,8 +41,8 @@ aws:
 
 # log level for the controller
 log:
-  enable_development_logging: true
-  level: debug
+  enable_development_logging: false
+  level: info
 
 # Set to "namespace" to install the controller in a namespaced scope, will only
 # watch for object creation in the namespace. By default installScope is

pkg/resource/scalable_target/manager_factory.go

@@ -20,6 +20,7 @@
 
 SERVICE_NAME = "applicationautoscaling"
 CRD_GROUP = "applicationautoscaling.services.k8s.aws"
+ADOPTED_RESOURCE_CRD_GROUP = "services.k8s.aws"
 CRD_VERSION = "v1alpha1"
 
 # PyTest marker for the current service
@@ -61,3 +62,21 @@ def create_applicationautoscaling_resource(
     )
 
     return reference, spec, resource
+
+def create_adopted_resource(resource_name, spec_file, replacements, namespace="default"):
+    """
+    Wrapper around k8s.load_and_create_resource to create a Adopoted resource
+    """
+
+    reference, spec, resource = k8s.load_and_create_resource(
+        resource_directory,
+        ADOPTED_RESOURCE_CRD_GROUP,
+        CRD_VERSION,
+        "adoptedresources",
+        resource_name,
+        spec_file,
+        replacements,
+        namespace,
+    )
+
+    return reference, spec, resource

pkg/resource/scaling_policy/manager_factory.go

@@ -0,0 +1,72 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may
+# not use this file except in compliance with the License. A copy of the
+# License is located at
+#
+# 	 http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+
+import boto3
+
+def application_autoscaling_client():
+    return boto3.client("application-autoscaling")
+
+def sagemaker_endpoint_register_scalable_target(resource_id):
+    target_input = {
+        "ServiceNamespace": "sagemaker",
+        "ResourceId": resource_id,
+        "ScalableDimension": "sagemaker:variant:DesiredInstanceCount", 
+        "MinCapacity": 1,
+        "MaxCapacity": 2,
+    }
+
+    target_response = application_autoscaling_client().register_scalable_target(**target_input)
+    return target_response
+
+def sagemaker_endpoint_put_scaling_policy(resource_id, policy_name):
+    policy_input = {
+        "PolicyName": policy_name,
+        "ServiceNamespace": "sagemaker",
+        "ResourceId": resource_id,
+        "ScalableDimension": "sagemaker:variant:DesiredInstanceCount", 
+        "PolicyType": "TargetTrackingScaling",
+        "TargetTrackingScalingPolicyConfiguration": {
+            "TargetValue": 70.0,
+            "ScaleInCooldown": 700,
+            "ScaleOutCooldown": 300,
+            "PredefinedMetricSpecification": {
+                "PredefinedMetricType": "SageMakerVariantInvocationsPerInstance",
+            },
+        }
+    }
+
+    policy_response = application_autoscaling_client().put_scaling_policy(**policy_input)
+    return policy_response
+
+def sagemaker_endpoint_deregister_scalable_target(resource_id):
+    target_input = {
+        "ServiceNamespace": "sagemaker",
+        "ResourceId": resource_id,
+        "ScalableDimension": "sagemaker:variant:DesiredInstanceCount", 
+    }
+
+    target_response = application_autoscaling_client().deregister_scalable_target(**target_input)
+    return target_response
+
+def sagemaker_endpoint_delete_scaling_policy(resource_id, policy_name):
+    policy_input = {
+        "ServiceNamespace": "sagemaker",
+        "ResourceId": resource_id,
+        "ScalableDimension": "sagemaker:variant:DesiredInstanceCount", 
+        "PolicyName": policy_name
+    }
+
+    policy_response = application_autoscaling_client().delete_scaling_policy(**policy_input)
+    return policy_response
+

test/e2e/__init__.py

@@ -0,0 +1,14 @@
+apiVersion: services.k8s.aws/v1alpha1
+kind: AdoptedResource
+metadata:
+  name: $ADOPTED_POLICY_NAME
+spec:
+  aws:
+    nameOrID: $RESOURCE_ID
+    additionalKeys:
+      serviceNamespace: sagemaker
+  kubernetes:
+    group: applicationautoscaling.services.k8s.aws
+    kind: ScalingPolicy
+    metadata:
+      name: $ADOPTED_POLICY_NAME

test/e2e/common/application_autoscaling_utils.py

@@ -0,0 +1,14 @@
+apiVersion: services.k8s.aws/v1alpha1
+kind: AdoptedResource
+metadata:
+  name: $ADOPTED_TARGET_NAME
+spec:
+  aws:
+    nameOrID: $RESOURCE_ID
+    additionalKeys:
+      serviceNamespace: sagemaker
+  kubernetes:
+    group: applicationautoscaling.services.k8s.aws
+    kind: ScalableTarget
+    metadata:
+      name: $ADOPTED_TARGET_NAME