Adding code for Layer_version resource #67

Vandita2020 · 2022-11-30T20:45:54Z

Description of changes:
Adding code for Layer_version resource. This contains hook code and e2e tests for creation and deletion.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

ack-bot · 2022-11-30T20:45:56Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Vandita2020 · 2022-11-30T20:46:30Z

/test all

Vandita2020 · 2022-11-30T21:37:24Z

/test all

Vandita2020 · 2022-11-30T21:59:07Z

/test all

Vandita2020 · 2022-11-30T22:34:58Z

/test all

Vandita2020 · 2022-11-30T23:13:20Z

/test all

Vandita2020 · 2022-12-01T18:09:16Z

/test all

Vandita2020 · 2022-12-01T18:22:55Z

/test all

Vandita2020 · 2022-12-01T22:35:51Z

/test all

Vandita2020 · 2022-12-01T23:17:51Z

/test all

Vandita2020 · 2022-12-02T17:08:55Z

/test all

Vandita2020 · 2022-12-02T17:18:29Z

/test all

a-hilaly

Good start on this @Vandita2020 ! Left few comments below

a-hilaly · 2022-12-02T17:21:12Z

test/e2e/tests/test_layer_version.py

+        # Update cr
+        cr["spec"]["description"] = "new description"
+
+        # Patch k8s resource
+        k8s.patch_custom_resource(ref, cr)
+        time.sleep(UPDATE_WAIT_AFTER_SECONDS)
+
+        # Check layer version  description
+        layer_version = lambda_validator.get_layer_version(resource_name, version_number)
+        assert layer_version is not None
+        assert layer_version["Description"] == "new description"


This is also testing resource updates? Is it planned for this PR?

Thanks for reminding, this PR is for creation and deletion only. I will make separate PR for update.

a-hilaly · 2022-12-02T17:22:27Z

config/controller/kustomization.yaml

@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
  newName: public.ecr.aws/aws-controllers-k8s/lambda-controller
-  newTag: v0.1.3
+  newTag: v0.1.2


This should stay v0.1.3, make sure to run git fetch --tags --all in lambda-controller repo before regenerating the code

a-hilaly · 2022-12-02T17:23:04Z

apis/v1alpha1/ack-generate-metadata.yaml

  go_version: go1.19
-  version: v0.19.3-15-g7cd74c3-dirty
-api_directory_checksum: f01a03847a7bb58e935fdca90ecfb910f645ea61
+  version: v0.19.3-9-g560c702


Maybe time to use code-generator v0.20.1? git fetch --tags --all and rebasing will help

a-hilaly · 2022-12-02T17:23:41Z

helm/templates/cluster-role-controller.yaml

