Skip to content

Commit

Permalink
Merge pull request #35 from cyberark/update-to-1.3.8
Browse files Browse the repository at this point in the history
Update to v1.3.8
  • Loading branch information
Geri Jennings authored Dec 20, 2019
2 parents 1ba8d50 + 41be5ad commit 3b9750b
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Contributing

## Table of Contents

- [Releasing](#releasing)

Majority of the instructions on how to build, develop, and run the code in
this repo is located in the main [README.md](README.md) but this file adds
any additional information for contributing code to this project.

## Releasing

To release a new version of this chart:
- Make the appropriate changes
- Update the version number
- Tag the git history with `v##.##.##` version
- Create the release on GitHub for that tag
- Build the helm chart package with `helm package conjur-oss`
- Upload that package to GitHub
- Add that chart to our [Helm charts repo](https://github.com/cyberark/helm-charts)
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@

See [./conjur-oss](conjur-oss) for Chart files and instructions.

## Requirements

This chart requires Helm v3+. The chart may work with older versions of Helm
but that deployment isn't specifically supported.

## Contributing

We store instructions for development and guidelines for how to build and test this
project in the [CONTRIBUTING.md](CONTRIBUTING.md) - please refer to that document
if you would like to contribute.

## License

This repository is licensed under Apache License 2.0 - see [`LICENSE`](LICENSE) for more details.
2 changes: 1 addition & 1 deletion conjur-oss/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: conjur-oss
home: https://www.conjur.org
version: 1.3.7
version: 1.3.8
description: A Helm chart for CyberArk Conjur
icon: https://xebialabs-clients-iglusjax.stackpathdns.com/assets/files/logos/CyberArkConjurLogoWhiteBlue.png
keywords:
Expand Down
2 changes: 1 addition & 1 deletion e2e/install-conjur-no-pv.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e

helm install \
helm install conjur-e2e \
--set dataKey="$(docker run --rm cyberark/conjur data-key generate)" \
--set postgres.persistentVolume.create="false" \
../conjur-oss
2 changes: 1 addition & 1 deletion e2e/install-conjur.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash -e

helm install \
helm install conjur-e2e \
--set dataKey="$(docker run --rm cyberark/conjur data-key generate)" \
../conjur-oss

0 comments on commit 3b9750b

Please sign in to comment.