Update ACK runtime to v0.18.0 (#66)

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

Hide file tree

Showing 44 changed files with 518 additions and 22 deletions.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2022-03-05T00:11:28Z"
-  build_hash: ade2429bb444ab635916395ea5773d141ba135e1
+  build_date: "2022-03-22T20:27:53Z"
+  build_hash: 6f659f796434e8fd6443c0b3a5b495daae910035
   go_version: go1.17.5
-  version: v0.17.2
+  version: v0.18.0
 api_directory_checksum: c5762d0b5707ca20866f2f0e85bc23863733ca11
 api_version: v1alpha1
 aws_sdk_go_version: v1.42.0

diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -28,6 +28,8 @@ spec:
         args:
         - --aws-region
         - "$(AWS_REGION)"
+        - --aws-endpoint-url
+        - "$(AWS_ENDPOINT_URL)"
         - --enable-development-logging
         - "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
         - --log-level
@@ -53,6 +55,18 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: AWS_REGION
+          value: ""
+        - name: AWS_ENDPOINT_URL
+          value: ""
+        - name: ACK_WATCH_NAMESPACE
+          value: ""
+        - name: ACK_ENABLE_DEVELOPMENT_LOGGING
+          value: "false"
+        - name: ACK_LOG_LEVEL
+          value: "info"
+        - name: ACK_RESOURCE_TAGS
+          value: "services.k8s.aws/managed=true,services.k8s.aws/created=%UTCNOW%,services.k8s.aws/namespace=%KUBERNETES_NAMESPACE%"
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false

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/rds-controller
-  newTag: v0.0.19
+  newTag: v0.0.20
diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusterparametergroups.yaml
@@ -150,8 +150,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               conditions:
                 description: All CRS managed by ACK have a common `Status.Conditions`

diff --git a/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml b/config/crd/bases/rds.services.k8s.aws_dbclusters.yaml
@@ -387,8 +387,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               activityStreamKMSKeyID:
                 description: "The Amazon Web Services KMS key identifier used for

diff --git a/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml b/config/crd/bases/rds.services.k8s.aws_dbinstances.yaml
@@ -647,8 +647,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               activityStreamEngineNativeAuditFieldsIncluded:
                 description: Indicates whether engine-native audit fields are included

diff --git a/config/crd/bases/rds.services.k8s.aws_dbparametergroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbparametergroups.yaml
@@ -152,8 +152,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               conditions:
                 description: All CRS managed by ACK have a common `Status.Conditions`

diff --git a/config/crd/bases/rds.services.k8s.aws_dbsecuritygroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbsecuritygroups.yaml
@@ -88,8 +88,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               conditions:
                 description: All CRS managed by ACK have a common `Status.Conditions`

diff --git a/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.yaml b/config/crd/bases/rds.services.k8s.aws_dbsubnetgroups.yaml
@@ -92,8 +92,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               conditions:
                 description: All CRS managed by ACK have a common `Status.Conditions`

diff --git a/config/crd/bases/rds.services.k8s.aws_globalclusters.yaml b/config/crd/bases/rds.services.k8s.aws_globalclusters.yaml
@@ -89,8 +89,13 @@ spec:
                     description: OwnerAccountID is the AWS Account ID of the account
                       that owns the backend AWS service API resource.
                     type: string
+                  region:
+                    description: Region is the AWS region in which the resource exists
+                      or will exist.
+                    type: string
                 required:
                 - ownerAccountID
+                - region
                 type: object
               conditions:
                 description: All CRS managed by ACK have a common `Status.Conditions`

diff --git a/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml b/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml
@@ -57,9 +57,8 @@ spec:
                     type: string
                 type: object
               kubernetes:
-                description: TargetKubernetesResource provides all the values necessary
-                  to identify a given ACK type and override any metadata values when
-                  creating a resource of that type.
+                description: ResourceWithMetadata provides the values necessary to
+                  create a Kubernetes resource and override any of its metadata values.
                 properties:
                   group:
                     type: string

diff --git a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml
@@ -0,0 +1,137 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.7.0
+  creationTimestamp: null
+  name: fieldexports.services.k8s.aws
+spec:
+  group: services.k8s.aws
+  names:
+    kind: FieldExport
+    listKind: FieldExportList
+    plural: fieldexports
+    singular: fieldexport
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: FieldExport is the schema for the FieldExport API.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: FieldExportSpec defines the desired state of the FieldExport.
+            properties:
+              from:
+                description: ResourceFieldSelector provides the values necessary to
+                  identify an individual field on an individual K8s resource.
+                properties:
+                  path:
+                    type: string
+                  resource:
+                    description: NamespacedResource provides all the values necessary
+                      to identify an ACK resource of a given type (within the same
+                      namespace as the custom resource containing this type).
+                    properties:
+                      group:
+                        type: string
+                      kind:
+                        type: string
+                      name:
+                        type: string
+                    required:
+                    - group
+                    - kind
+                    - name
+                    type: object
+                required:
+                - path
+                - resource
+                type: object
+              to:
+                description: FieldExportTarget provides the values necessary to identify
+                  the output path for a field export.
+                properties:
+                  kind:
+                    description: FieldExportOutputType represents all types that can
+                      be produced by a field export operation
+                    enum:
+                    - configmap
+                    - secret
+                    type: string
+                  name:
+                    type: string
+                  namespace:
+                    description: Namespace is marked as optional, so we cannot compose
+                      `NamespacedName`
+                    type: string
+                required:
+                - kind
+                - name
+                type: object
+            required:
+            - from
+            - to
+            type: object
+          status:
+            description: FieldExportStatus defines the observed status of the FieldExport.
+            properties:
+              conditions:
+                description: A collection of `ackv1alpha1.Condition` objects that
+                  describe the various recoverable states of the field CR
+                items:
+                  description: Condition is the common struct used by all CRDs managed
+                    by ACK service controllers to indicate terminal states  of the
+                    CR and its backend AWS service API resource
+                  properties:
+                    lastTransitionTime:
+                      description: Last time the condition transitioned from one status
+                        to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type is the type of the Condition
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+            required:
+            - conditions
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/config/crd/common/kustomization.yaml b/config/crd/common/kustomization.yaml
@@ -1,6 +1,7 @@
-# This file is NOT auto-generated
+# Code generated in runtime. DO NOT EDIT.
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - bases/services.k8s.aws_adoptedresources.yaml
+  - bases/services.k8s.aws_fieldexports.yaml
diff --git a/config/rbac/cluster-role-controller.yaml b/config/rbac/cluster-role-controller.yaml
@@ -13,6 +13,7 @@ rules:
   verbs:
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - ""
@@ -29,6 +30,7 @@ rules:
   verbs:
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - rds.services.k8s.aws
@@ -190,3 +192,23 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - services.k8s.aws
+  resources:
+  - fieldexports
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - services.k8s.aws
+  resources:
+  - fieldexports/status
+  verbs:
+  - get
+  - patch
+  - update
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/rds-controller
 go 1.17
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.17.2
+	github.com/aws-controllers-k8s/runtime v0.18.0
 	github.com/aws/aws-sdk-go v1.42.0
 	github.com/go-logr/logr v1.2.0
 	github.com/spf13/pflag v1.0.5
@@ -28,6 +28,8 @@ require (
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/itchyny/gojq v0.12.6 // indirect
+	github.com/itchyny/timefmt-go v0.1.3 // indirect
 	github.com/jaypipes/envutil v1.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -45,7 +47,7 @@ require (
 	go.uber.org/zap v1.19.1 // indirect
 	golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
+	golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect