[release-4.13] OCPBUGS-34409: desiredRouterDeployment: Set HostPort if needed #1062

openshift-cherrypick-robot · 2024-05-23T21:55:16Z

This is an automated cherry-pick of #947

/assign candita

/cherrypick release-4.12

Set spec.template.spec.containers[*].ports[*].hostPort on a router deployment if the deployment sets spec.template.spec.hostNetwork to true. Before this commit, the operator left the hostPort field unspecified. As a result, the API set a default value for hostPort. The operator detected this as an external update and attempted to revert it. This commit prevents the operator from making these spurious updates in response to API defaulting. This commit fixes OCPBUGS-14995. https://issues.redhat.com/browse/OCPBUGS-14995 * pkg/operator/controller/ingress/deployment.go (desiredRouterDeployment): Set each container port's HostPort to the port's ContainerPort value when HostNetwork is enabled for the deployment. * pkg/operator/controller/ingress/deployment_test.go (checkContainerPort): Verify that HostPort is set to ContainerPort if HostNetwork is enabled.

openshift-ci-robot · 2024-05-23T21:55:24Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-14995 has been cloned as Jira Issue OCPBUGS-34409. Will retitle bug to link to clone.
/retitle [release-4.13] OCPBUGS-34409: desiredRouterDeployment: Set HostPort if needed

Details

In response to this:

This is an automated cherry-pick of #947

/assign candita

/cherrypick 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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-05-23T21:55:39Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-34409, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"

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 an automated cherry-pick of #947

/assign candita

/cherrypick 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 openshift-eng/jira-lifecycle-plugin repository.

candita · 2024-05-24T00:30:28Z

Exotic e2e-gcp-ovn failures:

level=error msg=StaticPodsDegraded: E0523 22:28:03.723788 1 reflector.go:140] k8s.io/[email protected]/tools/cache/reflector.go:169: Failed to watch *v1.Secret: failed to list *v1.Secret: Get "https://localhost:6443/api/v1/namespaces/openshift-kube-controller-manager/secrets?limit=500&resourceVersion=0": x509: certificate signed by unknown authority
level=error msg=StaticPodsDegraded:
level=error msg=StaticPodsDegraded: pod/kube-controller-manager-ci-op-r30d7ml7-cae21-cx6kb-master-0 container "kube-controller-manager-recovery-controller" is terminated: Completed:

/test e2e-gcp-ovn

e2e-aws-operator is blocked by #1037 backport #1061.

lihongan · 2024-05-27T02:58:50Z

/jira refresh
/retest

openshift-ci-robot · 2024-05-27T02:58:57Z

@lihongan: This pull request references Jira Issue OCPBUGS-34409, 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-14995 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-14995 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 @ShudiLi

Details

In response to this:

/jira refresh
/retest

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.

ShudiLi · 2024-05-27T10:30:50Z

/retest-required

ShudiLi · 2024-05-27T10:37:36Z

/label qe-approved

tested it with 4.13.0-0.ci.test-2024-05-27-090305-ci-ln-v60hbzb-latest

1.
% oc get clusterversion
NAME      VERSION                                                   AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.13.0-0.ci.test-2024-05-27-090305-ci-ln-v60hbzb-latest   True        False         56m     Cluster version is 4.13.0-0.ci.test-2024-05-27-090305-ci-ln-v60hbzb-latest

2. created two HostNetwork type ingress-controller
3.
% oc -n openshift-ingress-operator get ingresscontroller  cus1 -oyaml | grep -A13 spec:
spec:
  clientTLS:
    clientCA:
      name: ""
    clientCertificatePolicy: ""
  domain: cus1.ci-ln-v60hbzb-c1627.vmc-ci.devcluster.openshift.com
  endpointPublishingStrategy:
    type: HostNetwork
  httpCompression: {}
  httpEmptyRequestsPolicy: Respond
  httpErrorCodePages:
    name: ""
  tuningOptions:
    reloadInterval: 0s

