Add Code.S3Bucket reference (#63)

Vandita2020 · web-flow · commit d5b114d029b9 · 2022-10-25T13:45:38.000-07:00
Description of changes: Adding functionality to the lambda controller to be able to reference Code.S3Bucket resource using resource references. This was generated using the patch aws-controllers-k8s/community#1514 is implemented. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-10-17T21:33:01Z"
-  build_hash: 5ee0ac052c54f008dff50f6f5ebb73f2cf3a0bd7
+  build_date: "2022-10-25T17:58:30Z"
+  build_hash: 9727031b415481d9ac28bb94cac9f1e73336401d
   go_version: go1.19
-  version: v0.19.3-11-g5ee0ac0
-api_directory_checksum: 524eddcd9132990dfde91e2198972cb98824b0c8
+  version: v0.19.3-9-g9727031
+api_directory_checksum: e2da75eafa3ab7fe7cc4c8c26ba01e495e31d494
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
 generator_config_info:
-  file_checksum: b80da83b8bcef0df08e435dbcfd6b744cffbdb71
+  file_checksum: 1328b65627cf7280ef4df6c1b0435653e99fe62f
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -8,6 +8,11 @@ ignore:
 resources:
   Function:
     fields:
+      Code.S3Bucket:
+        references:
+          resource: Bucket
+          path: Spec.Name
+          service_name: s3
       VPCConfig.SubnetIDs:
         references:
           resource: Subnet
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
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/crd/bases/lambda.services.k8s.aws_functions.yaml b/config/crd/bases/lambda.services.k8s.aws_functions.yaml
@@ -49,6 +49,18 @@ spec:
                     type: string
                   s3Bucket:
                     type: string
+                  s3BucketRef:
+                    description: Reference field for S3Bucket
+                    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
                   s3Key:
                     type: string
                   s3ObjectVersion:
diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml
@@ -173,6 +173,20 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - s3.services.k8s.aws
+  resources:
+  - buckets
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - s3.services.k8s.aws
+  resources:
+  - buckets/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - services.k8s.aws
   resources:
diff --git a/generator.yaml b/generator.yaml
@@ -8,6 +8,11 @@ ignore:
 resources:
   Function:
     fields:
+      Code.S3Bucket:
+        references:
+          resource: Bucket
+          path: Spec.Name
+          service_name: s3
       VPCConfig.SubnetIDs:
         references:
           resource: Subnet
diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/aws-controllers-k8s/ec2-controller v0.0.21
 	github.com/aws-controllers-k8s/kms-controller v0.1.2
 	github.com/aws-controllers-k8s/runtime v0.20.1
+	github.com/aws-controllers-k8s/s3-controller v0.1.5
 	github.com/aws/aws-sdk-go v1.44.93
 	github.com/go-logr/logr v1.2.0
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -68,8 +68,12 @@ github.com/aws-controllers-k8s/ec2-controller v0.0.21 h1:5O7/9aED2Tl9OT0TL2rWrc1
 github.com/aws-controllers-k8s/ec2-controller v0.0.21/go.mod h1:OMsmJeJ3iQZ1sJgs3hqnjBRnJ3hmTzJUO38W5rxnB5M=
 github.com/aws-controllers-k8s/kms-controller v0.1.2 h1:9lb98jspqOpFpmIFHOJ6pRnOkC8kDEPIgTAb5QnVGZo=
 github.com/aws-controllers-k8s/kms-controller v0.1.2/go.mod h1:6CoV0UMFd03EUF9dXgOTTScGdBhJzsWn9W0dw2n0kA4=
+github.com/aws-controllers-k8s/runtime v0.20.0/go.mod h1:oA8ML1/LL3chPn26P6SzBNu1CUI2nekB+PTqykNs0qU=
 github.com/aws-controllers-k8s/runtime v0.20.1 h1:L/Huf1shRahx5BqJBCSS5u+vYg3f0Rotsq1jutORpdI=
 github.com/aws-controllers-k8s/runtime v0.20.1/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
+github.com/aws-controllers-k8s/s3-controller v0.1.5 h1:5zb7jsh0fgbPM8cIvcsuH1dta1dKzaAnlwgvb6u3hOc=
+github.com/aws-controllers-k8s/s3-controller v0.1.5/go.mod h1:8Z8JlO5Hc1dZX2YELu94+lnOgKM0FioAHJBsyaWvtx8=
+github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go v1.44.93 h1:hAgd9fuaptBatSft27/5eBMdcA8+cIMqo96/tZ6rKl8=
 github.com/aws/aws-sdk-go v1.44.93/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -604,6 +608,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
diff --git a/helm/crds/lambda.services.k8s.aws_functions.yaml b/helm/crds/lambda.services.k8s.aws_functions.yaml
@@ -49,6 +49,18 @@ spec:
                     type: string
                   s3Bucket:
                     type: string
+                  s3BucketRef:
+                    description: Reference field for S3Bucket
+                    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
                   s3Key:
                     type: string
                   s3ObjectVersion:
diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml
@@ -4,19 +4,11 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: ack-lambda-controller
-  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 }}
   namespace: {{ .Release.Namespace }}
 {{ end }}
 rules:
@@ -188,6 +180,20 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - s3.services.k8s.aws
+  resources:
+  - buckets
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - s3.services.k8s.aws
+  resources:
+  - buckets/status
+  verbs:
+  - get
+  - list
 - apiGroups:
   - services.k8s.aws
   resources:
diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -65,14 +65,6 @@
       ],
       "type": "object"
     },
-    "role": {
-      "description": "Role settings",
-      "properties": {
-        "labels": {
-	  "type": "object"
-	}
-      }
-    },
     "metrics": {
       "description": "Metrics settings",
       "properties": {
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -28,10 +28,6 @@ deployment:
   # Which priorityClassName to set?
   # See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
   priorityClassName: ""
-
-# If "installScope: cluster" then these labels will be applied to ClusterRole
-role:
- labels: {}
   
 metrics:
   service:
diff --git a/pkg/resource/function/references.go b/pkg/resource/function/references.go
