Skip to content

Commit

Permalink
Merge branch 'master' into disable-prune-by-default
Browse files Browse the repository at this point in the history
Updated rsa key format to PKCS#8


Updated README.md


Merge pull request #120 from deepmind/rsa-function-update

Updated RSA key format to PKCS#8
Updated CHANGELOG.md


Version incremenet 0.16.11

Fixed typo in make_release.sh


Merge branch 'master' into disable-prune-by-default


Add pretty_printer option to searchvar

Merge pull request #121 from deepmind/searchvar_pretty_printer

Add pretty_printer option to searchvar
Merge branch 'master' into disable-prune-by-default


Removed minikube-es-2 from examples


Updated demo gif


Updated example libjsonnet


Updated requests to 2.19.1


Merge pull request #124 from deepmind/deps

Updated requests to 2.19.1
Removing monitoring from example libs for now


Merge pull request #123 from deepmind/examples-update

Examples update
Merge branch 'master' into disable-prune-by-default
  • Loading branch information
adrianchifor committed Jun 19, 2018
1 parent 475ebb9 commit 10deacc
Show file tree
Hide file tree
Showing 45 changed files with 157 additions and 1,019 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 0.16.11:
- Updated RSA key format to PKCS#8 (#120)

## 0.16.10:
- GPG backend cleanup (no change in usage or cli) (#116)
- Improved caching (#117)
- Verbose options for `inventory` and `searchvar` commands (#119)

## 0.16.9:
- Fixed bug with searchvar keys chain (#115)

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ $ cd examples/kubernetes
$ kapitan compile
Compiled minikube-mysql
Compiled minikube-es
Compiled minikube-es-2
```

# Main concepts
Expand Down Expand Up @@ -381,7 +380,7 @@ The usual flow of creating and using an encrypted secret with kapitan is:
See [mysql.yml class](https://github.com/deepmind/kapitan/tree/master/examples/kubernetes/inventory/classes/component/mysql.yml). When referencing your secret, you can use the following functions to automatically generate, encrypt and save your secret:
```
randomstr - Generates a random string. You can optionally pass the length you want i.e. randomstr:32
rsa - Generates an RSA 4096 private key. You can optionally pass the key size i.e. rsa:2048
rsa - Generates an RSA 4096 private key (PKCS#8). You can optionally pass the key size i.e. rsa:2048
base64 - base64 encodes your secret; to be used as a secondary function i.e. randomstr|base64
sha256 - sha256 hashes your secret; to be used as a secondary function i.e. randomstr|sha256. You can optionally pass a salt i.e randomstr|sha256:salt -> becomes sha256("salt:<generated random string>")
```
Expand Down Expand Up @@ -521,7 +520,6 @@ Show all inventory files where variable is declared:
```
$ kapitan searchvar parameters.elasticsearch.replicas
./inventory/targets/minikube-es-2.yml 2
./inventory/targets/minikube-es.yml 2
./inventory/classes/component/elasticsearch.yml 1
```
Expand Down
Binary file modified docs/demo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 0 additions & 61 deletions examples/kubernetes/compiled/minikube-es-2/README.md

This file was deleted.

67 changes: 0 additions & 67 deletions examples/kubernetes/compiled/minikube-es-2/manifests/es-client.yml

This file was deleted.

64 changes: 0 additions & 64 deletions examples/kubernetes/compiled/minikube-es-2/manifests/es-data.yml

This file was deleted.

This file was deleted.

This file was deleted.

64 changes: 0 additions & 64 deletions examples/kubernetes/compiled/minikube-es-2/manifests/es-master.yml

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions examples/kubernetes/compiled/minikube-es-2/scripts/apply.sh

This file was deleted.

Loading

0 comments on commit 10deacc

Please sign in to comment.