Github-84: Add commit hash to RPM builds #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use the GITHUB_SHA environment variable provided in the github action and save it in the file .commit. The RPM build will use the value in this file instead of the output provided by the git command in the Makefile. This allows the git hash to be set when building from the source RPM. Signed-off-by: Matt Richerson <[email protected]>
matthew-richerson
requested review from
NateThornton,
ajfloeder and
bdevcich
bdevcich
reviewed
Feb 17, 2023
| @@ -21,7 +21,7 @@ Near Node Flash data movement through the data movement API. | |||
| %setup -q | |||
|
|
|||
| %build | |||
| make build-daemon | |||
| COMMIT_HASH=$(cat .commit) make build-daemon | |||
There was a problem hiding this comment.
In the Makefile, you're using --short but this will use the full hash when building the rpm with $GITHUB_SHA. Consider truncating to 8 characters.
ajfloeder
approved these changes
Feb 17, 2023
bdevcich
approved these changes
Feb 17, 2023
Signed-off-by: Matt Richerson <[email protected]>
NateThornton
approved these changes
Feb 17, 2023
matthew-richerson
added a commit
that referenced
this pull request
May 1, 2023
* Change DM Manager to use port 22 for ssh/mpirun + update nnf-mfu image (#81) The DM manager was configured to use port 2222. However, the DM worker nodes running sshd are only listening on port 22. To simplify things, DM manager has gone back to port 22. Additionally, the worker image was updated to track the latest version of nnf-mfu. Tested in kind VM. The manager can hit the worker via mpirun now that it's targeting port 22: ``` $ kubectl -n nnf-dm-system exec nnf-dm-controller-manager-587495bc7-qrxhg -c manager -- mpirun --allow-run-as-root --host 10-244-3-3.dm.nnf-dm-system hostname Warning: Permanently added '10-244-3-3.dm.nnf-dm-system,10.244.3.3' (ECDSA) to the list of known hosts. nnf-dm-worker-8w7cs ``` Signed-off-by: Blake Devcich <[email protected]> * Allow builds on all branches. (#82) Loosen the branch filter for pushes. Print some event context, for future debugging. Remove an unused variable from verify_tag. Rename some jobs to give them unique names, to help with debugging. Signed-off-by: Dean Roehrich <[email protected]> * New Version endpoint with support for the data-mover 'version' and a … (#83) * New Version endpoint with support for the data-mover 'version' and a list of supported 'API versions' * Add support for including the git commit hash when building the daemon Signed-off-by: Nate Thornton <[email protected]> * Github-84: Add commit hash to RPM builds (#87) * Github-84: Add commit hash to RPM builds Use the GITHUB_SHA environment variable provided in the github action and save it in the file .commit. The RPM build will use the value in this file instead of the output provided by the git command in the Makefile. This allows the git hash to be set when building from the source RPM. Signed-off-by: Matt Richerson <[email protected]> * Truncate GITHUB_SHA to 8 characters Signed-off-by: Matt Richerson <[email protected]> --------- Signed-off-by: Matt Richerson <[email protected]> * Data Movement: Allow use of hostfiles + revamped Configuration (#89) This allows for the configuration of slots and max_slots in the mpirun hostfile. Coupled with this is the slimmed down configuration which allows for more flexibility. Users now specify the full data movement command in the ConfigMap and use $VAR substitution. Profiles have also been introduced in the ConfigMap. However, only the `default` can be used at this time. Changelog: * Removed the use of mpirun --host. Instead, create hostfiles and use mpirun --hostfile * Simplified the DM command to be more flexible and use $VAR substitution for built-ins (i.e. hostfile name, gid/uid, src/dest). * Changed DM ConfigMap to allow for nested values for profiles. * ConfigMap values are now typed. * DM ConfigMap is now part of the config/default deployment. * Change the nnf-dm-config ConfigMap namespace from default to nnf-dm-system Signed-off-by: Blake Devcich <[email protected]> * Update nnf-sos vendor Signed-off-by: Blake Devcich <[email protected]> * RABSW-1150: Add ServiceAccount for nnf-dm daemon (#93) Add a ServiceAccount for clientmountd that only allows access to the resources that the nnf-dm daemon needs. Signed-off-by: Matt Richerson <[email protected]> * nnf-dm daemon: Increase k8s client QPS and Burst (#94) The default values of 5 and 10 are impacting the creation of DM requests via the Copy Offload API. - These values have been increased to 50 and 100. Command line parameters have been added to adjust these. - Updated the go client to create the DM requests concurrently and make the simulated server thread safe. - DM Worker log output has been reduced; lots of concurrent request make the log unreadable Signed-off-by: Blake Devcich <[email protected]> * Use the live k8s client object in suite_test.go. (#96) In the kubebuilder book: https://book.kubebuilder.io/cronjob-tutorial/writing-tests.html It explains that we should be using the "live" k8s client rather than the one from the manager: "Note that we set up both a “live” k8s client and a separate client from the manager. This is because when making assertions in tests, you generally want to assert against the live state of the API server. If you use the client from the manager (k8sManager.GetClient), you’d end up asserting against the contents of the cache instead, which is slower and can introduce flakiness into your tests." Signed-off-by: Dean Roehrich <[email protected]> * Upgrade controller-runtime and friends (#95) Upgrade controller-runtime, ginkgo, gomega. Revendor dws and pick up the new API for status updater. Upgrade controller-gen and env-k8s-version. * Copy Offload API: Add DCPOptions, DryRun, Start/End Time; update lib-cpp (#99) Allow an NnfDataMovement resource to define UserConfig that can be used to override/supplement Data Movement Configuration. This way, the Copy Offload API can tweak behavior on top of the existing DM configuration that is defined by the nnf-dm-config ConfigMap. This enables the Copy Offload API to: - Add extra options to the `dcp` command - Perform a dryrun where the data movement command becomes `/bin/true` Changes: - `CreateRequest` updates: - Added `dcpOptions` - Added `dryrun` (wasn't doing anything before) - Added `startTime` and `endTime` to `StatusResponse` - Updated API readme - Synced lib-cpp (added CommandStatus, dryrun, dcpOptions, start/end time) - Added Makefiles for lib-cpp, lib-cpp/example, and client-cpp - Added Readme.md for lib-cpp Signed-off-by: Blake Devcich <[email protected]> * Use the new "lus" API group for lustre-fs-operator (#100) Use the new "lus" API group for lustre-fs-operator Signed-off-by: Dean Roehrich <[email protected]> * Copy Offload API: Add generated documentation (#101) Use protoc-gen-doc to generate HTML documentation for the Copy Offload API. This way, the code is self documenting and we do not have to update the readme for any changes. Updated the readme to point to the generated API documenation and to add more clarity in certain areas. Signed-off-by: Blake Devcich <[email protected]> * Github action triggers on master and release branches Signed-off-by: Matt Richerson <[email protected]> --------- Signed-off-by: Blake Devcich <[email protected]> Signed-off-by: Dean Roehrich <[email protected]> Signed-off-by: Nate Thornton <[email protected]> Signed-off-by: Matt Richerson <[email protected]> Co-authored-by: Blake Devcich <[email protected]> Co-authored-by: Dean Roehrich <[email protected]> Co-authored-by: Nate Thornton <[email protected]> Co-authored-by: Blake Devcich <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the GITHUB_SHA environment variable provided in the github action and save it in the file .commit. The RPM build will use the value in this file instead of the output provided by the git command in the Makefile. This allows the git hash to be set when building from the source RPM.