Update to ACK runtime v0.21.0, code-generator v0.21.0 (#40)

ack-bot · web-flow · commit 1c4c760ec8d6 · 2022-12-11T05:02:17.000-08:00
### Update to ACK runtime `v0.21.0`, code-generator `v0.21.0` ---------- * ACK code-generator `v0.21.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.21.0) * ACK runtime `v0.21.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.21.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.3` to `v0.0.4` Once this PR is merged, release `v0.0.4` will be automatically created for `memorydb-controller` **Please close this PR, if you do not want the new patch release for `memorydb-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building memorydb-controller ==== Copying common custom resource definitions into memorydb Building Kubernetes API objects for memorydb Generating deepcopy code for memorydb Generating custom resource definitions for memorydb Building service controller for memorydb Generating RBAC manifests for memorydb Running gofmt against generated code for memorydb Updating additional GitHub repository maintenance files ==== building memorydb-controller release artifacts ==== Building release artifacts for memorydb-v0.0.4 Generating common custom resource definitions Generating custom resource definitions for memorydb Generating RBAC manifests for memorydb ``` ---------- 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,8 +1,8 @@
 ack_generate_info:
-  build_date: "2022-12-06T01:26:44Z"
-  build_hash: c1f00b512eb25d054b6b5faa67674d9a08e28b38
-  go_version: go1.19
-  version: v0.20.1-2-gc1f00b5
+  build_date: "2022-12-08T19:08:31Z"
+  build_hash: 12246c7da82841b351ec7a9e1f139f9338f2784b
+  go_version: go1.17.5
+  version: v0.21.0
 api_directory_checksum: a1e396caca4bdd1612fa7d09f0ee56f3e4976ff7
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.93
diff --git a/apis/v1alpha1/subnet_group.go b/apis/v1alpha1/subnet_group.go
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.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/memorydb-controller
-  newTag: v0.0.3
+  newTag: v0.0.4
diff --git a/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml b/config/crd/common/bases/services.k8s.aws_adoptedresources.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: adoptedresources.services.k8s.aws
 spec:
@@ -170,6 +169,7 @@ spec:
                           - name
                           - uid
                           type: object
+                          x-kubernetes-map-type: atomic
                         type: array
                     type: object
                 required:
@@ -224,9 +224,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/common/bases/services.k8s.aws_fieldexports.yaml b/config/crd/common/bases/services.k8s.aws_fieldexports.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: fieldexports.services.k8s.aws
 spec:
@@ -133,9 +132,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/memorydb-controller
 go 1.17
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.20.1
+	github.com/aws-controllers-k8s/runtime v0.21.0
 	github.com/aws/aws-sdk-go v1.44.93
 	github.com/go-logr/logr v1.2.0
 	github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
@@ -64,8 +64,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-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/runtime v0.21.0 h1:e9DK88QodwXMLz+QXPXk+8XNetVj4ij+puaVwn9uEVc=
+github.com/aws-controllers-k8s/runtime v0.21.0/go.mod h1:k7z4qlf6aK1Kzd4ff49wzcyhDKHjWaUpqxrwgl4uS1o=
 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=
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: memorydb-chart
 description: A Helm chart for the ACK service controller for Amazon MemoryDB for Redis (MemoryDB)
-version: v0.0.3
-appVersion: v0.0.3
+version: v0.0.4
+appVersion: v0.0.4
 home: https://github.com/aws-controllers-k8s/memorydb-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml b/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml
@@ -34,8 +34,8 @@ spec:
             type: object
           spec:
             description: "SubnetGroupSpec defines the desired state of SubnetGroup.
-              \n Represents the output of one of the following operations: \n - CreateSubnetGroup
-              \n - UpdateSubnetGroup \n A subnet group is a collection of subnets
+              \n Represents the output of one of the following operations: \n * CreateSubnetGroup
+              \n * UpdateSubnetGroup \n A subnet group is a collection of subnets
               (typically private) that you can designate for your clusters running
               in an Amazon Virtual Private Cloud (VPC) environment."
             properties:
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/memorydb-controller:v0.0.3".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/memorydb-controller:v0.0.4".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml
@@ -4,11 +4,19 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: ack-memorydb-controller
+  labels:
+  {{- range $key, $value := .Values.role.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 {{ else }}
 kind: Role
 metadata:
   creationTimestamp: null
   name: ack-memorydb-controller
+  labels:
+  {{- range $key, $value := .Values.role.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   namespace: {{ .Release.Namespace }}
 {{ end }}
 rules:
diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -65,6 +65,14 @@
       ],
       "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
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/memorydb-controller
-  tag: v0.0.3
+  tag: v0.0.4
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -28,6 +28,10 @@ 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/cluster/hooks.go b/pkg/resource/cluster/hooks.go
@@ -261,4 +261,4 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(
 	}
 
 	return res
-}
+}
