Upgrade to runtime 0.13.0 (#5)

Issue #, if available: N/A

Description of changes:
* Updates with latest initialisms 
* Enhances ReadMany logic to populate `Id` field with CustomResource's Id
* Removes hooks that were populating ReadMany `Id` field

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

Author: brycahta

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,14 +1,14 @@
 ack_generate_info:
-  build_date: "2021-08-18T21:36:57Z"
-  build_hash: 821a0daf362fdda8148046310c3eb478b96366ac
-  go_version: go1.16.6 darwin/amd64
-  version: v0.12.0
-api_directory_checksum: aae0d15e0e983bfceae42ac7f3dd640e1f9b298a
+  build_date: "2021-09-01T18:32:41Z"
+  build_hash: 6f22b7b568e25b4ee007bb1ab5f9338c16daf172
+  go_version: go1.17 darwin/amd64
+  version: v0.13.0
+api_directory_checksum: ae8b61e0359ce7d3f8795b243537b07c43e2609e
 api_version: v1alpha1
 aws_sdk_go_version: v1.37.10
 generator_config_info:
-  file_checksum: f7a61725fe7d34c5e0180ae010b10eebd5cb95e0
+  file_checksum: d37d8e26f07ea82e6ce896adffc138034078c1e1
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
-  timestamp: 2021-08-18 21:37:05.403098 +0000 UTC
+  timestamp: 2021-09-01 18:32:53.713542 +0000 UTC

apis/v1alpha1/generator.yaml

@@ -63,14 +63,7 @@ ignore:
     - VpnGateway
 
 resources:
-  Vpc:
-    hooks:
-      sdk_read_many_post_build_request:
-        template_path: hooks/vpc/sdk_read_many_post_build_request.go.tpl
   Subnet:
-    hooks:
-      sdk_read_many_post_build_request:
-        template_path: hooks/vpc/sdk_read_many_post_build_request.go.tpl
     exceptions:
       terminal_codes:
         - InvalidVpcID.Malformed

apis/v1alpha1/types.go

@@ -63,14 +63,7 @@ ignore:
     - VpnGateway
 
 resources:
-  Vpc:
-    hooks:
-      sdk_read_many_post_build_request:
-        template_path: hooks/vpc/sdk_read_many_post_build_request.go.tpl
   Subnet:
-    hooks:
-      sdk_read_many_post_build_request:
-        template_path: hooks/subnet/sdk_read_many_post_build_request.go.tpl
     exceptions:
       terminal_codes:
         - InvalidVpcID.Malformed

apis/v1alpha1/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/ec2-controller
 go 1.14
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.12.0
+	github.com/aws-controllers-k8s/runtime v0.13.0
 	github.com/aws/aws-sdk-go v1.37.10
 	github.com/go-logr/logr v0.1.0
 	github.com/spf13/pflag v1.0.5

generator.yaml

@@ -23,8 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws-controllers-k8s/runtime v0.12.0 h1:G/lCEozh4Brsv1Ojqyl9D/whpq/YvcFtDZBWXf6YIgI=
-github.com/aws-controllers-k8s/runtime v0.12.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
+github.com/aws-controllers-k8s/runtime v0.13.0 h1:PYiNnQejjS/1H93bolFXGIzgQZSn/gRoPSAEU6UG0ec=
+github.com/aws-controllers-k8s/runtime v0.13.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
 github.com/aws/aws-sdk-go v1.37.10 h1:LRwl+97B4D69Z7tz+eRUxJ1C7baBaIYhgrn5eLtua+Q=
 github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

go.mod

@@ -1,16 +1,16 @@
 apiVersion: v1
 name: ec2-chart
-description: A Helm chart for the ACK service controller for ec2
-version: v0.0.1
-appVersion: v0.0.1
+description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2)
+version: v0.0.0-non-release-version
+appVersion: v0.0.0-non-release-version
 home: https://github.com/aws-controllers-k8s/ec2-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
   - https://github.com/aws-controllers-k8s/ec2-controller
 maintainers:
   - name: ACK Admins
     url: https://github.com/orgs/aws-controllers-k8s/teams/ack-admin
-  - name: ec2 Admins
+  - name: EC2 Admins
     url: https://github.com/orgs/aws-controllers-k8s/teams/ec2-maintainer
 keywords:
   - aws

go.sum

@@ -30,3 +30,9 @@ If release name contains chart name it will be used as a full name.
 {{- define "service-account.name" -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
+
+{{- define "watch-namespace" -}}
+{{- if eq .Values.installScope "namespace" -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}

helm/Chart.yaml

@@ -1,10 +1,19 @@
 apiVersion: rbac.authorization.k8s.io/v1
+{{ if eq .Values.installScope "cluster" }}
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "app.fullname" . }}
 roleRef:
-  apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
+{{ else }}
+kind: RoleBinding
+metadata:
+  name: {{ include "app.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+{{ end }}
+  apiGroup: rbac.authorization.k8s.io
   name: ack-ec2-controller
 subjects:
 - kind: ServiceAccount

helm/templates/_helpers.tpl

@@ -1,10 +1,16 @@
-
----
 apiVersion: rbac.authorization.k8s.io/v1
+{{ if eq .Values.installScope "cluster" }}
 kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: ack-ec2-controller
+{{ else }}
+kind: Role
+metadata:
+  creationTimestamp: null
+  name: ack-ec2-controller
+  namespace: {{ .Release.Namespace }}
+{{ end }}
 rules:
 - apiGroups:
   - ""

helm/templates/cluster-role-binding.yaml

@@ -67,9 +67,9 @@ spec:
         - name: AWS_REGION
           value: {{ .Values.aws.region }}
         - name: AWS_ENDPOINT_URL
-          value: {{ .Values.aws.endpoint_url | quote}}
+          value: {{ .Values.aws.endpoint_url | quote }}
         - name: ACK_WATCH_NAMESPACE
-          value: {{ .Values.watchNamespace }}
+          value: {{ include "watch-namespace" . }}
         - name: ACK_ENABLE_DEVELOPMENT_LOGGING
           value: {{ .Values.log.enable_development_logging | quote }}
         - name: ACK_LOG_LEVEL

helm/templates/cluster-role-controller.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/ec2-controller
-  tag: v0.0.1
+  tag: v0.0.0-non-release-version
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -44,11 +44,14 @@ log:
   enable_development_logging: false
   level: info
 
-# If specified, the service controller will watch for object creation only in the provided namespace
-watchNamespace: ""
+# Set to "namespace" to install the controller in a namespaced scope, will only
+# watch for object creation in the namespace. By default installScope is
+# cluster wide.
+installScope: cluster
 
 resourceTags:
-  # Configures the ACK service controller to always set key/value pairs tags on resources that it manages.
+  # Configures the ACK service controller to always set key/value pairs tags on
+  # resources that it manages.
   - services.k8s.aws/managed=true
   - services.k8s.aws/created=%UTCNOW%
   - services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%