Skip to content

Commit 99d74b8

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.36.0, code-generator v0.36.0 (#82)
### 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.
1 parent 72df757 commit 99d74b8

28 files changed

+142
-40
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-07-19T22:53:36Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:39:12Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: 1ec0ec190e4702c6e71245aba52bf8119d32641a
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

‎config/controller/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller
9-
newTag: 1.0.14
9+
newTag: 1.0.15

‎config/crd/bases/apigatewayv2.services.k8s.aws_apimappings.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
domainName:
@@ -77,6 +79,8 @@ spec:
7779
properties:
7880
name:
7981
type: string
82+
namespace:
83+
type: string
8084
type: object
8185
type: object
8286
stage:

‎config/crd/bases/apigatewayv2.services.k8s.aws_authorizers.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
authorizerCredentialsARN:

‎config/crd/bases/apigatewayv2.services.k8s.aws_deployments.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ spec:
5959
properties:
6060
name:
6161
type: string
62+
namespace:
63+
type: string
6264
type: object
6365
type: object
6466
description:

‎config/crd/bases/apigatewayv2.services.k8s.aws_integrations.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
connectionID:
@@ -75,6 +77,8 @@ spec:
7577
properties:
7678
name:
7779
type: string
80+
namespace:
81+
type: string
7882
type: object
7983
type: object
8084
connectionType:

‎config/crd/bases/apigatewayv2.services.k8s.aws_routes.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
authorizationScopes:
@@ -83,6 +85,8 @@ spec:
8385
properties:
8486
name:
8587
type: string
88+
namespace:
89+
type: string
8690
type: object
8791
type: object
8892
modelSelectionExpression:
@@ -122,6 +126,8 @@ spec:
122126
properties:
123127
name:
124128
type: string
129+
namespace:
130+
type: string
125131
type: object
126132
type: object
127133
required:

‎config/crd/bases/apigatewayv2.services.k8s.aws_stages.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ spec:
6868
properties:
6969
name:
7070
type: string
71+
namespace:
72+
type: string
7173
type: object
7274
type: object
7375
autoDeploy:
@@ -105,6 +107,8 @@ spec:
105107
properties:
106108
name:
107109
type: string
110+
namespace:
111+
type: string
108112
type: object
109113
type: object
110114
description:

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.35.0
8+
github.com/aws-controllers-k8s/runtime v0.36.0
99
github.com/aws/aws-sdk-go v1.49.0
1010
github.com/go-logr/logr v1.4.1
1111
github.com/google/go-cmp v0.6.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
2-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
1+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
2+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
33
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
44
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
55
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: apigatewayv2-chart
33
description: A Helm chart for the ACK service controller for Amazon API Gateway (APIGWv2)
4-
version: 1.0.14
5-
appVersion: 1.0.14
4+
version: 1.0.15
5+
appVersion: 1.0.15
66
home: https://github.com/aws-controllers-k8s/apigatewayv2-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/apigatewayv2.services.k8s.aws_apimappings.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
domainName:
@@ -77,6 +79,8 @@ spec:
7779
properties:
7880
name:
7981
type: string
82+
namespace:
83+
type: string
8084
type: object
8185
type: object
8286
stage:

‎helm/crds/apigatewayv2.services.k8s.aws_authorizers.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
authorizerCredentialsARN:

‎helm/crds/apigatewayv2.services.k8s.aws_deployments.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ spec:
5959
properties:
6060
name:
6161
type: string
62+
namespace:
63+
type: string
6264
type: object
6365
type: object
6466
description:

‎helm/crds/apigatewayv2.services.k8s.aws_integrations.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
properties:
5959
name:
6060
type: string
61+
namespace:
62+
type: string
6163
type: object
6264
type: object
6365
connectionID:
@@ -75,6 +77,8 @@ spec:
7577
properties:
7678
name:
7779
type: string
80+
namespace:
81+
type: string
7882
type: object
7983
type: object
8084
connectionType:

‎helm/crds/apigatewayv2.services.k8s.aws_routes.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ spec:
6060
properties:
6161
name:
6262
type: string
63+
namespace:
64+
type: string
6365
type: object
6466
type: object
6567
authorizationScopes:
@@ -83,6 +85,8 @@ spec:
8385
properties:
8486
name:
8587
type: string
88+
namespace:
89+
type: string
8690
type: object
8791
type: object
8892
modelSelectionExpression:
@@ -122,6 +126,8 @@ spec:
122126
properties:
123127
name:
124128
type: string
129+
namespace:
130+
type: string
125131
type: object
126132
type: object
127133
required:

‎helm/crds/apigatewayv2.services.k8s.aws_stages.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ spec:
6868
properties:
6969
name:
7070
type: string
71+
namespace:
72+
type: string
7173
type: object
7274
type: object
7375
autoDeploy:
@@ -105,6 +107,8 @@ spec:
105107
properties:
106108
name:
107109
type: string
110+
namespace:
111+
type: string
108112
type: object
109113
type: object
110114
description:

‎helm/templates/NOTES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ .Chart.Name }} has been installed.
2-
This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.14".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller:1.0.15".
33

44
Check its status by running:
55
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"

‎helm/templates/_helpers.tpl

+10-1
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,13 @@ rules:
297297
- get
298298
- patch
299299
- update
300-
{{- end }}
300+
{{- end }}
301+
302+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
303+
{{- define "ack-apigatewayv2-controller.feature-gates" -}}
304+
{{- $list := list -}}
305+
{{- range $k, $v := .Values.featureGates -}}
306+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
307+
{{- end -}}
308+
{{ join "," $list }}
309+
{{- end -}}

‎helm/templates/deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ spec:
7979
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
8080
- --reconcile-resource-max-concurrent-syncs
8181
- "$(RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }})"
82+
{{- end }}
83+
{{- if .Values.featureGates}}
84+
- --feature-gates
85+
- "$(FEATURE_GATES)"
8286
{{- end }}
8387
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
8488
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -122,6 +126,10 @@ spec:
122126
{{- range $key, $value := .Values.reconcile.resourceMaxConcurrentSyncs }}
123127
- name: RECONCILE_RESOURCE_MAX_CONCURRENT_SYNCS_{{ $key | upper }}
124128
value: {{ $key }}={{ $value }}
129+
{{- end }}
130+
{{- if .Values.featureGates}}
131+
- name: FEATURE_GATES
132+
value: {{ include "ack-apigatewayv2-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

+7
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,13 @@
268268
"type": "object"
269269
}
270270
},
271+
"featureGates": {
272+
"description": "Feature gates settings",
273+
"type": "object",
274+
"additionalProperties": {
275+
"type": "boolean"
276+
}
277+
},
271278
"required": [
272279
"image",
273280
"deployment",

‎helm/values.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/apigatewayv2-controller
7-
tag: 1.0.14
7+
tag: 1.0.15
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

@@ -153,3 +153,10 @@ leaderElection:
153153
# will attempt to use the namespace of the service account mounted to the Controller
154154
# pod.
155155
namespace: ""
156+
157+
# Configuration for feature gates. These are optional controller features that
158+
# can be individually enabled ("true") or disabled ("false") by adding key/value
159+
# pairs below.
160+
featureGates: {}
161+
# featureGate1: true
162+
# featureGate2: false

‎pkg/resource/api_mapping/references.go

+10-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)