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.

Sign up for GitHub

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

Jump to bottom

allow upgraded clusters to use the vulnerable service-ca.crt #546

Merged
merged 2 commits into from Jul 13, 2021
Merged

allow upgraded clusters to use the vulnerable service-ca.crt #546

merged 2 commits into from Jul 13, 2021

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jul 9, 2021

part 4 of the plan from openshift/service-ca-operator#167

It will require an API update to be safe.

/hold

This should not merge without a real field.

@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 Jul 9, 2021
@openshift-ci openshift-ci bot requested review from soltysh and sttts July 9, 2021 22:24
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2021
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2021
@deads2k
Copy link
Contributor Author

deads2k commented Jul 12, 2021

/hold cancel

@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 Jul 12, 2021
@deads2k
Copy link
Contributor Author

deads2k commented Jul 12, 2021

/hold until we manually prove that the content in service-ca for upgrade and e2e-parallel jobs is correct.

@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 Jul 12, 2021
@deads2k
Copy link
Contributor Author

deads2k commented Jul 13, 2021

the other fixes merged, let's see this thing work! ;)

/test all

This was referenced Jul 13, 2021
Merged
Merged
@deads2k
Copy link
Contributor Author

deads2k commented Jul 13, 2021

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Jul 13, 2021

https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-kube-controller-manager-operator/546/pull-ci-openshift-cluster-kube-controller-manager-operator-master-e2e-aws-operator-preferred-host/1414923887124156416 has secure service-ca as expected. Waiting on upgrade now.

@stlaz
Copy link
Member

stlaz commented Jul 13, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2021
@deads2k
Copy link
Contributor Author

deads2k commented Jul 13, 2021

upgrade job https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-kube-controller-manager-operator/546/pull-ci-openshift-cluster-kube-controller-manager-operator-master-e2e-upgrade/1414923887145127936 shows service.alpha.openshift.io/inject-vulnerable-legacy-cabundle: "true" with correct content

soltysh
soltysh approved these changes Jul 13, 2021
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manually verified that upgrade is keeping the old behavior, and new cluster has the new
/lgtm
/hold cancel

@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 Jul 13, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, soltysh, stlaz

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-merge-robot openshift-merge-robot merged commit eeeb090 into openshift:master Jul 13, 2021
@deads2k deads2k mentioned this pull request Jul 13, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@sttts sttts Awaiting requested review from sttts

Assignees

@soltysh soltysh

@stlaz stlaz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@deads2k @stlaz @soltysh @openshift-merge-robot