Skip to content

Commit 261956e

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

File tree

10 files changed

+43
-12
lines changed

10 files changed

+43
-12
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:56:29Z"
3-
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
2+
build_date: "2024-08-06T02:37:22Z"
3+
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
44
go_version: go1.22.5
5-
version: v0.35.0
5+
version: v0.36.0
66
api_directory_checksum: e337526dd1438ddb861e06bd92b5f640ba9ed537
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

‎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/acm-controller
9-
newTag: 0.0.17
9+
newTag: 0.0.18

‎go.mod

Lines changed: 1 addition & 1 deletion
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/spf13/pflag v1.0.5

‎go.sum

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

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

‎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/acm-controller:0.0.17".
2+
This chart deploys "public.ecr.aws/aws-controllers-k8s/acm-controller:0.0.18".
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
@@ -137,4 +137,13 @@ rules:
137137
- get
138138
- patch
139139
- update
140-
{{- end }}
140+
{{- end }}
141+
142+
{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
143+
{{- define "ack-acm-controller.feature-gates" -}}
144+
{{- $list := list -}}
145+
{{- range $k, $v := .Values.featureGates -}}
146+
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
147+
{{- end -}}
148+
{{ join "," $list }}
149+
{{- 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-acm-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/acm-controller
7-
tag: 0.0.17
7+
tag: 0.0.18
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

0 commit comments

Comments
 (0)