Update to ACK runtime v0.14.0 (aws-controllers-k8s#49)

Fixes aws-controllers-k8s/community#953 Description of changes: Update the `generator.yaml` file according to the new `v0.14.0` changes. Regenerated all files with the newest version of code-generator. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
jljaco · Sep 21, 2021 · fe58a7e · fe58a7e
1 parent d828908
commit fe58a7e
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 26 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -64,7 +64,7 @@ any 'help wanted' issues is a great place to start.
 
 [See the documentation][dev-docs] for detailed development information.
 
-[dev-docs]: https://aws.github.io/aws-controllers-k8s/dev-docs/overview/
+[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/
 
 ## Code of Conduct
 

diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,14 +1,13 @@
 ack_generate_info:
-  build_date: "2021-09-15T20:51:47Z"
-  build_hash: 394e8294aabf0b221c35f7a5c7bc7e4e43bc6f10
-  go_version: go1.15.6 linux/amd64
-  version: v0.13.2
+  build_date: "2021-09-21T18:55:51Z"
+  build_hash: 386373b002204b5a215388c4d91af91fc9372398
+  go_version: go1.15.6
+  version: v0.14.0
 api_directory_checksum: dfcc21d3fc7fcd228ae29942f020128e7a3bdb8e
 api_version: v1alpha1
 aws_sdk_go_version: v1.37.10
 generator_config_info:
-  file_checksum: 3adc9b830bb3e9ea446ea5ee85ee03f21edc65fd
+  file_checksum: fc075d7f34ba66f75e207a25f763a5b74de48337
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
-  timestamp: 2021-09-15 20:51:53.255709113 +0000 UTC
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -8,12 +8,15 @@ ignore:
   field_paths:
     # We cannot support MFA, so if it is set we cannot unset
     - "VersioningConfiguration.MFADelete"
-operations:
-  ListBuckets:
-    primary_identifier_field_name: Name
 resources:
   Bucket:
     fields:
+      Name:
+        is_primary_key: true
+        is_required: true
+        from:
+          operation: CreateBucket
+          path: Bucket
       Accelerate:
         from:
           operation: PutBucketAccelerateConfiguration

diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -41,7 +41,8 @@ spec:
         image: controller:latest
         name: controller
         ports:
-          - containerPort: 8080
+          - name: http
+            containerPort: 8080
         resources:
           limits:
             cpu: 100m

diff --git a/config/controller/service.yaml b/config/controller/service.yaml
@@ -9,6 +9,6 @@ spec:
   ports:
     - name: metricsport
       port: 8080
-      targetPort: 8080
+      targetPort: http
       protocol: TCP
-  type: NodePort
+  type: NodePort
diff --git a/generator.yaml b/generator.yaml
@@ -8,12 +8,15 @@ ignore:
   field_paths:
     # We cannot support MFA, so if it is set we cannot unset
     - "VersioningConfiguration.MFADelete"
-operations:
-  ListBuckets:
-    primary_identifier_field_name: Name
 resources:
   Bucket:
     fields:
+      Name:
+        is_primary_key: true
+        is_required: true
+        from:
+          operation: CreateBucket
+          path: Bucket
       Accelerate:
         from:
           operation: PutBucketAccelerateConfiguration

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/s3-controller
 go 1.14
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.13.2
+	github.com/aws-controllers-k8s/runtime v0.14.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

diff --git a/go.sum b/go.sum
@@ -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.13.2 h1:+gVwW4dTndPb4lB0WNLdHeiP7AGBOV+wBHGjpQUOh+w=
-github.com/aws-controllers-k8s/runtime v0.13.2/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
+github.com/aws-controllers-k8s/runtime v0.14.0 h1:vIoOmMCKjbjzedi26fEoVBYYVdRw+0V3ckMqM8QgvE8=
+github.com/aws-controllers-k8s/runtime v0.14.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=

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -54,7 +54,8 @@ spec:
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         name: controller
         ports:
-          - containerPort: {{ .Values.deployment.containerPort }}
+          - name: http
+            containerPort: {{ .Values.deployment.containerPort }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         env:
@@ -77,3 +78,4 @@ spec:
         - name: ACK_RESOURCE_TAGS
           value: {{ join "," .Values.resourceTags | quote }}
       terminationGracePeriodSeconds: 10
+      nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
diff --git a/helm/templates/metrics-service.yaml b/helm/templates/metrics-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "app.fullname" . }}-metrics
+  name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ include "app.name" . }}
@@ -25,6 +25,6 @@ spec:
   ports:
   - name: metricsport
     port: 8080
-    targetPort: 8080
+    targetPort: http
     protocol: TCP
-{{- end }}
+{{- end }}
diff --git a/helm/templates/service-account.yaml b/helm/templates/service-account.yaml
@@ -10,8 +10,9 @@ metadata:
     k8s-app: {{ include "app.name" . }}
     helm.sh/chart: {{ include "chart.name-version" . }}
   name: {{ include "service-account.name" . }}
+  namespace: {{ .Release.Namespace }}
   annotations:
   {{- range $key, $value := .Values.serviceAccount.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -15,6 +15,8 @@ deployment:
   annotations: {}
   labels: {}
   containerPort: 8080
+  nodeSelector:
+    kubernetes.io/os: linux
 
 metrics:
   service:

diff --git a/pkg/resource/bucket/manager.go b/pkg/resource/bucket/manager.go
diff --git a/pkg/resource/bucket/resource.go b/pkg/resource/bucket/resource.go
diff --git a/pkg/resource/bucket/sdk.go b/pkg/resource/bucket/sdk.go