Merge branch 'main' into provisioned_concurrecny_config_alias

Vandita2020 · web-flow · commit 305ba4484705 · 2023-07-17T16:04:20.000-07:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,7 +1,7 @@
 ack_generate_info:
   build_date: "2023-07-17T22:59:48Z"
   build_hash: e9b68590da73ce9143ba1e4361cebdc1d876c81e
-  go_version: go1.19
+  go_version: go1.20.5
   version: v0.26.1-7-ge9b6859
 api_directory_checksum: e80cb2007eb08a463d2e6ea5aa006563bd5c42ed
 api_version: v1alpha1
diff --git a/apis/v1alpha1/function.go b/apis/v1alpha1/function.go
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -39,6 +39,11 @@ resources:
           resource: Key
           path: Status.ACKResourceMetadata.ARN
           service_name: kms
+      Role:
+        references:
+          resource: Role
+          path: Status.ACKResourceMetadata.ARN
+          service_name: iam
       Name:
         is_primary_key: true
         is_required: true
@@ -193,4 +198,4 @@ resources:
             Version: VersionNumber
         ListLayerVersions:
           input_fields:
-            Version: VersionNumber
+            Version: VersionNumber
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git 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/lambda-controller
-  newTag: 1.1.1
+  newTag: 1.2.0
diff --git a/config/crd/bases/lambda.services.k8s.aws_functions.yaml b/config/crd/bases/lambda.services.k8s.aws_functions.yaml
@@ -235,6 +235,19 @@ spec:
                 description: The Amazon Resource Name (ARN) of the function's execution
                   role.
                 type: string
+              roleRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               runtime:
                 description: The identifier of the function's runtime (https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html).
                   Runtime is required if the deployment package is a .zip file archive.
@@ -321,7 +334,6 @@ spec:
             required:
             - code
             - name
-            - role
             type: object
           status:
             description: FunctionStatus defines the observed state of Function
diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml
@@ -59,6 +59,20 @@ rules:
   verbs:
   - get
   - list
+- apiGroups:
+  - iam.services.k8s.aws
+  resources:
+  - roles
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - iam.services.k8s.aws
+  resources:
+  - roles/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - kafka.services.k8s.aws
   resources:
diff --git a/generator.yaml b/generator.yaml
@@ -39,6 +39,11 @@ resources:
           resource: Key
           path: Status.ACKResourceMetadata.ARN
           service_name: kms
+      Role:
+        references:
+          resource: Role
+          path: Status.ACKResourceMetadata.ARN
+          service_name: iam
       Name:
         is_primary_key: true
         is_required: true
@@ -193,4 +198,4 @@ resources:
             Version: VersionNumber
         ListLayerVersions:
           input_fields:
-            Version: VersionNumber
+            Version: VersionNumber
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.19
 
 require (
 	github.com/aws-controllers-k8s/ec2-controller v0.0.21
+	github.com/aws-controllers-k8s/iam-controller v1.2.3
 	github.com/aws-controllers-k8s/kafka-controller v0.0.0-20230615185632-102279061de1
 	github.com/aws-controllers-k8s/kms-controller v0.1.2
 	github.com/aws-controllers-k8s/mq-controller v0.0.22
diff --git a/go.sum b/go.sum
@@ -40,6 +40,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1Ix5V1UxYEgDKAhvFhPJQ=
 github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M=
+github.com/aws-controllers-k8s/iam-controller v1.2.3 h1:Vzz7/qxhcfkPrqn64Oi0tbvHetyiEto3gQuvpCSpECA=
+github.com/aws-controllers-k8s/iam-controller v1.2.3/go.mod h1:c7WaFwq2tIJjwpZhnuCYQ2ISzzMUJLTisPv92lim8sk=
 github.com/aws-controllers-k8s/kafka-controller v0.0.0-20230615185632-102279061de1 h1:NvmtIsm6fVoGUOvMfevONJETf+PtRWAiD3XzZBtQ2WA=
 github.com/aws-controllers-k8s/kafka-controller v0.0.0-20230615185632-102279061de1/go.mod h1:BHW00DFtXtugpsyn0nN0YdP32xmCN5p3lIJYP+Y0iVY=
 github.com/aws-controllers-k8s/kms-controller v0.1.2 h1:9lb98jspqOpFpmIFHOJ6pRnOkC8kDEPIgTAb5QnVGZo=
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: lambda-chart
 description: A Helm chart for the ACK service controller for AWS Lambda (Lambda)
-version: 1.1.1
-appVersion: 1.1.1
+version: 1.2.0
+appVersion: 1.2.0
 home: https://github.com/aws-controllers-k8s/lambda-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/helm/crds/lambda.services.k8s.aws_functions.yaml b/helm/crds/lambda.services.k8s.aws_functions.yaml
@@ -235,6 +235,19 @@ spec:
                 description: The Amazon Resource Name (ARN) of the function's execution
                   role.
                 type: string
+              roleRef:
+                description: "AWSResourceReferenceWrapper provides a wrapper around
+                  *AWSResourceReference type to provide more user friendly syntax
+                  for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
+                properties:
+                  from:
+                    description: AWSResourceReference provides all the values necessary
+                      to reference another k8s resource for finding the identifier(Id/ARN/Name)
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                type: object
               runtime:
                 description: The identifier of the function's runtime (https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html).
                   Runtime is required if the deployment package is a .zip file archive.
@@ -321,7 +334,6 @@ spec:
             required:
             - code
             - name
-            - role
             type: object
           status:
             description: FunctionStatus defines the observed state of Function
diff --git 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/lambda-controller:1.1.1".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/lambda-controller:1.2.0".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
@@ -9,7 +9,7 @@ You are now able to create AWS Lambda (Lambda) resources!
 The controller is running in "{{ .Values.installScope }}" mode.
 The controller is configured to manage AWS resources in region: "{{ .Values.aws.region }}"
 
-Visit https://aws-controllers-k8s.github.io/community/reference/ for an API 
+Visit https://aws-controllers-k8s.github.io/community/reference/ for an API
 reference of all the resources that can be created using this controller.
 
 For more information on the AWS Controllers for Kubernetes (ACK) project, visit:
diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml
@@ -74,6 +74,20 @@ rules:
   verbs:
   - get
   - list
+- apiGroups:
+  - iam.services.k8s.aws
+  resources:
+  - roles
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - iam.services.k8s.aws
+  resources:
+  - roles/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - kafka.services.k8s.aws
   resources:
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/lambda-controller
-  tag: 1.1.1
+  tag: 1.2.0
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -52,7 +52,7 @@ deployment:
 # If "installScope: cluster" then these labels will be applied to ClusterRole
 role:
   labels: {}
-  
+
 metrics:
   service:
     # Set to true to automatically create a Kubernetes Service resource for the
@@ -80,7 +80,7 @@ aws:
     # Secret stringData key that contains the credentials
     secretKey: "credentials"
     # Profile used for AWS credentials
-    profile: "default"  
+    profile: "default"
 
 # log level for the controller
 log:
diff --git a/pkg/resource/function/delta.go b/pkg/resource/function/delta.go
diff --git a/pkg/resource/function/references.go b/pkg/resource/function/references.go
