Skip to content

Allow multiple kustomization paths#659

Merged
oglok merged 1 commit intoopenshift:mainfrom
mangelajo:multiple-manifests
Apr 21, 2022
Merged

Allow multiple kustomization paths#659
oglok merged 1 commit intoopenshift:mainfrom
mangelajo:multiple-manifests

Conversation

@mangelajo
Copy link
Contributor

@mangelajo mangelajo commented Apr 12, 2022

This extends the single path /var/lib/microshift/manifests
default into:

  • /usr/lib/microshift/manifests
  • /etc/microshift/manifests
  • /var/lib/microshift/manifests

which will be evaluated in order. While the first one could be fully
managed in ostree (core components), the second one could be managed
by configuration management, the third one is maintained for backwards
compatibility purposes.

In addition the MicroShift configuration file supports customization
of this via the manifestsDir entry.

@mangelajo mangelajo requested review from fzdarsky, mjiao and oglok April 12, 2022 12:04
@openshift-ci openshift-ci bot requested review from rootfs and sallyom April 12, 2022 12:04
@mangelajo mangelajo force-pushed the multiple-manifests branch 3 times, most recently from 0cf97bb to c926dea Compare April 13, 2022 09:23
@mangelajo
Copy link
Contributor Author

/test

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 13, 2022

@mangelajo: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test images
  • /test test-srpm
  • /test test-unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-openshift-conformance-sig-api-machinery
  • /test e2e-openshift-conformance-sig-apps
  • /test e2e-openshift-conformance-sig-arch
  • /test e2e-openshift-conformance-sig-auth
  • /test e2e-openshift-conformance-sig-cli
  • /test e2e-openshift-conformance-sig-instrumentation
  • /test e2e-openshift-conformance-sig-network
  • /test e2e-openshift-conformance-sig-node
  • /test e2e-openshift-conformance-sig-scheduling
  • /test e2e-openshift-conformance-sig-storage
  • /test e2e-reboot
  • /test e2e-rpm-install

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

  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-api-machinery
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-apps
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-arch
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-auth
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-cli
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-instrumentation
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-network
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-node
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-scheduling
  • pull-ci-redhat-et-microshift-main-e2e-openshift-conformance-sig-storage
  • pull-ci-redhat-et-microshift-main-e2e-reboot
  • pull-ci-redhat-et-microshift-main-e2e-rpm-install
  • pull-ci-redhat-et-microshift-main-images
  • pull-ci-redhat-et-microshift-main-test-unit
  • pull-ci-redhat-et-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/test-infra repository.

This extends the single path /var/lib/microshift/manifests
default into:

   - /usr/lib/microshift/manifests
   - /etc/microshift/manifests
   - /var/lib/microshift/manifests

which will be evaluated in order. While the first one could be fully
managed in ostree (core components), the second one could be managed
by configuration management, the third one is maintained for backwards
compatibility purposes.

In addition the MicroShift configuration file supports customization
of this via the manifestsDir entry.
@mangelajo mangelajo force-pushed the multiple-manifests branch from c926dea to 241994b Compare April 13, 2022 13:18
@mangelajo
Copy link
Contributor Author

/retest

@mangelajo
Copy link
Contributor Author

Last changes include @copejon and @fzdarsky request to maintain the original default manifest directory too for backwards compatibility

@oglok
Copy link
Contributor

oglok commented Apr 21, 2022

Thanks for the PR! I think we should test a specific config.yaml pointing at a set of manifests.

Code wise looks good.

@mangelajo
Copy link
Contributor Author

[root@fedora majopela]# cat /etc/microshift/config.yaml
---
manifests:
  - /kustom/
[root@fedora microshift]# microshift run 2>&1 | grep kust
I0421 14:37:33.524394 2568041 manager.go:112] Starting kustomizer
I0421 14:37:33.524699 2568041 apply.go:57] Applying kustomization at /kustom/kustomization.yaml```

@mangelajo
Copy link
Contributor Author

It seems to work as expected :-)

@oglok
Copy link
Contributor

oglok commented Apr 21, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oglok

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2022
@oglok oglok merged commit fa4bc87 into openshift:main Apr 21, 2022
mangelajo added a commit to mangelajo/microshift-documentation that referenced this pull request May 6, 2022
This commit documents the behaviour implemented in
openshift/microshift#659
copejon pushed a commit to microshift-io/microshift-documentation that referenced this pull request May 6, 2022
This commit documents the behaviour implemented in
openshift/microshift#659
@mangelajo mangelajo mentioned this pull request Jun 10, 2022
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants