Update to ACK runtime v0.36.0, code-generator v0.36.0 (#18)

ack-bot · web-flow · commit ffed3c2cea94 · 2024-08-07T04:34:04.000Z
### Update to ACK runtime `v0.36.0`, code-generator `v0.36.0` ---------- * ACK code-generator `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.36.0) * ACK runtime `v0.36.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.36.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.8` to `v0.0.9` Once this PR is merged, release `v0.0.9` will be automatically created for `efs-controller` **Please close this PR, if you do not want the new patch release for `efs-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building efs-controller ==== Copying common custom resource definitions into efs Building Kubernetes API objects for efs Generating deepcopy code for efs Generating custom resource definitions for efs Building service controller for efs Generating RBAC manifests for efs Running gofmt against generated code for efs Updating additional GitHub repository maintenance files ==== building efs-controller release artifacts ==== Building release artifacts for efs-v0.0.9 Generating common custom resource definitions Generating custom resource definitions for efs Generating RBAC manifests for efs ``` ---------- 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: "2024-07-19T22:52:15Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:45:29Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
+  version: v0.36.0
 api_directory_checksum: 3dac0a046021e0a9f5828ed93eb269ab4d4420a0
 api_version: v1alpha1
 aws_sdk_go_version: v1.50.0
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/efs-controller
-  newTag: 0.0.8
+  newTag: 0.0.9
diff --git a/config/crd/bases/efs.services.k8s.aws_accesspoints.yaml b/config/crd/bases/efs.services.k8s.aws_accesspoints.yaml
@@ -81,6 +81,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               posixUser:
diff --git a/config/crd/bases/efs.services.k8s.aws_filesystems.yaml b/config/crd/bases/efs.services.k8s.aws_filesystems.yaml
@@ -161,6 +161,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               lifecyclePolicies:
diff --git a/config/crd/bases/efs.services.k8s.aws_mounttargets.yaml b/config/crd/bases/efs.services.k8s.aws_mounttargets.yaml
@@ -90,6 +90,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               ipAddress:
@@ -110,6 +112,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array
@@ -138,6 +142,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             type: object
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.5
 require (
 	github.com/aws-controllers-k8s/ec2-controller v1.2.2
 	github.com/aws-controllers-k8s/kms-controller v1.0.9
-	github.com/aws-controllers-k8s/runtime v0.35.0
+	github.com/aws-controllers-k8s/runtime v0.36.0
 	github.com/aws/aws-sdk-go v1.49.24
 	github.com/go-logr/logr v1.4.1
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/ec2-controller v1.2.2 h1:ek/cGd76XTWQXe6185nxrmEm
 github.com/aws-controllers-k8s/ec2-controller v1.2.2/go.mod h1:4e2L1aHo1fk3ihVTRmnhA6VJ2NSSoYPEf1GZNYYPwLw=
 github.com/aws-controllers-k8s/kms-controller v1.0.9 h1:GZHSnuZBoWp9r6RaJ3siyDn5BRhDuaZJXtdBKeAiLSw=
 github.com/aws-controllers-k8s/kms-controller v1.0.9/go.mod h1:Pnz0d5sly7dUgmYMDJWSRIKASOujJFi/b8N2q1qCLqU=
-github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
-github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
+github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
+github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
 github.com/aws/aws-sdk-go v1.49.24 h1:2ekq9ZvaoB2aRbTDfARzgVGUBB9N8XD2QYhFmTBlp+c=
 github.com/aws/aws-sdk-go v1.49.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: efs-chart
 description: A Helm chart for the ACK service controller for Amazon Elastic File System (EFS)
-version: 0.0.8
-appVersion: 0.0.8
+version: 0.0.9
+appVersion: 0.0.9
 home: https://github.com/aws-controllers-k8s/efs-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/helm/crds/efs.services.k8s.aws_accesspoints.yaml b/helm/crds/efs.services.k8s.aws_accesspoints.yaml
@@ -81,6 +81,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               posixUser:
diff --git a/helm/crds/efs.services.k8s.aws_filesystems.yaml b/helm/crds/efs.services.k8s.aws_filesystems.yaml
@@ -161,6 +161,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               lifecyclePolicies:
diff --git a/helm/crds/efs.services.k8s.aws_mounttargets.yaml b/helm/crds/efs.services.k8s.aws_mounttargets.yaml
@@ -90,6 +90,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               ipAddress:
@@ -110,6 +112,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array
@@ -138,6 +142,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             type: object
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/efs-controller:0.0.8".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/efs-controller:0.0.9".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -219,4 +219,13 @@ rules:
   - get
   - patch
   - update
-{{- end }}
+{{- end }}
+
+{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
+{{- define "ack-efs-controller.feature-gates" -}}
+{{- $list := list -}}
+{{- range $k, $v := .Values.featureGates -}}
+{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
+{{- end -}}
+{{ join "," $list }}
+{{- end -}}
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -79,6 +79,10 @@ spec:
 {{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
         - --reconcile-resource-max-concurrent-syncs
         - "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
+{{- end }}
+{{- if .Values.featureGates}}
+        - --feature-gates
+        - "$(FEATURE_GATES)"
 {{- end }}
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -122,6 +126,10 @@ spec:
 {{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
         - name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
           value: {{ $key }}={{ $value }}
+{{- end }}
+{{- if .Values.featureGates}}
+        - name: FEATURE_GATES
+          value: {{ include "ack-efs-controller.feature-gates" . }}
 {{- end }}
         {{- if .Values.aws.credentials.secretName }}
         - name: AWS_SHARED_CREDENTIALS_FILE
diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -268,6 +268,13 @@
       "type": "object"
     }
   },
+  "featureGates": {
+    "description": "Feature gates settings",
+    "type": "object",
+    "additionalProperties": {
+      "type": "boolean"
+    }
+  },
   "required": [
     "image",
     "deployment",
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/efs-controller
-  tag: 0.0.8
+  tag: 0.0.9
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -153,3 +153,10 @@ leaderElection:
   # will attempt to use the namespace of the service account mounted to the Controller
   # pod.
   namespace: ""
+
+# Configuration for feature gates.  These are optional controller features that
+# can be individually enabled ("true") or disabled ("false") by adding key/value
+# pairs below.
+featureGates: {}
+  # featureGate1: true
+  # featureGate2: false
diff --git a/pkg/resource/access_point/references.go b/pkg/resource/access_point/references.go
diff --git a/pkg/resource/file_system/references.go b/pkg/resource/file_system/references.go
diff --git a/pkg/resource/mount_target/references.go b/pkg/resource/mount_target/references.go
