Skip to content
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

OCPBUGS-15100: Fix previous attempt of adding a missing trailing dot to hostname #956

Merged

Conversation

candita
Copy link
Contributor

@candita candita commented Jun 29, 2023

Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot.
Update hashed DNS record names in unit tests.

Addresses https://github.com/openshift/cluster-ingress-operator/pull/949/files#r1245950185

early enough so that all references use the trailing dot.
Update hashed DNS record names in unit tests.
@Miciah
Copy link
Contributor

Miciah commented Jun 29, 2023

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 29, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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 Jun 29, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD d0be04b and 2 for PR HEAD 8ad42fa in total

@candita candita changed the title OCPBUGS-15100 Fix previous attempt of adding a missing trailing dot to hostname OCPBUGS-15100: Fix previous attempt of adding a missing trailing dot to hostname Jun 29, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 29, 2023
@openshift-ci-robot
Copy link
Contributor

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

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

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.

In response to this:

Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot.
Update hashed DNS record names in unit tests.

Addresses https://github.com/openshift/cluster-ingress-operator/pull/949/files#r1245950185

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.

@candita
Copy link
Contributor Author

candita commented Jun 29, 2023

NAME TestAll/parallel/TestManagedDNSToUnmanagedDNSIngressController
unmanaged_dns_test.go:177: verifying conditions on DNSRecord zone {ID:/subscriptions/d38f1e38-4bed-438e-b227-833f997adf6a/resourceGroups/ci-op-vtsq51qj-04a70-llzc8-rg/providers/Microsoft.Network/privateDnsZones/ci-op-vtsq51qj-04a70.ci.azure.devcluster.openshift.com Tags:map[]}
unmanaged_dns_test.go:177: DNSRecord zone expected to have status=Unknown but got status=True

/test e2e-azure-operator

@candita
Copy link
Contributor Author

candita commented Jun 29, 2023

/jira refresh

@openshift-ci-robot 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 Jun 29, 2023
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

In response to this:

/jira refresh

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 openshift-ci bot requested a review from lihongan June 29, 2023 14:56
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 29, 2023

@candita: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn 8ad42fa link false /test e2e-azure-ovn
ci/prow/e2e-aws-ovn-single-node 8ad42fa link false /test e2e-aws-ovn-single-node

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.

@openshift-merge-robot openshift-merge-robot merged commit 4c92a6d into openshift:master Jun 29, 2023
12 of 14 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot.
Update hashed DNS record names in unit tests.

Addresses https://github.com/openshift/cluster-ingress-operator/pull/949/files#r1245950185

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.

@candita
Copy link
Contributor Author

candita commented Jun 29, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot

@candita: #956 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-15100 Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot. Update hashed DNS record names in unit tests.
Using index info to reconstruct a base tree...
M	pkg/operator/controller/gateway-service-dns/controller.go
M	pkg/operator/controller/gateway-service-dns/controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/controller/gateway-service-dns/controller_test.go
CONFLICT (content): Merge conflict in pkg/operator/controller/gateway-service-dns/controller_test.go
Auto-merging pkg/operator/controller/gateway-service-dns/controller.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-15100 Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot. Update hashed DNS record names in unit tests.
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".

In response to this:

/cherry-pick release-4.13

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.

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. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants