CFE-617: Rebase v2.4.4 #11

thejasn · 2022-10-13T12:03:35Z

Description

Rebase controller to v2.4.4. Steps followed.

git checkout -b rebase-2.4.4 v2.4.4
git merge -s ours openshift/main
Compared diff before and after merge using git diff openshift/main v2.4.4 [Diff is the same]

Note:

upstream set to https://github.com/kubernetes-sigs/aws-load-balancer-controller
openshift set to https://github.com/openshift/aws-load-balancer-controller
Rebase PR breakdown: https://docs.google.com/document/d/1GONQ3rEkGzQx6SLvkb928eLdbQO4P-wI5qpxLk_oC88

The example ingress does not use any annotations.

* fix formatting * another formatting fix

* Misc minor fixes to docs * more fixes

* Auto generate CRDs for the Helm chart Co-authored-by: Fawad Khaliq <fawadkh@amazon.com> * Makefile changes * fix kustomize install Co-authored-by: Fawad Khaliq <fawadkh@amazon.com>

…ubernetes-sigs#2575) * adding support for topologySpreadConstraints * update readme

…empty map (kubernetes-sigs#2576) * adding support to set affinity in podSpec to the empty map * remove typo * updated readme Co-authored-by: Kishor Joshi <joshikis@amazon.com>

…espace check namespace when update pod condition for deleted TGB

Signed-off-by: thejasn <thn@redhat.com>

…s enabled

* sort ingress rules by path length * add unit test * sort paths instead of sorting rules directly * update sorting strategy

…2610)

Updated deployment for prometheus.io annotations when sericeMonitor i…

…-only-ingress Added feature gate to restrict to only ingress resources

Format `clusterSecretsPermissions.allowAllSecrets` as the setting was bit hidden in the text. Also see - awsdocs/amazon-eks-user-guide#553

Signed-off-by: krrrr38 <k.kaizu38@gmail.com>

* fix log level * Update pkg/backend/endpoint_resolver.go Co-authored-by: Kishor Joshi <joshikis@amazon.com>

* feat: add optional service monitor namespace * namespace to None

…es-sigs#2624) * Add option for imagePullSecrets on service account * Make default imagePullSecrets empty * Update helm/aws-load-balancer-controller/values.yaml * Update helm/aws-load-balancer-controller/values.yaml Co-authored-by: Kishor Joshi <joshikis@amazon.com>

This commit relaxes the restrictions around the `group.order` annotation, allowing both negative and duplicate orders. Duplicate orders are sorted lexicographically.

openshift-ci · 2022-10-27T19:13:49Z

@thejasn: 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.

Miciah · 2022-11-02T15:54:29Z

/assign

candita · 2022-11-02T16:16:14Z

/assign @gcs278

gcs278 · 2022-11-03T14:54:42Z

Should we disable the IP mode since this feature gate is available upstream?

I'm a bit confused by this, maybe I'm misunderstanding. We pull an upstream commit to enable this feature-gate (which defaults to true) and now the rebase pulls in that feature gate (which defaults to true). Why would we need to do anything differently other than just dropping the carry now that it's in our rebase?

gcs278 · 2022-11-03T14:55:45Z

Should we disable the reconciliation of the services since they are not needed for the moment?

Does it do any harm to leave it enabled?

thejasn · 2022-11-04T07:32:53Z

Should we disable the IP mode since this feature gate is available upstream?

I'm a bit confused by this, maybe I'm misunderstanding. We pull an upstream commit to enable this feature-gate (which defaults to true) and now the rebase pulls in that feature gate (which defaults to true). Why would we need to do anything differently other than just dropping the carry now that it's in our rebase?

So target-type=ip is not supported on Openshift since it requires AWS VPC CNI and prior to the upstream patch which added EnableIPTargetType feature gate there was no error on the controller when target-type was set to ip on Openshift. So the feature gate allows us to disable this target-type which in turns gives an explicit error Unsupported target-type=ip.
The follow up PR on the operator is openshift/aws-load-balancer-operator#80

thejasn · 2022-11-04T07:34:56Z

Should we disable the reconciliation of the services since they are not needed for the moment?

Does it do any harm to leave it enabled?

No, we decided we will allow reconciliation of Services as is and just document that the operator will support Service type resources as well by creating NLBs for them. Docs PR for the same.

gcs278 · 2022-11-07T15:56:26Z

Looks good to me after reading through all of the changes, but since it's already approved, and a LGTM would merge it, @Miciah do you have any concerns or want a chance to review before I LGTM it?

thejasn · 2022-11-07T16:02:14Z

/hold for @Miciah to review.

gcs278 · 2022-11-07T16:13:24Z

Thanks I forgot about lgtm and hold.
/lgtm

Miciah · 2022-11-11T03:03:27Z

/lgtm
/hold cancel

xenolinux · 2022-11-14T11:52:28Z

/label docs-approved

thejasn · 2022-11-14T11:53:18Z

/assign @lihongan

lihongan · 2022-11-15T01:56:41Z

/label qe-approved

thejasn · 2022-11-15T05:39:20Z

/label px-approved

As per Chris Fields: the docs are enough for this release of AWS Load Balancer Operator.

kishorj and others added 30 commits March 18, 2022 15:49

documentation updates for v2.4.1 (kubernetes-sigs#2562)

b564cef

docs cleanup in ingress spec (kubernetes-sigs#2565)

7f2555f

The example ingress does not use any annotations.

minor fix (kubernetes-sigs#2566)

51fe6ee

fix formatting (kubernetes-sigs#2567)

8b473b4

* fix formatting * another formatting fix

Misc minor fixes to docs (kubernetes-sigs#2568)

9604877

* Misc minor fixes to docs * more fixes

fix default value in the service annotation doc (kubernetes-sigs#2569)

1646a0d

Auto generate CRDs for the Helm chart (kubernetes-sigs#2517)

ab09d23

* Auto generate CRDs for the Helm chart Co-authored-by: Fawad Khaliq <fawadkh@amazon.com> * Makefile changes * fix kustomize install Co-authored-by: Fawad Khaliq <fawadkh@amazon.com>

Update migrate_v1_v2.md (kubernetes-sigs#2573)

f014735

separate target for helm chart crds generation (kubernetes-sigs#2577)

118513a

adding optional support for topologySpreadConstraints to helm chart (k…

81e52ac

…ubernetes-sigs#2575) * adding support for topologySpreadConstraints * update readme

helm chart update ; adding support to set affinity in podSpec to the …

88b6bdc

…empty map (kubernetes-sigs#2576) * adding support to set affinity in podSpec to the empty map * remove typo * updated readme Co-authored-by: Kishor Joshi <joshikis@amazon.com>

check namespace when update pod condition for deleted TGB

4c33010

Merge pull request kubernetes-sigs#2585 from oliviassss/check-TGB-nam…

b5c8905

…espace check namespace when update pod condition for deleted TGB

added EnableServiceController feature gate to controller

f0e348e

Signed-off-by: thejasn <thn@redhat.com>

Updated deployment for prometheus.io annotations when sericeMonitor i…

c9675c4

…s enabled

Sort ingress rules by path length and pathType (kubernetes-sigs#2409)

ebe1a05

* sort ingress rules by path length * add unit test * sort paths instead of sorting rules directly * update sorting strategy

[minor] - print the env variable name in the output (kubernetes-sigs#…

b614afa

…2610)

Merge pull request kubernetes-sigs#2606 from tamboliasir1/issue-2601

c1b9579

Updated deployment for prometheus.io annotations when sericeMonitor i…

Merge pull request kubernetes-sigs#2579 from thejasn/feature/restrict…

f6735b5

…-only-ingress Added feature gate to restrict to only ingress resources

Format clusterSecretsPermissions.allowAllSecrets (kubernetes-sigs#2620)

dd57d47

Format `clusterSecretsPermissions.allowAllSecrets` as the setting was bit hidden in the text. Also see - awsdocs/amazon-eks-user-guide#553

helm: add deployment annotation (kubernetes-sigs#2611)

e4351bb

Signed-off-by: krrrr38 <k.kaizu38@gmail.com>

fix log level (kubernetes-sigs#2598)

4fdf113

* fix log level * Update pkg/backend/endpoint_resolver.go Co-authored-by: Kishor Joshi <joshikis@amazon.com>

Add additionalLabels to all components (kubernetes-sigs#2618)

cdbeef6

feat: add optional service monitor namespace (kubernetes-sigs#2609)

b065b69

* feat: add optional service monitor namespace * namespace to None

add flag to configure dualstack lb

6d3ce75

Migrate to ginkgo v2 (kubernetes-sigs#2639)

8065307

Allow negative and duplicate group.orders (kubernetes-sigs#2634)

02e9887

This commit relaxes the restrictions around the `group.order` annotation, allowing both negative and duplicate orders. Duplicate orders are sorted lexicographically.

update tests for multi path backend

9a09a70

Merge branch 'main' into ipv6-e2e

9868777

openshift-ci bot assigned Miciah Nov 2, 2022

openshift-ci bot assigned gcs278 Nov 2, 2022

thejasn mentioned this pull request Nov 3, 2022

[WIP] Testing rebase 2.4.4 [DO NOT MERGE] openshift/aws-load-balancer-operator#76

Closed

thejasn changed the title ~~[WIP] CFE-617: Rebase v2.4.4~~ CFE-617: Rebase v2.4.4 Nov 3, 2022

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 3, 2022

thejasn mentioned this pull request Nov 7, 2022

CFE-648: Upgrade aws load balancer controller to v2.4.4 openshift/aws-load-balancer-operator#79

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 Nov 7, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2022

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

openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Nov 14, 2022

openshift-ci bot assigned lihongan Nov 14, 2022

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 15, 2022

openshift-ci bot added the px-approved Signifies that Product Support has signed off on this PR label Nov 15, 2022

openshift-merge-robot merged commit 2c04703 into openshift:main Nov 15, 2022

Miciah mentioned this pull request Nov 25, 2022

AWS Load Balancer Controller: Update build root from repository openshift/release#33552

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CFE-617: Rebase v2.4.4 #11

CFE-617: Rebase v2.4.4 #11

thejasn commented Oct 13, 2022 •

edited

openshift-ci bot commented Oct 27, 2022

Miciah commented Nov 2, 2022

candita commented Nov 2, 2022

gcs278 commented Nov 3, 2022

gcs278 commented Nov 3, 2022

thejasn commented Nov 4, 2022

thejasn commented Nov 4, 2022

gcs278 commented Nov 7, 2022

thejasn commented Nov 7, 2022

gcs278 commented Nov 7, 2022

Miciah commented Nov 11, 2022

xenolinux commented Nov 14, 2022

thejasn commented Nov 14, 2022

lihongan commented Nov 15, 2022

thejasn commented Nov 15, 2022

CFE-617: Rebase v2.4.4 #11

CFE-617: Rebase v2.4.4 #11

Conversation

thejasn commented Oct 13, 2022 • edited

Description

openshift-ci bot commented Oct 27, 2022

Miciah commented Nov 2, 2022

candita commented Nov 2, 2022

gcs278 commented Nov 3, 2022

gcs278 commented Nov 3, 2022

thejasn commented Nov 4, 2022

thejasn commented Nov 4, 2022

gcs278 commented Nov 7, 2022

thejasn commented Nov 7, 2022

gcs278 commented Nov 7, 2022

Miciah commented Nov 11, 2022

xenolinux commented Nov 14, 2022

thejasn commented Nov 14, 2022

lihongan commented Nov 15, 2022

thejasn commented Nov 15, 2022

thejasn commented Oct 13, 2022 •

edited