OCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [Backport to 4.13] by candita · Pull Request #1055 · openshift/cluster-ingress-operator

candita · 2024-05-20T19:44:34Z

This is a manual backport of #927 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

- assets/router/service-cloud.yaml:
- assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.
- pkg/manifests/bindata.go: Regenerate.
- pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
- pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.
- pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

- pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.
- pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.
- pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.
- pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.
- pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

…port 4.13] cherry-pick 5579aa1

…port 4.13] git cherry-pick 5579aa1 go mod vendor go mod tidy make generate make update git cherry-pick 6cd3b67 go mod vendor go mod tidy make generate make update Avoid spurious updates for internalTrafficPolicy Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields. Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields. - assets/router/service-cloud.yaml: - assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster. - pkg/manifests/bindata.go: Regenerate. - pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy. - pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster". (Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored. - pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster". (nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy. pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster". (TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored. Ignore updates for null versus empty ennotations Ignore updates to annotations when the update is from null to empty or vice versa. - pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations. - pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal. - pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal. - pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations. - pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

openshift-ci-robot · 2024-05-20T19:44:36Z

@candita: No Jira issue with key OOCPBUGS-33990 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

This is a backport to fix OCPBUGS-33657

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

assets/router/service-cloud.yaml:

assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.

pkg/manifests/bindata.go: Regenerate.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.

pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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 · 2024-05-20T19:45:18Z

@candita: This pull request references Jira Issue OCPBUGS-33990, which is invalid:

expected Jira Issue OCPBUGS-33990 to depend on a bug targeting a version in 4.14.0, 4.14.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is a backport to fix OCPBUGS-33657

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

assets/router/service-cloud.yaml:

assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.

pkg/manifests/bindata.go: Regenerate.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.

pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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 · 2024-05-20T20:00:20Z

@candita: This pull request references Jira Issue OCPBUGS-33990, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.13.z) matches configured target version for branch (4.13.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-13190 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-13190 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0, 4.14.z
bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

This is a manual backport of #927 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

assets/router/service-cloud.yaml:

assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.

pkg/manifests/bindata.go: Regenerate.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.

pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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.

candita · 2024-05-20T23:22:03Z

Test timed out after 1h? Only on AWS?

=== CONT TestAll/serial/TestHostNetworkPortBinding
panic: test timed out after 1h0m0s

goroutine 26147 [running]:
testing.(*M).startAlarm.func1()
/usr/lib/golang/src/testing/testing.go:2036 +0x8e
created by time.goFunc
/usr/lib/golang/src/time/sleep.go:176 +0x32

goroutine 1 [chan receive, 60 minutes]:
testing.(*T).Run(0xc0000e96c0, {0x1c7e535?, 0x525725?}, 0x1db2978)
/usr/lib/golang/src/testing/testing.go:1494 +0x37a
testing.runTests.func1(0xc0009b1a40?)
/usr/lib/golang/src/testing/testing.go:1846 +0x6e
testing.tRunner(0xc0000e96c0, 0xc0009c5bd0)
/usr/lib/golang/src/testing/testing.go:1446 +0x10b
testing.runTests(0xc00063fd60?, {0x2f32a80, 0x56, 0x56}, {0x0?, 0x0?, 0x2fce1e0?})
/usr/lib/golang/src/testing/testing.go:1844 +0x456
testing.(*M).Run(0xc00063fd60)
/usr/lib/golang/src/testing/testing.go:1726 +0x5d9
github.com/openshift/cluster-ingress-operator/test/e2e.TestMain(0xffffffffffffffff?)
/go/src/github.com/openshift/cluster-ingress-operator/test/e2e/operator_test.go:147 +0x2cf
main.main()
_testmain.go:219 +0x1d3

goroutine 24728 [chan receive, 1 minutes]:
testing.tRunner.func1()
/usr/lib/golang/src/testing/testing.go:1412 +0x4a5
testing.tRunner(0xc000776000, 0x1db2960)
/usr/lib/golang/src/testing/testing.go:1452 +0x144
created by testing.(*T).Run
/usr/lib/golang/src/testing/testing.go:1493 +0x35f

candita · 2024-05-20T23:22:56Z

/retest-required

candita · 2024-05-21T21:59:51Z

I'm seeing issues with cluster-dns-operator degraded and machine pools not upgradeable for two (in a row) failures of e2e-aws-operator. One more try.

/test e2e-aws-operator

candita · 2024-05-22T00:21:55Z

Test timed out after 1 hour again. This time, failures seen show these tests are taking 65 minutes:

    --- FAIL: TestAll/parallel/TestMTLSWithCRLs (1657.77s)
        --- FAIL: TestAll/parallel/TestMTLSWithCRLs/certificate-distributes-its-own-crl (329.79s)
        --- FAIL: TestAll/parallel/TestMTLSWithCRLs/certificate-distributes-its-signers-crl (331.54s)
        --- FAIL: TestAll/parallel/TestMTLSWithCRLs/certificate-distributes-its-signers-crl-with-workaround (331.82s)
        --- FAIL: TestAll/parallel/TestMTLSWithCRLs/large-crl (330.75s)
        --- FAIL: TestAll/parallel/TestMTLSWithCRLs/multiple-intermediate-ca (332.73s)
    --- FAIL: TestAll/parallel/TestCRLUpdate (2273.04s)
        --- FAIL: TestAll/parallel/TestCRLUpdate/certificate-distributes-its-own-crl (568.22s)
        --- FAIL: TestAll/parallel/TestCRLUpdate/certificate-distributes-its-signers-crl (567.88s)
        --- FAIL: TestAll/parallel/TestCRLUpdate/certificate-distributes-its-signers-crl-with-workaround (568.29s)
        --- FAIL: TestAll/parallel/TestCRLUpdate/many-CAs-with-signers-crl-workaround (568.62s)

candita · 2024-05-22T00:22:09Z

/test e2e-aws-operator

candita · 2024-05-22T15:39:59Z

/assign @rfredette

melvinjoseph86 · 2024-05-23T06:52:26Z

Verified using pre-image with cluster bot.
melvinjoseph@mjoseph-mac Downloads % oc get clusterversion
oc get po -n openshift-ingress-operatorNAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.13.0-0.ci.test-2024-05-23-055158-ci-ln-flf0fgk-latest True False 18m Cluster version is 4.13.0-0.ci.test-2024-05-23-055158-ci-ln-flf0fgk-latest

After the cluster installation there was no more 'updated internal service' log messages in openshift-ingress-operator logs.
Even after creating a custom nodeport controller and a loadbalncer controller, there was no above log messages. Hence marking as verified.

melvinjoseph86 · 2024-05-23T06:52:31Z

/label qe-approved

openshift-ci-robot · 2024-05-23T06:52:59Z

@candita: This pull request references Jira Issue OCPBUGS-33990, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.13.z) matches configured target version for branch (4.13.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-13190 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-13190 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0, 4.14.z
bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

This is a manual backport of #927 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

assets/router/service-cloud.yaml:

assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.

pkg/manifests/bindata.go: Regenerate.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.

pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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.

melvinjoseph86 · 2024-05-23T06:53:42Z

/test e2e-aws-operator

candita · 2024-05-23T20:54:35Z

Machine config having some issues still

lastTransitionTime: "2024-05-23T08:39:29Z"
message: One or more machine config pools are updating, please see oc get mcp
for further details
reason: PoolUpdating
status: "False"
type: Upgradeable
...

lastTransitionTime: "2024-05-23T07:27:39Z"
message: Cluster has deployed [{operator 4.13.0-0.ci.test-2024-05-23-065902-ci-op-4ksf3cww-latest}]
reason: AsExpected
status: "True"
type: Available
extension:
master: 2 (ready 2) out of 3 nodes are updating to latest configuration rendered-master-07719b5895f484e1d6fca7ead1748d53
worker: all 3 nodes are at latest configuration rendered-worker-469b47da7de2f9a277d7c6cb5a63078e

candita · 2024-05-23T21:38:49Z

Root cause of e2e-aws-operator failures:

util_test.go:727: 2024-05-22 17:10:21 +0000 UTC {kubelet ip-10-0-140-176.ec2.internal} Pod crl-host Failed Failed to pull image "quay.io/centos7/httpd-24-centos7": rpc error: code = Unknown desc = reading manifest latest in quay.io/centos7/httpd-24-centos7: manifest unknown

Need the fix in #1037 to be backported to 4.13.

melvinjoseph86 · 2024-05-27T06:29:44Z

/test e2e-aws-operator

candita · 2024-05-30T20:34:21Z

The fix in #1037 has been backported to 4.13.
/test e2e-aws-operator

candita · 2024-05-30T20:42:59Z

/cherry-pick release-4.12

openshift-cherrypick-robot · 2024-05-30T20:43:02Z

@candita: once the present PR merges, I will cherry-pick it on top of release-4.12 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.12

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.

knobunc · 2024-05-31T15:04:59Z

/label backport-risk-assessed

openshift-ci · 2024-05-31T15:05:02Z

@knobunc: Can not set label backport-risk-assessed: Must be member in one of these teams: []

Details

In response to this:

/label backport-risk-assessed

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.

knobunc · 2024-05-31T15:05:38Z

/approve

rfredette · 2024-05-31T15:07:15Z

/approve
/lgtm
Looks good 👍

openshift-ci · 2024-05-31T15:12:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, rfredette

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [knobunc,rfredette]

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

openshift-ci-robot · 2024-05-31T18:54:19Z

@candita: Jira Issue OCPBUGS-33990: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is a manual backport of #927 to fix OCPBUGS-33657.

git cherry-pick 5579aa1
go mod vendor
go mod tidy
make generate
make update
git cherry-pick 6cd3b67
go mod vendor
go mod tidy
make generate
make update

Avoid spurious updates for internalTrafficPolicy

Specify spec.internalTrafficPolicy on NodePort- and ClusterIP-type services that the operator manages. Also, ignore updates to the spec.ipFamilies and spec.ipFamilyPolicy fields.

Before this PR, the update logic for NodePort- and ClusterIP-type services would try to revert the default values that the API set for these fields.

assets/router/service-cloud.yaml:

assets/router/service-internal.yaml: Specify internalTrafficPolicy: Cluster.

pkg/manifests/bindata.go: Regenerate.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.

pkg/operator/controller/ingress/internal_service_test.go (Test_desiredInternalIngressControllerService): Verify that spec.internalServiceChanged is set to "Cluster".
(Test_internalServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

pkg/operator/controller/ingress/nodeport_service.go (desiredNodePortService): Set spec.internalTrafficPolicy to "Cluster".
(nodePortServiceChanged): Ignore spec.ipFamilies and spec.ipFamilyPolicy.
pkg/operator/controller/ingress/nodeport_service_test.go (TestDesiredNodePortService): Verify that spec.internalTrafficPolicy is set to "Cluster".
(TestNodePortServiceChanged): Verify that changes to spec.internalTrafficPolicy are detected and that changes to spec.ipFamilies and spec.ipFamilyPolicy are ignored.

Ignore updates for null versus empty ennotations
Ignore updates to annotations when the update is from null to empty or vice versa.

pkg/operator/controller/ingress/internal_service.go (internalServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/internal_service_test.go (TestInternalServiceChangedEmptyAnnotations): New test to verify that internalServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/load_balancer_service_test.go (TestLoadBalancerServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

pkg/operator/controller/ingress/nodeport_service.go (nodePortServiceChanged): Use EquateEmpty when comparing annotations.

pkg/operator/controller/ingress/nodeport_service_test.go (TestNodePortServiceChangedEmptyAnnotations): New test to verify that loadBalancerServiceChanged treats empty and null annotations as equal.

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-cherrypick-robot · 2024-05-31T18:55:11Z

@candita: #1055 failed to apply on top of branch "release-4.12":

Applying: OCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [backport 4.13] cherry-pick 5579aa1b3573a4d9479a924a1ae78688e2105c5c
Using index info to reconstruct a base tree...
M	pkg/manifests/bindata.go
M	pkg/operator/controller/ingress/nodeport_service.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/controller/ingress/nodeport_service.go
Auto-merging pkg/manifests/bindata.go
CONFLICT (content): Merge conflict in pkg/manifests/bindata.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [backport 4.13] cherry-pick 5579aa1b3573a4d9479a924a1ae78688e2105c5c
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.12

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.

openshift-ci · 2024-05-31T19:15:23Z

@candita: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

openshift-bot · 2024-05-31T20:07:15Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-ingress-operator-container-v4.13.0-202405311936.p0.gb2bcf29.assembly.stream.el8 for distgit ose-cluster-ingress-operator.
All builds following this will include this PR.

openshift-merge-robot · 2024-06-01T03:17:00Z

Fix included in accepted release 4.13.0-0.nightly-2024-05-31-202348

Miciah added 2 commits May 20, 2024 15:30

OCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [back…

bfda40d

…port 4.13] cherry-pick 5579aa1

openshift-ci bot requested review from alebedev87 and knobunc May 20, 2024 19:45

candita changed the title ~~OOCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [Backport to 4.13]~~ OCPBUGS-33990: Avoid spurious updates for internalTrafficPolicy [Backport to 4.13] May 20, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 20, 2024

openshift-ci bot requested a review from melvinjoseph86 May 20, 2024 20:00

openshift-ci bot assigned rfredette May 22, 2024

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 23, 2024

knobunc added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 31, 2024

openshift-ci bot assigned lihongan, melvinjoseph86 and ShudiLi May 31, 2024

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

knobunc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 31, 2024

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

openshift-merge-bot bot merged commit b2bcf29 into openshift:release-4.13 May 31, 2024

candita mentioned this pull request May 31, 2024

[release-4.12] OCPBUGS-34757: Avoid spurious updates for internalTrafficPolicy #1070

Merged

Miciah mentioned this pull request Jun 5, 2024

[release-4.13] OCPBUGS-34765: Don't add clientca-configmap finalizer if deleting #1073

Merged

Conversation

candita commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented May 20, 2024

Uh oh!

openshift-ci-robot commented May 20, 2024

Uh oh!

openshift-ci-robot commented May 20, 2024

Uh oh!

candita commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

candita commented May 20, 2024

Uh oh!

candita commented May 21, 2024

Uh oh!

candita commented May 22, 2024

Uh oh!

candita commented May 22, 2024

Uh oh!

candita commented May 22, 2024

Uh oh!

melvinjoseph86 commented May 23, 2024

Uh oh!

melvinjoseph86 commented May 23, 2024

Uh oh!

openshift-ci-robot commented May 23, 2024

Uh oh!

melvinjoseph86 commented May 23, 2024

Uh oh!

candita commented May 23, 2024

Uh oh!

candita commented May 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvinjoseph86 commented May 27, 2024

Uh oh!

candita commented May 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

candita commented May 30, 2024

Uh oh!

openshift-cherrypick-robot commented May 30, 2024

Uh oh!

knobunc commented May 31, 2024

Uh oh!

openshift-ci bot commented May 31, 2024

Uh oh!

knobunc commented May 31, 2024

Uh oh!

rfredette commented May 31, 2024

Uh oh!

openshift-ci bot commented May 31, 2024

Uh oh!

openshift-ci-robot commented May 31, 2024

Uh oh!

openshift-cherrypick-robot commented May 31, 2024

Uh oh!

openshift-ci bot commented May 31, 2024

Uh oh!

openshift-bot commented May 31, 2024

Uh oh!

openshift-merge-robot commented Jun 1, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

candita commented May 20, 2024 •

edited

Loading

candita commented May 20, 2024 •

edited

Loading

candita commented May 23, 2024 •

edited

Loading

candita commented May 30, 2024 •

edited

Loading