Skip to content

Commit

Permalink
Update to ACK runtime v0.36.0, code-generator v0.36.0 (#131)
Browse files Browse the repository at this point in the history
### 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.13` to `v1.0.14`

Once this PR is merged, release `v1.0.14` will be automatically created for `s3-controller`

**Please close this PR, if you do not want the new patch release for `s3-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building s3-controller ====
Copying common custom resource definitions into s3
Building Kubernetes API objects for s3
Generating deepcopy code for s3
Generating custom resource definitions for s3
Building service controller for s3
Generating RBAC manifests for s3
Running gofmt against generated code for s3
Updating additional GitHub repository maintenance files
==== building s3-controller release artifacts ====
Building release artifacts for s3-v1.0.14
Generating common custom resource definitions
Generating custom resource definitions for s3
Generating RBAC manifests for s3
```

----------

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • Loading branch information
ack-bot authored Aug 7, 2024
1 parent fedc442 commit a3fcd03
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 12 deletions.
6 changes: 3 additions & 3 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-07-19T23:01:14Z"
build_hash: f0a0f42d507c550c2b063a192b3b43e4522bdd9c
build_date: "2024-08-06T02:49:23Z"
build_hash: 587b90dc860e91ee9a763e9e3bc4d3f1b2fbddb7
go_version: go1.22.5
version: v0.35.0
version: v0.36.0
api_directory_checksum: 82bfc8d45e816b2a02a83a4b7cedd72056accddd
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/s3-controller
newTag: 1.0.13
newTag: 1.0.14
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: s3-chart
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
version: 1.0.13
appVersion: 1.0.13
version: 1.0.14
appVersion: 1.0.14
home: https://github.com/aws-controllers-k8s/s3-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:1.0.13".
This chart deploys "public.ecr.aws/aws-controllers-k8s/s3-controller:1.0.14".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
11 changes: 10 additions & 1 deletion helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,13 @@ rules:
- get
- patch
- update
{{- end }}
{{- end }}

{{/* Convert k/v map to string like: "key1=value1,key2=value2,..." */}}
{{- define "ack-s3-controller.feature-gates" -}}
{{- $list := list -}}
{{- range $k, $v := .Values.featureGates -}}
{{- $list = append $list (printf "%s=%s" $k ( $v | toString)) -}}
{{- end -}}
{{ join "," $list }}
{{- end -}}
8 changes: 8 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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-s3-controller.feature-gates" . }}
{{- end }}
{{- if .Values.aws.credentials.secretName }}
- name: AWS_SHARED_CREDENTIALS_FILE
Expand Down
7 changes: 7 additions & 0 deletions helm/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@
"type": "object"
}
},
"featureGates": {
"description": "Feature gates settings",
"type": "object",
"additionalProperties": {
"type": "boolean"
}
},
"required": [
"image",
"deployment",
Expand Down
9 changes: 8 additions & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/s3-controller
tag: 1.0.13
tag: 1.0.14
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down Expand Up @@ -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

0 comments on commit a3fcd03

Please sign in to comment.