-  labels:
-  {{- range $key, $value := .Values.role.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
 {{ else }}
 kind: Role
 metadata:
  creationTimestamp: null
  name: ack-lambda-controller
-  labels:
-  {{- range $key, $value := .Values.role.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}


Looks like you're using an outdated code-generator

Done, I have updated the code-generator.

This code should not be removed. Can you double check that you included changes to helm/templates folder?

a-hilaly · 2022-12-02T17:24:08Z

test/e2e/tests/test_layer_version.py

+        # Assert that the original code.s3Bucket and code.s3Key is still part of
+        # the function's CR
+        assert cr["spec"]["content"]["s3Bucket"] == resources.FunctionsBucket.name
+        assert cr["spec"]["content"]["s3Key"] == LAMBDA_FUNCTION_FILE_ZIP
+        version_number = cr['status']['versionNumber']


Let's address those in a seperate PR

Thanks, I will open separate PR for this.

Vandita2020 · 2022-12-02T18:16:54Z

/test all

Vandita2020 · 2022-12-02T19:07:11Z

/test all

a-hilaly

This looks good to go! one last comment bellow.
Good work on this @Vandita2020 !

a-hilaly · 2022-12-03T15:02:43Z

apis/v1alpha1/ack-generate-metadata.yaml

  go_version: go1.19
-  version: v0.19.3-15-g7cd74c3-dirty
-api_directory_checksum: f01a03847a7bb58e935fdca90ecfb910f645ea61
+  version: v0.20.1-2-g560c702


a-hilaly · 2022-12-03T15:05:18Z

helm/templates/cluster-role-controller.yaml

-  labels:
-  {{- range $key, $value := .Values.role.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
 {{ else }}
 kind: Role
 metadata:
  creationTimestamp: null
  name: ack-lambda-controller
-  labels:
-  {{- range $key, $value := .Values.role.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}


This code should not be removed. Can you double check that you included changes to helm/templates folder?

Vandita2020 · 2022-12-05T18:21:27Z

/test all

Vandita2020 · 2022-12-05T18:27:14Z

/test all

a-hilaly

Tres bien!
/lgtm

ack-bot · 2022-12-05T18:44:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: A-Hilaly, Vandita2020

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [A-Hilaly]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…llers-k8s#67) ### Update to ACK runtime `v0.28.0`, code-generator `v0.28.0` ---------- * ACK code-generator `v0.28.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.28.0) * ACK runtime `v0.28.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.28.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.28` to `v0.0.29` Once this PR is merged, release `v0.0.29` will be automatically created for `mq-controller` **Please close this PR, if you do not want the new patch release for `mq-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building mq-controller ==== Copying common custom resource definitions into mq Building Kubernetes API objects for mq Generating deepcopy code for mq Generating custom resource definitions for mq Building service controller for mq Generating RBAC manifests for mq Running gofmt against generated code for mq Updating additional GitHub repository maintenance files ==== building mq-controller release artifacts ==== Building release artifacts for mq-v0.0.29 Generating common custom resource definitions Generating custom resource definitions for mq Generating RBAC manifests for mq ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

ack-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2022

ack-bot requested review from RedbackThomson and vijtrip2 November 30, 2022 20:45

Vandita2020 force-pushed the layer_version branch from 66e352a to 9339b0c Compare November 30, 2022 21:36

Vandita2020 force-pushed the layer_version branch from 9339b0c to 9093c14 Compare November 30, 2022 21:58

Vandita2020 force-pushed the layer_version branch from 9093c14 to 74f013f Compare November 30, 2022 22:34

Vandita2020 force-pushed the layer_version branch from 74f013f to 6190024 Compare November 30, 2022 23:13

Vandita2020 force-pushed the layer_version branch from 6190024 to 9986fe8 Compare December 1, 2022 18:08

Vandita2020 force-pushed the layer_version branch from 9986fe8 to 23e5e50 Compare December 1, 2022 18:22

Vandita2020 force-pushed the layer_version branch from 23e5e50 to b7ed554 Compare December 1, 2022 22:35

Vandita2020 force-pushed the layer_version branch from b7ed554 to 1c99ca3 Compare December 1, 2022 23:17

Vandita2020 force-pushed the layer_version branch from 1c99ca3 to 70f40ab Compare December 2, 2022 17:08

Vandita2020 force-pushed the layer_version branch from 70f40ab to 1a81fbc Compare December 2, 2022 17:18

a-hilaly reviewed Dec 2, 2022

View reviewed changes

Vandita2020 force-pushed the layer_version branch from 1a81fbc to 4ff8ea3 Compare December 2, 2022 18:16

Vandita2020 force-pushed the layer_version branch from 4ff8ea3 to 8af8ec3 Compare December 2, 2022 19:07

a-hilaly reviewed Dec 3, 2022

View reviewed changes

Adding draft code for Layer_version resource

940d99f

Vandita2020 force-pushed the layer_version branch from 8af8ec3 to 940d99f Compare December 5, 2022 18:21

Vandita2020 changed the title ~~Adding draft code for Layer_version resource~~ Adding code for Layer_version resource Dec 5, 2022

Vandita2020 closed this Dec 5, 2022

Vandita2020 reopened this Dec 5, 2022

Vandita2020 marked this pull request as ready for review December 5, 2022 18:28

ack-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 5, 2022

a-hilaly approved these changes Dec 5, 2022

View reviewed changes

ack-bot assigned a-hilaly Dec 5, 2022

ack-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2022

ack-bot added the approved label Dec 5, 2022

ack-bot merged commit 9e85142 into aws-controllers-k8s:main Dec 5, 2022

Adding code for Layer_version resource #67

Adding code for Layer_version resource #67

Uh oh!

Conversation

Vandita2020 commented Nov 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ack-bot commented Nov 30, 2022

Uh oh!

Vandita2020 commented Nov 30, 2022

Uh oh!

Vandita2020 commented Nov 30, 2022

Uh oh!

Vandita2020 commented Nov 30, 2022

Uh oh!

Vandita2020 commented Nov 30, 2022

Uh oh!

Vandita2020 commented Nov 30, 2022

Uh oh!

Vandita2020 commented Dec 1, 2022

Uh oh!

Vandita2020 commented Dec 1, 2022

Uh oh!

Vandita2020 commented Dec 1, 2022

Uh oh!

Vandita2020 commented Dec 1, 2022

Uh oh!

Vandita2020 commented Dec 2, 2022

Uh oh!

Vandita2020 commented Dec 2, 2022

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Vandita2020 commented Dec 2, 2022

Uh oh!

Vandita2020 commented Dec 2, 2022

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Vandita2020 commented Dec 5, 2022

Uh oh!

Vandita2020 commented Dec 5, 2022

Uh oh!

a-hilaly left a comment

Choose a reason for hiding this comment

Uh oh!

ack-bot commented Dec 5, 2022

Uh oh!

Uh oh!

Vandita2020 commented Nov 30, 2022 •

edited

Loading