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

Forward v0 to main #124

Merged
merged 6 commits into from
Apr 4, 2024
Merged

Forward v0 to main #124

merged 6 commits into from
Apr 4, 2024

Conversation

omertuc
Copy link
Member

@omertuc omertuc commented Apr 4, 2024

omertuc and others added 6 commits March 25, 2024 15:20
MGMT-16796

Added new proxy option that sets the cluster proxy to the desired
configuration.

Proxy editing with recert is required to avoid rollouts / reboots

Also added an install-config option that sets the install-config value
in the install-config configmaps, this is needed because Cluster Network
Operator tries to calculate the no_proxy value from these, so we need to
modify them to match the installed/upgraded cluster
None of such files have PROXY env vars so we can skip them. We don't
want to parse them and then re-serialize them as that could cause
formatting changes which could lead to rollouts.
In OCP 4.16 the cluster-etcd-operator moved to using
library-go/certrotation and that leads to the following etcd TLS secrets
having annotations that include the IP and the hostname:

- openshift-etcd/etcd-peer-<hostname>
- openshift-etcd/etcd-serving-<hostname>
- openshift-etcd/etcd-serving-metrics-<hostname>

The respective annotations are:
- auth.openshift.io/certificate-hostnames - this includes the IP
- openshift.io/description - this includes the hostname

Recert now replaces the IP and the hostname in those annotations, in
order to skip an additional etcd rollout that is triggered because of
the former.

openshift/cluster-etcd-operator#1194

Signed-off-by: Michail Resvanis <[email protected]>
MGMT-17319: Fix etcd secrets annotations for OCP >4.16
Don't modify proxy on non-JSON YAML files
@omertuc omertuc merged commit c2f143f into v0 Apr 4, 2024
2 of 5 checks passed
@openshift-ci openshift-ci bot requested a review from mresvanis April 4, 2024 10:22
Copy link

openshift-ci bot commented Apr 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: omertuc

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 label Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants