OCPCLOUD-2441,OCPBUGS-25565: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.0 (25a0086) into master #499

damdo · 2024-03-01T10:03:35Z

No description provided.

… logger in `With...` methods

Co-authored-by: Andreas Sommer <andreas@giantswarm.io>

…rnally managed replicas

…ing-asg-instance-refresh 🐛 Don't error if ASG is missing when deciding to refresh instances

Pass logger to machine pool scope to get verbosity right, fix copying logger in `With...` methods

…-mixed-instances ✨ Prevent users setting values that are invalid configuration on AWS

…d-when-updating-asg-with-external-scaler 🐛 Update ASG - do not set desired value for machinepool which have externally managed replicas

Co-authored-by: Andreas Sommer <andreas@giantswarm.io>

…Instances is called This mitigates issues caused by falling back to tag-based searching for EC2 instances in case future AWS calls fail, such as attaching ENIs to security groups or tagging ENIs. Signed-off-by: Michael Shen <mishen@umich.edu>

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.386 to 0.1.388. - [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases) - [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md) - [Commits](openshift-online/ocm-sdk-go@v0.1.386...v0.1.388) --- updated-dependencies: - dependency-name: github.com/openshift-online/ocm-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…ot/go_modules/github.com/openshift-online/ocm-sdk-go-0.1.388 🌱 bump github.com/openshift-online/ocm-sdk-go from 0.1.386 to 0.1.388

Copies the structure of the cluster-template-external-cloud-provider.yaml into the default template, with the folloiwng changes. * The following version updates were made: aws-cloud-controller-manager: v1.28.3 CSI driver: v1.25.0 CSI provisioner: v3.6.2 CSI attacher: v4.4.2 CSI resizer: v1.9.2 CSI livenessprobe: v2.11.0 CSI register: v2.9.2 * The CNI references were removed, since the Quickstart lets the user install their own CNI. * Updated the contents of the aws-ccm-external.yaml file based on files in https://github.com/kubernetes/cloud-provider-aws/tree/master/examples/existing-cluster/base. ** Changed `--configure-cloud-routes=false` from the default ** Changed node selector from `node-role.kubernetes.io/master` to `node-role.kubernetes.io/controle-plane`. NOTE: Because this change requires the use of ClusterResourceSet, the Quickstart will need to be updated to include `export EXP_CLUSTER_RESOURCE_SET=true` prior to initializing the management cluster. Signed-off-by: Nolan Brubaker <nolan@nbrubaker.com>

🐛 Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called

Signed-off-by: Richard Case <richard.case@outlook.com>

…nd-asg 🐛 There is no need to check instance refresh if ASG is not found

…ot/github_actions/actions/setup-go-5 🌱 bump actions/setup-go from 4 to 5

🐛 [PROPOSAL] add andreas as a reviewer

…cryption ✨ Enable transit encryption to S3 bucket

…cator-0.6.13 🌱 bump sigs.k8s.io/aws-iam-authenticator from 0.6.12 to 0.6.13

…roup 🐛 chore: update dependabot to group updates

