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

OADP-1.2 Cherry-pick of OADP-659: Remove HTTP/HTTPS port numbers from AWS S3 URLs. #1180

Merged
merged 2 commits into from Oct 25, 2023

Conversation

mrnold
Copy link
Contributor

@mrnold mrnold commented Oct 11, 2023

Cherry pick pull requests 1169 and 1177 for OADP 1.2.

…1169)

* OADP-659 Remove port numbers if HTTP or HTTPS.

Avoids a signature mismatch from S3-compatible services.

Signed-off-by: Matthew Arnold <marnold@redhat.com>

* OADP-659 Move StripDefaultPorts to pkg/common.

Signed-off-by: Matthew Arnold <marnold@redhat.com>

* OADP-659 Fix port number in comment.

Signed-off-by: Matthew Arnold <marnold@redhat.com>

---------

Signed-off-by: Matthew Arnold <marnold@redhat.com>
SanitizeHostForHeader puts the stripped host name into the Host field of
the HTTP request, but only if it actually needed to strip the port. If
there is already no port, that Host field can be blank, and there is no
reason to overwrite the URL's host field.

Signed-off-by: Matthew Arnold <marnold@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 11, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 11, 2023

@mrnold: This pull request references OADP-659 which is a valid jira issue.

In response to this:

Cherry pick pull requests 1169 and 1177 for OADP 1.2.

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.

@mateusoliveira43
Copy link
Contributor

/hold
wait 1.2.2 release

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 11, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2023
@kaovilai
Copy link
Member

/retest

@kaovilai
Copy link
Member

Pod todolist-1-cvcg4 not yet succeededstatus: {Pending [{Initialized False 0001-01-01 00:00:00 +0000 UTC 2023-10-12 18:41:14 +0000 UTC ContainersNotInitialized containers with incomplete status: [init-myservice]} {Ready False 0001-01-01 00:00:00 +0000 UTC 2023-10-12 18:41:14 +0000 UTC ContainersNotReady containers with unready status: [todolist]} {ContainersReady False 0001-01-01 00:00:00 +0000 UTC 2023-10-12 18:41:14 +0000 UTC ContainersNotReady containers with unready status: [todolist]} {PodScheduled True 0001-01-01 00:00:00 +0000 UTC 2023-10-12 18:41:14 +0000 UTC  }]    10.0.128.5 10.128.2.37 [{10.128.2.37}] 2023-10-12 18:41:14 +0000 UTC [{init-myservice {nil &ContainerStateRunning{StartedAt:2023-10-12 18:41:15 +0000 UTC,} nil} {nil nil nil} false 0 registry.access.redhat.com/ubi8/ubi:latest registry.access.redhat.com/ubi8/ubi@sha256:db870970ba330193164dacc88657df261d75bce1552ea474dbc7cf08b2fae2ed cri-o://7d3e1924e4f680d8d1435932ee67538ffaf70c5878bbb527e4ed88bdd19c862c <nil>}] [{todolist {&ContainerStateWaiting{Reason:PodInitializing,Message:,} nil nil} {nil nil nil} false 0 image-registry.openshift-image-registry.svc:5000/mongo-persistent/todolist-mongo-go@sha256:55a412a997c2144917c1e92a53b76977e794aee3c3f04fe0c8202ba8143640b9   0xc0010c3d68}] BestEffort []}

https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_oadp-operator/1180/pull-ci-openshift-oadp-operator-oadp-1.2-4.12-operator-e2e-azure/1712518428683669504#1:build-log.txt%3A1180
https://github.com/mrnold/oadp-operator/blob/a4bb58eab36119ccfcf3a2faeca7231ebcf7f326/tests/e2e/backup_restore_suite_test.go#L350
/retest

@shubham-pampattiwar
Copy link
Member

/lgtm

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

openshift-ci bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mrnold, shubham-pampattiwar, sseago

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:
  • OWNERS [kaovilai,shubham-pampattiwar,sseago]

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

@kaovilai
Copy link
Member

1.2.3 released
/unhold

@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 Oct 25, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 25, 2023

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

@openshift-ci openshift-ci bot merged commit a804b5d into openshift:oadp-1.2 Oct 25, 2023
21 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. 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

6 participants