4.
% oc -n openshift-ingress get deployment router-cus2 -oyaml | grep -i Port
        - name: ROUTER_SERVICE_HTTPS_PORT
        - name: ROUTER_SERVICE_HTTP_PORT
        - name: STATS_PORT
            port: 11939
        ports:
        - containerPort: 1080
          hostPort: 1080
        - containerPort: 10443
          hostPort: 10443
        - containerPort: 11939
          hostPort: 11939
            port: 11939
            port: 11939

5.
% oc -n openshift-ingress-operator logs -c ingress-operator deployments/ingress-operator | grep "updated router deployment"
%

openshift-ci-robot · 2024-05-27T10:37:48Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-34409, 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-14995 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-14995 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 @ShudiLi

Details

In response to this:

This is an automated cherry-pick of #947

/assign candita

/cherrypick 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 openshift-eng/jira-lifecycle-plugin repository.

ShudiLi · 2024-05-27T10:41:21Z

/label cherry-pick-approved

ShudiLi · 2024-05-28T03:05:24Z

/retest

candita · 2024-05-29T17:09:04Z

/assign @alebedev87

candita · 2024-05-29T18:37:51Z

e2e tests should pass now that #1065 has merged.

/test e2e-aws-operator

candita · 2024-05-30T21:08:20Z

Test failure in TestManagedDNSToUnmanagedDNSIngressController doesn't seem related to this change:

=== CONT TestAll/parallel/TestManagedDNSToUnmanagedDNSIngressController
unmanaged_dns_test.go:148: Updating ingresscontroller managed-migrated to dnsManagementPolicy=Unmanaged
unmanaged_dns_test.go:161: Waiting for stable conditions on ingresscontroller managed-migrated after dnsManagementPolicy=Unmanaged
...
=== CONT TestAll/parallel/TestManagedDNSToUnmanagedDNSIngressController
unmanaged_dns_test.go:177: verifying conditions on DNSRecord zone {ID: Tags:map[Name:ci-op-fb5dbsdx-08f48-t5zpz-int kubernetes.io/cluster/ci-op-fb5dbsdx-08f48-t5zpz:owned]}
unmanaged_dns_test.go:177: DNSRecord zone expected to have status=Unknown but got status=True

/test e2e-aws-operator

knobunc · 2024-05-31T15:12:49Z

/approve

openshift-ci · 2024-05-31T15:16:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc

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]

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

rfredette · 2024-05-31T15:17:23Z

/lgtm

candita · 2024-05-31T15:19:17Z

Investigating repeated issue in E2E for TestManagedDNSToUnmanagedDNSIngressController:

=== CONT TestAll/parallel/TestManagedDNSToUnmanagedDNSIngressController
util_test.go:520: verified connectivity with workload with req http://af8e49e53a09d421c9e1454b28523513-1221592295.us-west-2.elb.amazonaws.com and response 200
...
=== CONT TestAll/parallel/TestManagedDNSToUnmanagedDNSIngressController
unmanaged_dns_test.go:148: Updating ingresscontroller managed-migrated to dnsManagementPolicy=Unmanaged
unmanaged_dns_test.go:161: Waiting for stable conditions on ingresscontroller managed-migrated after dnsManagementPolicy=Unmanaged
unmanaged_dns_test.go:177: verifying conditions on DNSRecord zone {ID: Tags:map[Name:ci-op-2g4fb3bw-08f48-5w9cz-int kubernetes.io/cluster/ci-op-2g4fb3bw-08f48-5w9cz:owned]}
unmanaged_dns_test.go:177: DNSRecord zone expected to have status=Unknown but got status=True

openshift-ci-robot · 2024-05-31T15:39:47Z

/retest-required

Remaining retests: 0 against base HEAD df0e401 and 2 for PR HEAD c97150e in total

candita · 2024-05-31T18:40:36Z

Need 2 others to merge first.
/hold

candita · 2024-05-31T21:06:27Z

/cancel hold

candita · 2024-05-31T22:05:42Z

/unhold

openshift-ci · 2024-06-01T00:40:19Z

@openshift-cherrypick-robot: 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-ci-robot · 2024-06-01T00:43:35Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-34409: All pull requests linked via external trackers have merged:

openshift/cluster-ingress-operator#1062

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

Details

In response to this:

This is an automated cherry-pick of #947

/assign candita

/cherrypick 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 openshift-eng/jira-lifecycle-plugin repository.

openshift-bot · 2024-06-01T01:37:47Z

[ART PR BUILD NOTIFIER]

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

openshift-merge-robot · 2024-06-01T07:22:15Z

Fix included in accepted release 4.13.0-0.nightly-2024-06-01-031656

candita · 2024-06-04T18:51:25Z

/cherry-pick release-4.12

openshift-cherrypick-robot · 2024-06-04T18:52:06Z

@candita: new pull request created: #1076

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-cherrypick-robot assigned candita May 23, 2024

openshift-cherrypick-robot mentioned this pull request May 23, 2024

OCPBUGS-14995: desiredRouterDeployment: Set HostPort if needed #947

Merged

openshift-ci bot changed the title ~~[release-4.13] OCPBUGS-14995: desiredRouterDeployment: Set HostPort if needed~~ [release-4.13] OCPBUGS-34409: desiredRouterDeployment: Set HostPort if needed May 23, 2024

openshift-ci bot requested review from Miciah and frobware May 23, 2024 21:55

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 27, 2024

openshift-ci bot requested a review from ShudiLi May 27, 2024 02:58

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

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 27, 2024

openshift-ci bot assigned alebedev87 May 29, 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 May 31, 2024

openshift-ci bot assigned 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

openshift-ci bot assigned rfredette May 31, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 31, 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 May 31, 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 May 31, 2024

openshift-merge-bot bot merged commit 82aefc4 into openshift:release-4.13 Jun 1, 2024

openshift-cherrypick-robot mentioned this pull request Jun 4, 2024

[release-4.12] OCPBUGS-34888: desiredRouterDeployment: Set HostPort if needed #1076

Merged

Miciah mentioned this pull request Jun 5, 2024

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

Merged

[release-4.13] OCPBUGS-34409: desiredRouterDeployment: Set HostPort if needed #1062

[release-4.13] OCPBUGS-34409: desiredRouterDeployment: Set HostPort if needed #1062

Uh oh!

Conversation

openshift-cherrypick-robot commented May 23, 2024

Uh oh!

openshift-ci-robot commented May 23, 2024

Uh oh!

openshift-ci-robot commented May 23, 2024

Uh oh!

candita commented May 24, 2024

Uh oh!

lihongan commented May 27, 2024

Uh oh!

openshift-ci-robot commented May 27, 2024

Uh oh!

ShudiLi commented May 27, 2024

Uh oh!

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

Uh oh!

Uh oh!

openshift-ci-robot commented May 27, 2024

Uh oh!

ShudiLi commented May 27, 2024

Uh oh!

ShudiLi commented May 28, 2024

Uh oh!

candita commented May 29, 2024

Uh oh!

candita commented May 29, 2024

Uh oh!

candita commented May 30, 2024

Uh oh!

knobunc commented May 31, 2024

Uh oh!

openshift-ci bot commented May 31, 2024

Uh oh!

rfredette commented May 31, 2024

Uh oh!

candita commented May 31, 2024

Uh oh!

openshift-ci-robot commented May 31, 2024

Uh oh!

candita commented May 31, 2024

Uh oh!

candita commented May 31, 2024

Uh oh!

candita commented May 31, 2024

Uh oh!

openshift-ci bot commented Jun 1, 2024

Uh oh!

openshift-ci-robot commented Jun 1, 2024

Uh oh!

openshift-bot commented Jun 1, 2024

Uh oh!

openshift-merge-robot commented Jun 1, 2024

Uh oh!

candita commented Jun 4, 2024

Uh oh!

openshift-cherrypick-robot commented Jun 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

ShudiLi commented May 27, 2024 •

edited

Loading