Skip to content

USHIFT-3778: Drop-in configuration directory#3792

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
pmtk:drop-in-dir-cfg
Sep 2, 2024
Merged

USHIFT-3778: Drop-in configuration directory#3792
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
pmtk:drop-in-dir-cfg

Conversation

@pmtk
Copy link
Copy Markdown
Member

@pmtk pmtk commented Aug 19, 2024

No description provided.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Aug 19, 2024

@pmtk: This pull request references USHIFT-3778 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

Details

In response to this:

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/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 19, 2024
@openshift-ci openshift-ci Bot requested review from jerpeter1 and pliurh August 19, 2024 13:47
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2024
@pmtk pmtk force-pushed the drop-in-dir-cfg branch 2 times, most recently from c6120c3 to e9537fc Compare August 22, 2024 12:05
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Aug 22, 2024

/retest

Comment thread docs/user/howto_config.md Outdated
Comment thread test/suites/tuned/workload-partitioning.robot Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What if you want to save the current configuration because you want to replace entire bits of it? You would need this keyword (and others too) to achieve that, as drop in is an aggregate view and cant delete anything, right? (unless setting null values to parameters, but thats convoluted)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Maybe, but that hasn't been the case in our tests. We start VMs with:

apiServer:
  subjectAltNames:
  - item1
  - item2

And array are not being summed together, only overwritten.
There are two tests that overwrite the subjectAltNames: multi-nic.robot and validate-custom-certificates.robot and using drop-in with the SANs totally works.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Un-deleted the keywords. Let's keep them for time being

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 29, 2024
@pmtk pmtk force-pushed the drop-in-dir-cfg branch from e9537fc to a342a9c Compare August 30, 2024 06:38
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 30, 2024
Comment thread packaging/rpm/microshift.spec Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
- Support for config drop-in dir
- Support for config drop-in directory

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
[Documentation] Upload a new configuration file to the MicroShift host
[Documentation] Remove a drop-in configuration file from MicroShift host

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
[Documentation] Upload a new configuration file to the MicroShift host
[Documentation] Upload a drop-in configuration file to the MicroShift host

Comment thread test/suites/network/offline.robot Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
${result} ${ignore}= Run Guest Process ${GUEST_NAME} rm /etc/microshift/config.d/10-hostname.yaml
${result} ${ignore}= Run Guest Process ${GUEST_NAME} rm -f /etc/microshift/config.d/10-hostname.yaml

@pmtk pmtk force-pushed the drop-in-dir-cfg branch 2 times, most recently from 07f609e to 995fb1e Compare September 2, 2024 14:50
@ggiguash
Copy link
Copy Markdown
Contributor

ggiguash commented Sep 2, 2024

/test ?

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 2, 2024

@ggiguash: The following commands are available to trigger required jobs:

  • /test footprint-and-performance
  • /test images
  • /test metal-bootc-periodic-test
  • /test metal-bootc-periodic-test-arm
  • /test metal-bootc-test
  • /test metal-bootc-test-arm
  • /test metal-periodic-test
  • /test metal-periodic-test-arm
  • /test microshift-metal-cache
  • /test microshift-metal-cache-arm
  • /test microshift-metal-tests
  • /test microshift-metal-tests-arm
  • /test ocp-conformance-rhel-eus
  • /test ocp-conformance-rhel-eus-arm
  • /test ocp-full-conformance-rhel-eus
  • /test test-rpm
  • /test test-unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test test-rebase

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-microshift-main-images
  • pull-ci-openshift-microshift-main-metal-bootc-test
  • pull-ci-openshift-microshift-main-metal-bootc-test-arm
  • pull-ci-openshift-microshift-main-microshift-metal-tests
  • pull-ci-openshift-microshift-main-microshift-metal-tests-arm
  • pull-ci-openshift-microshift-main-test-rpm
  • pull-ci-openshift-microshift-main-test-unit
  • pull-ci-openshift-microshift-main-verify
Details

In response to this:

/test ?

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.

@ggiguash
Copy link
Copy Markdown
Contributor

ggiguash commented Sep 2, 2024

/test metal-bootc-periodic-test
/test metal-periodic-test
/test footprint-and-performance

/lgtm

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

openshift-ci Bot commented Sep 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 2, 2024

@pmtk: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit e6e111d into openshift:main Sep 2, 2024
@pmtk pmtk deleted the drop-in-dir-cfg branch September 4, 2024 09:07
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.

5 participants