Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Conditionally set TF aws_s3_object SSE and ACLs #16818

Merged
merged 2 commits into from
Sep 7, 2024

Conversation

rifelpet
Copy link
Member

@rifelpet rifelpet commented Sep 7, 2024

We used to set SSE to an empty string, now we leave it unset. This should fix this failing job.

�[31m│ �[31mError: expected server_side_encryption to be one of ["AES256" "aws:kms" "aws:kms:dsse"], got 
�[31m│ 
�[31m│   with aws_s3_object.cluster-completed-spec,
�[31m│   on kubernetes.tf line 1104, in resource "aws_s3_object" "cluster-completed-spec":
�[31m│ 1104:   server_side_encryption = ""
�[31m│ 
�[31m╵
�[31m│ �[31mError: expected acl to be one of ["private" "public-read" "public-read-write" "authenticated-read" "aws-exec-read" "bucket-owner-read" "bucket-owner-full-control"], got 
�[31m│ 
�[31m│   with aws_s3_object.e2e-e2e-kops-scenario-ipv6-terraform-test-cncf-aws-k8s-io-addons-bootstrap,
�[31m│   on kubernetes.tf line 1135, in resource "aws_s3_object" "e2e-e2e-kops-scenario-ipv6-terraform-test-cncf-aws-k8s-io-addons-bootstrap":
�[31m│ 1135:   acl                    = ""
�[31m│  

Also attempting to keep the generated terraform files in job artifacts for easier troubleshooting.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 7, 2024
@rifelpet
Copy link
Member Author

rifelpet commented Sep 7, 2024

/test pull-kops-e2e-aws-terraform

@rifelpet
Copy link
Member Author

rifelpet commented Sep 7, 2024

Confirmed the file is being saved in artifacts and the fields are no longer set to empty strings:

https://storage.googleapis.com/kubernetes-jenkins/pr-logs/pull/kops/16818/pull-kops-e2e-aws-terraform/1832451965536178176/artifacts/terraform/kubernetes.tf

/cc @hakman

@k8s-ci-robot k8s-ci-robot requested a review from hakman September 7, 2024 17:59
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 7, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2024
@k8s-ci-robot k8s-ci-robot merged commit 58667d0 into kubernetes:master Sep 7, 2024
25 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Sep 7, 2024
k8s-ci-robot added a commit that referenced this pull request Sep 14, 2024
…18-origin-release-1.30

Automated cherry pick of #16818: Conditionally set TF aws_s3_object SSE and ACLs
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants