Skip to content

[release-4.15] OCPBUGS-20152: Don't error if the certs.d dir doesn't exist yet#4358

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.15from
umohnani8:4.15-cert
May 14, 2024
Merged

[release-4.15] OCPBUGS-20152: Don't error if the certs.d dir doesn't exist yet#4358
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.15from
umohnani8:4.15-cert

Conversation

@umohnani8
Copy link
Copy Markdown
Contributor

When trying to read the /etc/docker/certs.d directory don't return an error if the error is that it doesn't exist. It is possible that the direcotry hasn't been created yet and that is okay.

Fixes the cert issue described in https://issues.redhat.com/browse/OCPBUGS-20152 but not the timing issue around controller config.

This issue was already fixed in 4.16 and master in this PR #4106. However, that PR consist of other major cert changes that cannot be backported at this time. So only picking the patch that fixes the certs.d not found issue.

This will need to be backported to 4.14 as well.

- What I did
Added a check to not error on dir doesn't exist for the /etc/docker/certs.d directory.

- How to verify it
This issue is reproducible on 4.15. When creating a cluster, add this to the install-config.yaml

capabilities:
  additionalEnabledCapabilities:
  - MachineAPI
  - CloudCredential
  baselineCapabilitySet: None

Once the cluster is up, check the MCD logs for this Marking Degraded due to: open /etc/docker/certs.d: no such file or directory. There should be none with this patch. Example:

oc logs machine-config-daemon-l9hdk machine-config-daemon | grep "Marking Degraded due to: open /etc/docker/certs.d: no such file or directory"  | wc -l
0

If this patch is not applied, there should be many in the logs.

- Description for the changelog
Add a check to not error on dir doesn't exist for the /etc/docker/certs.d directory

When trying to read the /etc/docker/certs.d directory
don't return an error if the error is that it doesn't
exist. It is possible that the direcotry hasn't been
created yet.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low 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 May 7, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@umohnani8: This pull request references Jira Issue OCPBUGS-20152, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected Jira Issue OCPBUGS-20152 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

Details

In response to this:

When trying to read the /etc/docker/certs.d directory don't return an error if the error is that it doesn't exist. It is possible that the direcotry hasn't been created yet and that is okay.

Fixes the cert issue described in https://issues.redhat.com/browse/OCPBUGS-20152 but not the timing issue around controller config.

This issue was already fixed in 4.16 and master in this PR #4106. However, that PR consist of other major cert changes that cannot be backported at this time. So only picking the patch that fixes the certs.d not found issue.

This will need to be backported to 4.14 as well.

- What I did
Added a check to not error on dir doesn't exist for the /etc/docker/certs.d directory.

- How to verify it
This issue is reproducible on 4.15. When creating a cluster, add this to the install-config.yaml

capabilities:
 additionalEnabledCapabilities:
 - MachineAPI
 - CloudCredential
 baselineCapabilitySet: None

Once the cluster is up, check the MCD logs for this Marking Degraded due to: open /etc/docker/certs.d: no such file or directory. There should be none with this patch. Example:

oc logs machine-config-daemon-l9hdk machine-config-daemon | grep "Marking Degraded due to: open /etc/docker/certs.d: no such file or directory"  | wc -l
0

If this patch is not applied, there should be many in the logs.

- Description for the changelog
Add a check to not error on dir doesn't exist for the /etc/docker/certs.d directory

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested review from djoshy and sinnykumari May 7, 2024 19:59
@umohnani8
Copy link
Copy Markdown
Contributor Author

@djoshy @sinnykumari @yuqi-zhang PTAL

I know this isn't how we do backports, but we can't backport all the changes in the PR that fixed this on master. Please let me know what I need to do to make this a valid backport.

@umohnani8
Copy link
Copy Markdown
Contributor Author

@sergiordlr can you please test this out when you get a chance. Thank you!

@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 7, 2024

/test unit

Copy link
Copy Markdown
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

I think this is fine as a backportable solution. Thanks!

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 7, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 8, 2024

@umohnani8: 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/okd-scos-e2e-aws-ovn 0b19000 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-scos-e2e-gcp-op 0b19000 link false /test okd-scos-e2e-gcp-op
ci/prow/okd-scos-e2e-gcp-ovn-upgrade 0b19000 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-vsphere-ovn 0b19000 link false /test okd-scos-e2e-vsphere-ovn
ci/prow/e2e-vsphere-zones 0b19000 link false /test e2e-vsphere-zones

Full PR test history. Your PR dashboard.

Details

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.

@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 8, 2024

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-20152, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected dependent Jira Issue OCPBUGS-33412 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), 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.

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@rioliu-rh
Copy link
Copy Markdown

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 13, 2024
@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 14, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot removed the jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. label May 14, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-20152, 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.

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label May 14, 2024
@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 14, 2024

/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 May 14, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-20152, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-33412 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-33412 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested a review from sergiordlr May 14, 2024 12:59
@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 14, 2024

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 14, 2024
@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 14, 2024

/lgtm

You good, @openshift-ci-robot ?

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, umohnani8, yuqi-zhang

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:

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

@openshift-merge-bot openshift-merge-bot Bot merged commit 10694c7 into openshift:release-4.15 May 14, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@umohnani8: Jira Issue OCPBUGS-20152: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Details

In response to this:

When trying to read the /etc/docker/certs.d directory don't return an error if the error is that it doesn't exist. It is possible that the direcotry hasn't been created yet and that is okay.

Fixes the cert issue described in https://issues.redhat.com/browse/OCPBUGS-20152 but not the timing issue around controller config.

This issue was already fixed in 4.16 and master in this PR #4106. However, that PR consist of other major cert changes that cannot be backported at this time. So only picking the patch that fixes the certs.d not found issue.

This will need to be backported to 4.14 as well.

- What I did
Added a check to not error on dir doesn't exist for the /etc/docker/certs.d directory.

- How to verify it
This issue is reproducible on 4.15. When creating a cluster, add this to the install-config.yaml

capabilities:
 additionalEnabledCapabilities:
 - MachineAPI
 - CloudCredential
 baselineCapabilitySet: None

Once the cluster is up, check the MCD logs for this Marking Degraded due to: open /etc/docker/certs.d: no such file or directory. There should be none with this patch. Example:

oc logs machine-config-daemon-l9hdk machine-config-daemon | grep "Marking Degraded due to: open /etc/docker/certs.d: no such file or directory"  | wc -l
0

If this patch is not applied, there should be many in the logs.

- Description for the changelog
Add a check to not error on dir doesn't exist for the /etc/docker/certs.d directory

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 openshift-eng/jira-lifecycle-plugin repository.

@umohnani8
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown

@umohnani8: new pull request created: #4362

Details

In response to this:

/cherry-pick release-4.14

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-sigs/prow repository.

@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented May 14, 2024

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@djoshy: Jira Issue OCPBUGS-20152: All pull requests linked via external trackers have merged:

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

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.15.0-202405141506.p0.g10694c7.assembly.stream.el8 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-05-14-175553

@umohnani8 umohnani8 deleted the 4.15-cert branch January 22, 2026 17:04
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate 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.