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

ack-bot · web-flow · commit 99d74b854f97 · 2024-08-07T04:41: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 `v1.0.14` to `v1.0.15` Once this PR is merged, release `v1.0.15` will be automatically created for `apigatewayv2-controller` **Please close this PR, if you do not want the new patch release for `apigatewayv2-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building apigatewayv2-controller ==== Copying common custom resource definitions into apigatewayv2 Building Kubernetes API objects for apigatewayv2 Generating deepcopy code for apigatewayv2 Generating custom resource definitions for apigatewayv2 Building service controller for apigatewayv2 Generating RBAC manifests for apigatewayv2 Running gofmt against generated code for apigatewayv2 Updating additional GitHub repository maintenance files ==== building apigatewayv2-controller release artifacts ==== Building release artifacts for apigatewayv2-v1.0.15 Generating common custom resource definitions Generating custom resource definitions for apigatewayv2 Generating RBAC manifests for apigatewayv2 ``` ---------- 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:53:36Z"
-  build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
+  build_date: "2024-08-06T02:39:12Z"
+  build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
   go_version: go1.22.5
-  version: v0.35.0
+  version: v0.36.0
 api_directory_checksum: 1ec0ec190e4702c6e71245aba52bf8119d32641a
 api_version: v1alpha1
 aws_sdk_go_version: v1.49.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/apigatewayv2-controller
-  newTag: 1.0.14
+  newTag: 1.0.15
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_apimappings.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_apimappings.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               domainName:
@@ -77,6 +79,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               stage:
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_authorizers.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_authorizers.yaml
@@ -58,6 +58,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               authorizerCredentialsARN:
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_deployments.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_deployments.yaml
@@ -59,6 +59,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               description:
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_integrations.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_integrations.yaml
@@ -58,6 +58,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               connectionID:
@@ -75,6 +77,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               connectionType:
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_routes.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_routes.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               authorizationScopes:
@@ -83,6 +85,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               modelSelectionExpression:
@@ -122,6 +126,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             required:
diff --git a/config/crd/bases/apigatewayv2.services.k8s.aws_stages.yaml b/config/crd/bases/apigatewayv2.services.k8s.aws_stages.yaml
@@ -68,6 +68,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               autoDeploy:
@@ -105,6 +107,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               description:
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.5
 
 require (
-	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.0
 	github.com/go-logr/logr v1.4.1
 	github.com/google/go-cmp v0.6.0
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-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.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
 github.com/aws/aws-sdk-go v1.49.0/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: apigatewayv2-chart
 description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2)
-version: 1.0.14
-appVersion: 1.0.14
+version: 1.0.15
+appVersion: 1.0.15
 home: https://github.com/aws-controllers-k8s/apigatewayv2-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_apimappings.yaml b/helm/crds/apigatewayv2.services.k8s.aws_apimappings.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               domainName:
@@ -77,6 +79,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               stage:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_authorizers.yaml b/helm/crds/apigatewayv2.services.k8s.aws_authorizers.yaml
@@ -58,6 +58,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               authorizerCredentialsARN:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_deployments.yaml b/helm/crds/apigatewayv2.services.k8s.aws_deployments.yaml
@@ -59,6 +59,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               description:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_integrations.yaml b/helm/crds/apigatewayv2.services.k8s.aws_integrations.yaml
@@ -58,6 +58,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               connectionID:
@@ -75,6 +77,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               connectionType:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_routes.yaml b/helm/crds/apigatewayv2.services.k8s.aws_routes.yaml
@@ -60,6 +60,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               authorizationScopes:
@@ -83,6 +85,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               modelSelectionExpression:
@@ -122,6 +126,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
             required:
diff --git a/helm/crds/apigatewayv2.services.k8s.aws_stages.yaml b/helm/crds/apigatewayv2.services.k8s.aws_stages.yaml
@@ -68,6 +68,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               autoDeploy:
@@ -105,6 +107,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               description:
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/apigatewayv2-controller:1.0.14".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.15".
 
 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
@@ -297,4 +297,13 @@ rules:
   - get
   - patch
   - update
-{{- end }}
+{{- end }}
+
+{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
+{{- define "ack-apigatewayv2-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-apigatewayv2-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/apigatewayv2-controller
-  tag: 1.0.14
+  tag: 1.0.15
   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/api_mapping/references.go b/pkg/resource/api_mapping/references.go
diff --git a/pkg/resource/authorizer/references.go b/pkg/resource/authorizer/references.go
diff --git a/pkg/resource/deployment/references.go b/pkg/resource/deployment/references.go
diff --git a/pkg/resource/integration/references.go b/pkg/resource/integration/references.go
diff --git a/pkg/resource/route/references.go b/pkg/resource/route/references.go
diff --git a/pkg/resource/stage/references.go b/pkg/resource/stage/references.go
