Skip to content
This repository has been archived by the owner on Mar 18, 2021. It is now read-only.

Feature/annotations labels and health check #45

Merged
merged 2 commits into from
Sep 10, 2018

Conversation

acornies
Copy link
Collaborator

@acornies acornies commented Sep 7, 2018

This PR addresses #40 as well as implements the /healthz check

@alexellis
Copy link
Contributor

Glad to see this shaping up.

Just a quick one - are you using prune with dep? I saw sample functions and other code I didn't expect in the PR.

Your first commit is also not signed-off.

This is Nic's repo, but you might want to format your commit messages in some more detail - https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md#commit-messages

Some examples:

openfaas/faas-netes@622203c
openfaas/faas-cli@e4f3b3f
openfaas/faas-cli@cad006c
openfaas/faas-netes@f2813ca

@alexellis
Copy link
Contributor

Signed-off-by: should generally be a name too like "Alex Ellis"

@acornies
Copy link
Collaborator Author

acornies commented Sep 7, 2018

Thanks for the pointers. I'm relatively new to Golang dev in general so any help is appreciated. I'll amend those commits.

@acornies
Copy link
Collaborator Author

acornies commented Sep 7, 2018

I'm just using dep ensure after updating the faas dependencies. I'm guessing we should use the [prune] directive in the Gopkg.toml?

@alexellis
Copy link
Contributor

Yes - see how prune is used in the OpenFaaS repos for faas-netes for example in Gopkg.toml then rm -rf vendor and run dep ensure again. You may have to reset the commits to prevent them recording all the files coming and then being removed again.

@alexellis
Copy link
Contributor

Feel free to ask on OF Slack if you need help with git.

- Updated and prune dependencies
- Implemented annotations and labels for Nomad API
- Added /healthz support
- Updated reader test

Signed-off-by: acornies <acornies@gmail.com>
@acornies
Copy link
Collaborator Author

Rebased commits and fixed up commit message with sign-off.

Removing accidental saltstack additions from another feature branch

Signed-off-by: acornies <acornies@gmail.com>
@nicholasjackson
Copy link
Contributor

Looks good to me, only comment would be to add the annotations stuff to the docs but I will merge and add that.

Nice work @acornies

@nicholasjackson nicholasjackson merged commit be8f069 into hashicorp:master Sep 10, 2018
@acornies acornies deleted the feature/annotations_labels branch September 13, 2018 13:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants