Skip to content

Set TLS minimum version to 1.2#176

Merged
openshift-merge-robot merged 1 commit into
stolostron:masterfrom
dhaiducek:6233-tls-min
Jul 20, 2023
Merged

Set TLS minimum version to 1.2#176
openshift-merge-robot merged 1 commit into
stolostron:masterfrom
dhaiducek:6233-tls-min

Conversation

@dhaiducek
Copy link
Copy Markdown

I changed it everywhere to be thorough 😆

ref: https://issues.redhat.com/browse/ACM-6233

ref: https://issues.redhat.com/browse/ACM-6233
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jul 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, JustinKuli, mprahl

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 [JustinKuli,dhaiducek,mprahl]

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

@openshift-merge-robot openshift-merge-robot merged commit fe16f20 into stolostron:master Jul 20, 2023
@dhaiducek dhaiducek deleted the 6233-tls-min branch July 20, 2023 19:10
@dhaiducek
Copy link
Copy Markdown
Author

/cherry-pick release-3.11

@dhaiducek
Copy link
Copy Markdown
Author

/cherry-pick release-3.12

@openshift-cherrypick-robot
Copy link
Copy Markdown

@dhaiducek: new pull request created: #180

Details

In response to this:

/cherry-pick release-3.11

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-cherrypick-robot
Copy link
Copy Markdown

@dhaiducek: #176 failed to apply on top of branch "release-3.12":

Applying: Set TLS minimum version to 1.2
Using index info to reconstruct a base tree...
M	charts/gatekeeper/values.yaml
M	cmd/build/helmify/static/values.yaml
M	manifest_staging/charts/gatekeeper/values.yaml
M	pkg/webhook/common.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/webhook/common.go
CONFLICT (content): Merge conflict in pkg/webhook/common.go
Auto-merging manifest_staging/charts/gatekeeper/values.yaml
Auto-merging cmd/build/helmify/static/values.yaml
Auto-merging charts/gatekeeper/values.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Set TLS minimum version to 1.2
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-3.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/test-infra repository.

openshift-merge-robot pushed a commit that referenced this pull request Jul 20, 2023
ref: https://issues.redhat.com/browse/ACM-6233

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit fe16f20)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants