Skip to content

Commit 2d3bb6a

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.36.0, code-generator v0.36.0 (#18)
### 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.7` to `v0.0.8` Once this PR is merged, release `v0.0.8` will be automatically created for `ecs-controller` **Please close this PR, if you do not want the new patch release for `ecs-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building ecs-controller ==== Copying common custom resource definitions into ecs Building Kubernetes API objects for ecs Generating deepcopy code for ecs Generating custom resource definitions for ecs Building service controller for ecs Generating RBAC manifests for ecs Running gofmt against generated code for ecs Updating additional GitHub repository maintenance files ==== building ecs-controller release artifacts ==== Building release artifacts for ecs-v0.0.8 Generating common custom resource definitions Generating custom resource definitions for ecs Generating RBAC manifests for ecs ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 2696e3d commit 2d3bb6a

16 files changed

+79
-22
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-07-19T22:59:46Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:45:04Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: 2743326128daa01af53d7d6559c5bafe0e811f77
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.50.20

‎config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
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/ecs-controller
9-
newTag: 0.0.7
9+
newTag: 0.0.8

‎config/crd/bases/ecs.services.k8s.aws_services.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ spec:
131131
properties:
132132
name:
133133
type: string
134+
namespace:
135+
type: string
134136
type: object
135137
type: object
136138
deploymentConfiguration:
@@ -492,6 +494,8 @@ spec:
492494
properties:
493495
name:
494496
type: string
497+
namespace:
498+
type: string
495499
type: object
496500
type: object
497501
schedulingStrategy:
@@ -827,6 +831,8 @@ spec:
827831
properties:
828832
name:
829833
type: string
834+
namespace:
835+
type: string
830836
type: object
831837
type: object
832838
volumeConfigurations:

‎config/crd/bases/ecs.services.k8s.aws_taskdefinitions.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,8 @@ spec:
11881188
properties:
11891189
name:
11901190
type: string
1191+
namespace:
1192+
type: string
11911193
type: object
11921194
type: object
11931195
volumes:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/aws-controllers-k8s/iam-controller v1.3.4
9-
github.com/aws-controllers-k8s/runtime v0.35.0
9+
github.com/aws-controllers-k8s/runtime v0.36.0
1010
github.com/aws/aws-sdk-go v1.50.20
1111
github.com/go-logr/logr v1.4.1
1212
github.com/spf13/pflag v1.0.5

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/aws-controllers-k8s/iam-controller v1.3.4 h1:C/CgvJQb6I6mtjgV10FtyWq81S6IhNG+dF4+mjxANEY=
22
github.com/aws-controllers-k8s/iam-controller v1.3.4/go.mod h1:8S4IXeK3Y9HABtSwy0Y8X/iBmBH1L/ab1D1cZ0YVlg0=
3-
github.com/aws-controllers-k8s/runtime v0.35.0 h1:kLRLFOAcaFJRv/aEiWtb0qhlxFpwvmx6shCWNc1Tuas=
4-
github.com/aws-controllers-k8s/runtime v0.35.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
3+
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
4+
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
55
github.com/aws/aws-sdk-go v1.50.20 h1:xfAnSDVf/azIWTVQXQODp89bubvCS85r70O3nuQ4dnE=
66
github.com/aws/aws-sdk-go v1.50.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
77
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: ecs-chart
33
description: A Helm chart for the ACK service controller for Amazon Elastic Container Service (ECS)
4-
version: 0.0.7
5-
appVersion: 0.0.7
4+
version: 0.0.8
5+
appVersion: 0.0.8
66
home: https://github.com/aws-controllers-k8s/ecs-controller
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

‎helm/crds/ecs.services.k8s.aws_services.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ spec:
131131
properties:
132132
name:
133133
type: string
134+
namespace:
135+
type: string
134136
type: object
135137
type: object
136138
deploymentConfiguration:
@@ -492,6 +494,8 @@ spec:
492494
properties:
493495
name:
494496
type: string
497+
namespace:
498+
type: string
495499
type: object
496500
type: object
497501
schedulingStrategy:
@@ -827,6 +831,8 @@ spec:
827831
properties:
828832
name:
829833
type: string
834+
namespace:
835+
type: string
830836
type: object
831837
type: object
832838
volumeConfigurations:

‎helm/crds/ecs.services.k8s.aws_taskdefinitions.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,8 @@ spec:
11881188
properties:
11891189
name:
11901190
type: string
1191+
namespace:
1192+
type: string
11911193
type: object
11921194
type: object
11931195
volumes:

‎helm/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
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/ecs-controller:0.0.7".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/ecs-controller:0.0.8".
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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,13 @@ rules:
191191
- get
192192
- patch
193193
- update
194-
{{- end }}
194+
{{- end }}
195+
196+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
197+
{{- define "ack-ecs-controller.feature-gates" -}}
198+
{{- $list := list -}}
199+
{{- range $k, $v := .Values.featureGates -}}
200+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
201+
{{- end -}}
202+
{{ join "," $list }}
203+
{{- end -}}

‎helm/templates/deployment.yaml

Lines changed: 8 additions & 0 deletions
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-ecs-controller.feature-gates" . }}
125133
{{- end }}
126134
{{- if .Values.aws.credentials.secretName }}
127135
- name: AWS_SHARED_CREDENTIALS_FILE

‎helm/values.schema.json

Lines changed: 7 additions & 0 deletions
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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-controllers-k8s/ecs-controller
7-
tag: 0.0.7
7+
tag: 0.0.8
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/service/references.go

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/resource/task_definition/references.go

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)