From 4a0a6c2610b8df3a32b80b0feb9cf09851da9ec1 Mon Sep 17 00:00:00 2001 From: Jesse Bye <8467862+jessebye@users.noreply.github.com> Date: Tue, 25 Jul 2023 14:17:00 -0700 Subject: [PATCH 1/4] release v0.0.1 --- config/controller/kustomization.yaml | 2 +- helm/Chart.yaml | 4 ++-- helm/templates/NOTES.txt | 2 +- helm/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 84b9fed..184e2fe 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/cloudwatch-controller - newTag: 0.0.0-non-release-version + newTag: 0.0.1 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 9ec42f8..df32f2a 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: cloudwatch-chart description: A Helm chart for the ACK service controller for Amazon CloudWatch (CloudWatch) -version: 0.0.0-non-release-version -appVersion: 0.0.0-non-release-version +version: 0.0.1 +appVersion: 0.0.1 home: https://github.com/aws-controllers-k8s/cloudwatch-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index fe92dba..7806081 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/cloudwatch-controller:0.0.0-non-release-version". +This chart deploys "public.ecr.aws/aws-controllers-k8s/cloudwatch-controller:0.0.1". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index 14091d3..b62b55a 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/cloudwatch-controller - tag: 0.0.0-non-release-version + tag: 0.0.1 pullPolicy: IfNotPresent pullSecrets: [] From ecad8e8f3d4d9f5f7cc4f82034d96206227a36e5 Mon Sep 17 00:00:00 2001 From: Jesse Bye <8467862+jessebye@users.noreply.github.com> Date: Fri, 4 Aug 2023 09:53:13 -0700 Subject: [PATCH 2/4] fix: Correctly set input to DescribeAlarms --- apis/v1alpha1/ack-generate-metadata.yaml | 6 +++--- apis/v1alpha1/generator.yaml | 2 ++ generator.yaml | 2 ++ pkg/resource/metric_alarm/sdk.go | 2 ++ .../metricalarm/sdk_read_many_post_build_request.go.tpl | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 templates/hooks/metricalarm/sdk_read_many_post_build_request.go.tpl diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 44593d0..a5653e5 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2023-07-24T21:35:44Z" + build_date: "2023-08-04T16:51:02Z" build_hash: e9b68590da73ce9143ba1e4361cebdc1d876c81e - go_version: go1.20.6 + go_version: go1.20.7 version: v0.26.1-7-ge9b6859-dirty api_directory_checksum: e21bfad36ac581912d611c9c390ab4bd2c2fb46d api_version: v1alpha1 aws_sdk_go_version: v1.44.303 generator_config_info: - file_checksum: bfca77347e9ccada9ee0c53136c169cdca88443b + file_checksum: 2440ba630b0f66b3e92fd740afcafbd79da6b0c4 original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index 796a3b9..a6ac8c2 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -33,5 +33,7 @@ resources: input_fields: AlarmName: Name hooks: + sdk_read_many_post_build_request: + template_path: hooks/metricalarm/sdk_read_many_post_build_request.go.tpl sdk_delete_post_build_request: template_path: hooks/metricalarm/sdk_delete_post_build_request.go.tpl diff --git a/generator.yaml b/generator.yaml index 796a3b9..a6ac8c2 100644 --- a/generator.yaml +++ b/generator.yaml @@ -33,5 +33,7 @@ resources: input_fields: AlarmName: Name hooks: + sdk_read_many_post_build_request: + template_path: hooks/metricalarm/sdk_read_many_post_build_request.go.tpl sdk_delete_post_build_request: template_path: hooks/metricalarm/sdk_delete_post_build_request.go.tpl diff --git a/pkg/resource/metric_alarm/sdk.go b/pkg/resource/metric_alarm/sdk.go index 9a1715e..7cbe69a 100644 --- a/pkg/resource/metric_alarm/sdk.go +++ b/pkg/resource/metric_alarm/sdk.go @@ -72,6 +72,8 @@ func (rm *resourceManager) sdkFind( if err != nil { return nil, err } + input.SetAlarmNames([]*string{r.ko.Spec.Name}) + var resp *svcsdk.DescribeAlarmsOutput resp, err = rm.sdkapi.DescribeAlarmsWithContext(ctx, input) rm.metrics.RecordAPICall("READ_MANY", "DescribeAlarms", err) diff --git a/templates/hooks/metricalarm/sdk_read_many_post_build_request.go.tpl b/templates/hooks/metricalarm/sdk_read_many_post_build_request.go.tpl new file mode 100644 index 0000000..3315a2c --- /dev/null +++ b/templates/hooks/metricalarm/sdk_read_many_post_build_request.go.tpl @@ -0,0 +1 @@ + input.SetAlarmNames([]*string{r.ko.Spec.Name}) From ea8ac4ae01b63c17053a6617e64ccc99c1aeb9af Mon Sep 17 00:00:00 2001 From: Jesse Bye <8467862+jessebye@users.noreply.github.com> Date: Fri, 4 Aug 2023 09:56:06 -0700 Subject: [PATCH 3/4] update test to detect problem --- test/e2e/tests/test_metric_alarm.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/e2e/tests/test_metric_alarm.py b/test/e2e/tests/test_metric_alarm.py index b5181d6..2bacad1 100644 --- a/test/e2e/tests/test_metric_alarm.py +++ b/test/e2e/tests/test_metric_alarm.py @@ -69,12 +69,18 @@ def _metric_alarm(): @pytest.mark.canary class TestMetricAlarm: def test_crud(self, _metric_alarm): - (ref, cr) = _metric_alarm - metric_alarm_name = ref.name + (ref1, cr1) = _metric_alarm + metric_alarm_name1 = ref1.name + + (ref2, cr2) = _metric_alarm + metric_alarm_name2 = ref2.name time.sleep(CHECK_STATUS_WAIT_SECONDS) - condition.assert_synced(ref) + condition.assert_synced(ref1) + condition.assert_synced(ref2) - assert metric_alarm.exists(metric_alarm_name) - assert k8s.get_resource_exists(ref) + assert metric_alarm.exists(metric_alarm_name1) + assert metric_alarm.exists(metric_alarm_name2) + assert k8s.get_resource_exists(ref1) + assert k8s.get_resource_exists(ref2) From 35a2011aefa7ad7cb95d050a68d3ccb16424925d Mon Sep 17 00:00:00 2001 From: Jesse Bye <8467862+jessebye@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:10:06 -0700 Subject: [PATCH 4/4] revert test changes --- test/e2e/tests/test_metric_alarm.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/test/e2e/tests/test_metric_alarm.py b/test/e2e/tests/test_metric_alarm.py index 2bacad1..b5181d6 100644 --- a/test/e2e/tests/test_metric_alarm.py +++ b/test/e2e/tests/test_metric_alarm.py @@ -69,18 +69,12 @@ def _metric_alarm(): @pytest.mark.canary class TestMetricAlarm: def test_crud(self, _metric_alarm): - (ref1, cr1) = _metric_alarm - metric_alarm_name1 = ref1.name - - (ref2, cr2) = _metric_alarm - metric_alarm_name2 = ref2.name + (ref, cr) = _metric_alarm + metric_alarm_name = ref.name time.sleep(CHECK_STATUS_WAIT_SECONDS) - condition.assert_synced(ref1) - condition.assert_synced(ref2) + condition.assert_synced(ref) - assert metric_alarm.exists(metric_alarm_name1) - assert metric_alarm.exists(metric_alarm_name2) - assert k8s.get_resource_exists(ref1) - assert k8s.get_resource_exists(ref2) + assert metric_alarm.exists(metric_alarm_name) + assert k8s.get_resource_exists(ref)