Bumps the dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [kubernetes-sigs/kubebuilder-release-tools](https://github.com/kubernetes-sigs/kubebuilder-release-tools). Updates `github/codeql-action` from 2 to 3 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v2...v3) Updates `kubernetes-sigs/kubebuilder-release-tools` from 0.4.2 to 0.4.3 - [Release notes](https://github.com/kubernetes-sigs/kubebuilder-release-tools/releases) - [Changelog](https://github.com/kubernetes-sigs/kubebuilder-release-tools/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/kubebuilder-release-tools@3c34113...012269a) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: kubernetes-sigs/kubebuilder-release-tools dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: Richard Case <richard.case@outlook.com>

damdo · 2024-03-05T10:55:42Z

Ran this in combination with openshift/cluster-capi-operator#151

launch openshift/cluster-capi-operator#151,openshift/cluster-api-provider-aws#499 aws,techpreview

AWS CAPI E2Es passed successfully:

Cluster API AWS MachineSet should be able to run a machine with a default provider spec
/Users/ddonati/src/cluster-capi-operator/e2e/aws_test.go:62
  STEP: Creating core cluster @ 03/04/24 20:50:37.945
  STEP: Creating AWS cluster @ 03/04/24 20:50:38.617
  STEP: Creating AWS machine template @ 03/04/24 20:50:39.171
  STEP: Creating MachineSet "aws-machineset" @ 03/04/24 20:50:39.366
  STEP: Waiting for MachineSet machines "aws-machineset" to enter Running phase @ 03/04/24 20:50:39.565
  STEP: Deleting MachineSet "aws-machineset" @ 03/04/24 20:55:24.544
  STEP: Waiting for MachineSet "aws-machineset" to be deleted @ 03/04/24 20:55:24.729
  STEP: Deleting /aws-machine-template @ 03/04/24 20:57:29.516
• [412.502 seconds]
------------------------------

Ran 1 of 3 Specs in 413.401 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 2 Skipped
PASS

Ginkgo ran 1 suite in 7m6.607934445s
Test Suite Passed

damdo · 2024-03-05T13:45:33Z

/retest

damdo · 2024-03-05T21:26:42Z

/hold
For controlling the merge

damdo · 2024-03-05T21:35:44Z

/assign @vincepri

vincepri

/lgtm

nrb · 2024-03-06T15:42:51Z

/approve

openshift-ci · 2024-03-06T15:48:10Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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:

~~OWNERS~~ [nrb]

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

damdo · 2024-03-06T16:17:17Z

/retest

damdo · 2024-03-06T16:25:32Z

/retest

damdo · 2024-03-06T16:30:05Z

/tide refresh

damdo · 2024-03-06T16:30:22Z

/unhold

damdo · 2024-03-06T16:33:11Z

/hold

damdo · 2024-03-06T16:34:00Z

/tide refresh

damdo · 2024-03-06T16:41:06Z

/test ci/prow/e2e-aws-capi-techpreview

damdo · 2024-03-06T16:41:22Z

/test ci/prow/e2e-aws-ovn-techpreview

openshift-ci · 2024-03-06T16:46:38Z

@damdo: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-aws-serial
/test e2e-hypershift
/test images
/test unit

The following commands are available to trigger optional jobs:

/test e2e-aws-capi-techpreview
/test e2e-aws-ovn-techpreview
/test verify-commits

Use /test all to run all jobs.

In response to this:

/test ci/prow/e2e-aws-capi-techpreview

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci · 2024-03-06T18:37:57Z

@damdo: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

damdo · 2024-03-06T18:47:52Z

/unhold

openshift-ci-robot · 2024-03-06T18:51:16Z

@damdo: Jira Issue OCPBUGS-25565: Some pull requests linked via external trackers have merged:

openshift/cluster-api-provider-aws#499

The following pull requests linked via external trackers have not merged:

openshift/cluster-api-provider-aws#500 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-25565 has not been moved to the MODIFIED state.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-bot · 2024-03-07T04:07:47Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-aws-cluster-api-controllers-container-v4.16.0-202403070215.p0.g398729c.assembly.stream.el9 for distgit ose-aws-cluster-api-controllers.
All builds following this will include this PR.

Fedosin and others added 30 commits September 12, 2023 22:25

Allow to configure garbage collector using clusterawsadm

3f9bd5b

Pass logger to machine pool scope to get verbosity right, fix copying…

70ada99

… logger in `With...` methods

Prevent users setting values that are invalid configuration on AWS

7d68f6f

Update exp/api/v1beta2/awsmachinepool_webhook.go

99ddc99

Co-authored-by: Andreas Sommer <andreas@giantswarm.io>

Update ASG - do not set desired value for machinepool which have exte…

4d33ed1

…rnally managed replicas

Don't error if ASG is missing when deciding to refresh instances

ccf78b4

Merge pull request kubernetes-sigs#4660 from giantswarm/no-error-miss…

25f8108

…ing-asg-instance-refresh 🐛 Don't error if ASG is missing when deciding to refresh instances

Merge pull request kubernetes-sigs#4620 from AndiDog/fix-logging

a1b6f35

Pass logger to machine pool scope to get verbosity right, fix copying logger in `With...` methods

Merge pull request kubernetes-sigs#4656 from giantswarm/validate-spot…

b4506f8

…-mixed-instances ✨ Prevent users setting values that are invalid configuration on AWS

Merge pull request kubernetes-sigs#4654 from calvix/do-not-set-desire…

c9b9276

…d-when-updating-asg-with-external-scaler 🐛 Update ASG - do not set desired value for machinepool which have externally managed replicas

There is no need to check instance refresh if ASG is not found

d44d5f5

Co-authored-by: Andreas Sommer <andreas@giantswarm.io>

Enable transit encryption to S3 bucket

26ac0d3

🌱 bump sigs.k8s.io/aws-iam-authenticator from 0.6.12 to 0.6.13

e424dfc

Merge pull request kubernetes-sigs#4674 from kubernetes-sigs/dependab…

50f605d

…ot/go_modules/github.com/openshift-online/ocm-sdk-go-0.1.388 🌱 bump github.com/openshift-online/ocm-sdk-go from 0.1.386 to 0.1.388

Merge pull request kubernetes-sigs#4670 from mjlshen/4629-status

5780796

🐛 Update awsmachine providerID and instanceID immediately after ec2:RunInstances is called

Wrap error when failing to get infra provider cluster

d27bc67

chore: add andreas as a reviewer

7bb81c3

Signed-off-by: Richard Case <richard.case@outlook.com>

chore: update dependabot to group updates

ce495de

Signed-off-by: Richard Case <richard.case@outlook.com>

Merge pull request kubernetes-sigs#4662 from giantswarm/ignore-notfou…

f2956f7

…nd-asg 🐛 There is no need to check instance refresh if ASG is not found

Merge pull request kubernetes-sigs#4682 from kubernetes-sigs/dependab…

f6732d1

…ot/github_actions/actions/setup-go-5 🌱 bump actions/setup-go from 4 to 5

Merge pull request kubernetes-sigs#4687 from richardcase/adreas_reviewer

5711479

🐛 [PROPOSAL] add andreas as a reviewer

Merge pull request kubernetes-sigs#4676 from giantswarm/s3-transit-en…

7be1c77

…cryption ✨ Enable transit encryption to S3 bucket

Merge pull request kubernetes-sigs#4679 from AndiDog/aws-iam-authenti…

0cd0b7e

…cator-0.6.13 🌱 bump sigs.k8s.io/aws-iam-authenticator from 0.6.12 to 0.6.13

Merge pull request kubernetes-sigs#4688 from richardcase/dependabot_g…

aa096c4

…roup 🐛 chore: update dependabot to group updates

chore: change the ignore dependabot updates

ebcb40f

Signed-off-by: Richard Case <richard.case@outlook.com>

damdo mentioned this pull request Mar 5, 2024

NO-JIRA: CAPA: use v1beta2 openshift/cluster-capi-operator#151

Merged

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2024

openshift-ci bot assigned vincepri Mar 5, 2024

vincepri approved these changes Mar 6, 2024

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 6, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2024

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2024

openshift-merge-bot bot merged commit 398729c into openshift:master Mar 6, 2024
9 checks passed

damdo mentioned this pull request Mar 12, 2024

NO-JIRA: Include feature gates flag in manifests #489

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPCLOUD-2441,OCPBUGS-25565: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.0 (25a0086) into master #499

OCPCLOUD-2441,OCPBUGS-25565: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.0 (25a0086) into master #499

damdo commented Mar 1, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

vincepri left a comment

nrb commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

damdo commented Mar 6, 2024

openshift-ci-robot commented Mar 6, 2024

openshift-bot commented Mar 7, 2024

OCPCLOUD-2441,OCPBUGS-25565: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.0 (25a0086) into master #499

OCPCLOUD-2441,OCPBUGS-25565: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.4.0 (25a0086) into master #499

Conversation

damdo commented Mar 1, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

damdo commented Mar 5, 2024

vincepri left a comment

Choose a reason for hiding this comment

nrb commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

damdo commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

openshift-ci bot commented Mar 6, 2024

damdo commented Mar 6, 2024

openshift-ci-robot commented Mar 6, 2024

openshift-bot commented Mar 7, 2024