Skip to content

NE-1807: Rebase to v2.8.2 #23

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 326 commits into from
Dec 9, 2024

Conversation

alebedev87
Copy link

@alebedev87 alebedev87 commented Sep 11, 2024

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points (from bottom up):

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
    - Openshift built container images should be based on the Universal Base Image.
    - Change the base image from micro to minimal.
        - The micro image does not have the necessary certificates to make requests to AWS API endpo
    - Change golang base image from toolset to ocp builder.
    - OCPBUGS-24653: Ensure FIPS compliance for controller image
        - Replaced the base image with a non-UBI variant.
        - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
    - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

kishorj and others added 30 commits March 24, 2023 15:06
* A few edits.

* Update docs/deploy/subnet_discovery.md

---------

Co-authored-by: Kishor Joshi <[email protected]>
…-sigs#3139)

* generate manifest with service mutator and modify webhook

* Added a flag to include or not include this ServiceMutatorWebhook

* set flag's defualt value to true and modify README doc.
* Add docker-push-w-buildx make target

* Update BASE_IMAGE

Signed-off-by: Ivy Ostosh <[email protected]>

---------

Signed-off-by: Ivy Ostosh <[email protected]>
…Gates samples (kubernetes-sigs#3156)

* chore(aws-load-balancer-controller): add all controllerConfig.featureGates samples

* Update helm/aws-load-balancer-controller/values.yaml

---------

Co-authored-by: Kishor Joshi <[email protected]>
The service mutator and ingressclassparams validator webhooks
ignore the services and the ingressclassparams resources included
in the controller manifest.

The webhook service is of type ClusterIP and need not be mutated
by the webhook. This change resolves the cyclic dependency between
the service and the mutator webhook. In the long term we will use
the `matchConditions` once `AdmissionWebhookMatchConditions` feature
is GA.

As for the `ingressclassparams`, the webhook might not be available
during chart install/upgrade time causing the operation to fail. This
is a short term fix to get backward compatible behavior.
* refactor backend SG provider

* fix ExtractIngresses array append

* make classifiedIngress type satisfy ObjectMetaAccessor

* refactor backend SG provider apis
…3186) (kubernetes-sigs#3193)

* Add support for RGT APIs with feature flag

* revert change in iam policies and refactor tagging manager

* list resrouces by arn in RGT

* handle potential replication in returned RGT resources
@alebedev87
Copy link
Author

alebedev87 commented Oct 18, 2024

  • Squashed Dockerfile.openshift and OWNERS commits
  • Updated the merge to commit to Merge kubernetes-sigs/aws-load-balancer-controller v2.8.2
  • Changed 2.8.2 vendor cherry pick to drop.

The final cherry picks (with squashed commit messages as bullet points):

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
    - Openshift built container images should be based on the Universal Base Image.
    - Change the base image from micro to minimal.
        - The micro image does not have the necessary certificates to make requests to AWS API endpo
    - Change golang base image from toolset to ocp builder.
    - OCPBUGS-24653: Ensure FIPS compliance for controller image
        - Replaced the base image with a non-UBI variant.
        - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
    - Add NetworkEdge team

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points:

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points:

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points:

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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.

@alebedev87
Copy link
Author

alebedev87 commented Oct 18, 2024

  • I think it'd be helpful to provide the git cherry-pick... commands and output, including merge resolutions, and skipped empty commits. The rebase instructions linked are obvious up until you have to actually do the cherry-pick.
    • I see your list of commits, but does that directly translate to a git cherry-pick command? Or is that simply the product of the cherry-pick?

The initial list from the PR description was just a direct order of commits I cherry picked (I don't remember squashing but it's a little fuzzy now). What I just did includes the commit messages of the squashed commits so it should be easy enough to reproduce the exact sequence.

You switched the vendored commit from to . I'm not sure it matters. We the vendor commit in CoreDNS, but you have to regenerate it anyways. may be more obvious that it needs to be regenerated, so I don't know.

I think neither is accurate in this case, we want to carry the vendor directory but with different contents. Right, it used to be <drop> let's continue this way.

What about the comment about the readiness probe ? Is that something done in the aws-load-balancer-operator? Should we have a PR ready-to-go?

Yes, we'll do it in the operator. We already have a wehbook server with this PR there will be another one. Nothing will break without readiness probe, so we can do it later in the operator PR.

… directory

Include the `github.com/golang/mock/mockgen/model` package as an explicit dependency
to support the mockgen utility. This change is necessary due to the rebasing to v2.8.2
and the downstream fork's reliance on the vendor directory for building the controller image in CI.
Without this explicit inclusion, the package lookup fails with the error:
"cannot find module providing package...import lookup disabled by -mod=vendor".
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points:

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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-ci-robot
Copy link

openshift-ci-robot commented Oct 18, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points (from bottom up):

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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.

@alebedev87
Copy link
Author

build10 cluster is experiencing problems: test platform announce.

@alebedev87
Copy link
Author

/retest

Copy link

openshift-ci bot commented Oct 18, 2024

@alebedev87: 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-sigs/prow repository. I understand the commands that are listed here.

@gcs278
Copy link

gcs278 commented Oct 18, 2024

Thanks for the updates. Everything looks good to me. I haven't reviewed every single change with 2.8.2, but since we reviewed the important ones in the meeting, I feel pretty confident. I do recognize that this rebase is inherently risky, given the amount of changes coming in, but it's something we need to do regardless.

/approve
/lgtm

@alebedev87 do you want to wait for @Miciah's review? Remove as you wish.
/hold

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Oct 18, 2024
Copy link

openshift-ci bot commented Oct 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gcs278

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2024
@alebedev87
Copy link
Author

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 4, 2024
@alebedev87
Copy link
Author

/label px-approved
/label docs-approved

The epic has a dedicated docs task.

@openshift-ci openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Dec 4, 2024
@ShudiLi
Copy link
Member

ShudiLi commented Dec 9, 2024

/label qe-approved
I will test it with another alb-operator PR, thanks.

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 9, 2024

@alebedev87: This pull request references NE-1807 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This PR rebases the openshift fork of aws-load-balancer-controller to v2.8.2 tag.

Doc with the analysis: link.
Rebase procedure which has been followed: link.

Initial list of cherry pick commits which were used as a source before squashes (from bottom up):

b84e919ed UPSTREAM <carry>: OCPBUGS-24653: Ensure FIPS compliance for controller image
874c678ff UPSTREAM <carry>: DOWNSTREAN_OWNERS - add NetworkEdge team
d59817b6a UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
bee0499bb UPSTREAM: <carry>: Change golang base image from toolset to ocp builder
b166f9d89 UPSTREAM: <carry>: Switch to UBI for builder image
6617f8aed UPSTREAM: <carry>: Add document with procedure for rebasing
f061bf60c UPSTREAM: <carry>: Change the base image from micro to minimal
93755fc37 UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
654e632a8 UPSTREAM: <carry>: Added downstream owners file

Squashed list of check picks with commit messages added as bullet points (from bottom up):

5b2c3e40b UPSTREAM: <carry>: Add ci_operator.yaml config for build root image
36afae9a2 UPSTREAM: <carry>: Add document with procedure for rebasing
cfba6a7ef UPSTREAM: <carry>: Added Dockerfile used in Openshift builds
   - Openshift built container images should be based on the Universal Base Image.
   - Change the base image from micro to minimal.
       - The micro image does not have the necessary certificates to make requests to AWS API endpo
   - Change golang base image from toolset to ocp builder.
   - OCPBUGS-24653: Ensure FIPS compliance for controller image
       - Replaced the base image with a non-UBI variant.
       - Added the 'strictfipsruntime' tag to the controller binary.
b1b6f182f UPSTREAM: <carry>: Added downstream owners file
   - Add NetworkEdge team

Also, the following carry patches have been added:

Test PR: openshift/aws-load-balancer-operator#136.

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-merge-bot openshift-merge-bot bot merged commit 970ea56 into openshift:main Dec 9, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.