Rebase onto v1.4.1 (AL2023 base) - #1
Open
adamlahbib wants to merge 17 commits into
Open
adamlahbib wants to merge 17 commits into
adamlahbib wants to merge 17 commits into
Conversation
…llers-k8s#92) ### Update to ACK runtime `v0.61.0`, code-generator `v0.61.0` ---------- * ACK code-generator `v0.61.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.61.0) * ACK runtime `v0.61.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.61.0) ---------- NOTE: This PR increments the release version of service controller from `v1.3.1` to `v1.3.2` Once this PR is merged, release `v1.3.2` will be automatically created for `kinesis-controller` **Please close this PR, if you do not want the new patch release for `kinesis-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building kinesis-controller ==== Copying common custom resource definitions into kinesis Building Kubernetes API objects for kinesis Generating deepcopy code for kinesis Generating custom resource definitions for kinesis Building service controller for kinesis Running GO mod tidy Generating RBAC manifests for kinesis Running gofmt against generated code for kinesis Updating additional GitHub repository maintenance files ==== building kinesis-controller release artifacts ==== Building release artifacts for kinesis-v1.3.2 Generating common custom resource definitions Generating custom resource definitions for kinesis Generating RBAC manifests for kinesis ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
…llers-k8s#94) ### Update to ACK runtime `v0.62.0`, code-generator `v0.62.0` ---------- * ACK code-generator `v0.62.0` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.62.0) * ACK runtime `v0.62.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.62.0) ---------- NOTE: This PR increments the release version of service controller from `v1.3.2` to `v1.4.0` Once this PR is merged, release `v1.4.0` will be automatically created for `kinesis-controller` **Please close this PR, if you do not want the new patch release for `kinesis-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building kinesis-controller ==== Copying common custom resource definitions into kinesis Building Kubernetes API objects for kinesis Generating deepcopy code for kinesis Generating custom resource definitions for kinesis Building service controller for kinesis Running GO mod tidy Generating RBAC manifests for kinesis Running gofmt against generated code for kinesis Updating additional GitHub repository maintenance files ==== building kinesis-controller release artifacts ==== Building release artifacts for kinesis-v1.4.0 Generating common custom resource definitions Generating custom resource definitions for kinesis Generating RBAC manifests for kinesis ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
…llers-k8s#96) ### Update to ACK runtime `v0.62.0`, code-generator `v0.62.1` ---------- * ACK code-generator `v0.62.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.62.1) * ACK runtime `v0.62.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.62.0) ---------- NOTE: This PR increments the release version of service controller from `v1.4.0` to `v1.4.1` Once this PR is merged, release `v1.4.1` will be automatically created for `kinesis-controller` **Please close this PR, if you do not want the new patch release for `kinesis-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building kinesis-controller ==== Copying common custom resource definitions into kinesis Building Kubernetes API objects for kinesis Generating deepcopy code for kinesis Generating custom resource definitions for kinesis Building service controller for kinesis Running GO mod tidy Generating RBAC manifests for kinesis Running gofmt against generated code for kinesis Updating additional GitHub repository maintenance files ==== building kinesis-controller release artifacts ==== Building release artifacts for kinesis-v1.4.1 Generating common custom resource definitions Generating custom resource definitions for kinesis Generating RBAC manifests for kinesis ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Retention period and KMS encryption are not part of CreateStream, so they are exposed as settable Spec inputs (desiredRetentionPeriodHours, desiredEncryptionType, encryptionKeyARN) applied via Increase/Decrease StreamRetentionPeriod and Start/StopStreamEncryption in the update path. The observed values remain in Status (retentionPeriodHours, encryptionType, keyID). A KMS key ARN is required so the observed key matches the desired value and the stream is not re-encrypted on every reconcile. Resolves aws-controllers-k8s/community#2420 (cherry picked from commit 5016638)
adamlahbib
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rebases
custom-docker-build-2(13 commits) onto upstream v1.4.1.Context: AWS Inspector flags the image built from the old branch head (
avilabs/aws-controllers-k8s:kinesis-v1.3.1-13-g93becec) as Amazon Linux 2 End Of Life — the runtime base was AL2-based when it was built. Rebasing onto current upstream and rebuilding with the current build args (go 1.26.5, eks-distro2026-07-14-1784055682.2023) moves it to AL2023.apis/v1alpha1/ack-generate-metadata.yaml(generated codegen metadata), resolved by keeping the v1.4.1 side each time.kinesis-v1.4.1-13-gfc3406fis already built from this branch and pushed to our ECR; the monorepo tag bump references it.custom-docker-build-2to this branch instead of merging, since it's a rebase.Upstream PRs this fork exists for: aws-controllers-k8s#89 and aws-controllers-k8s#91 (still open).