From 6b3cd73f22afcb66702f69e31fef0cc7dea94e27 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 10 May 2016 14:27:42 +0530 Subject: [PATCH] charts: `helm generate` should be forced if the manifest already exists (#37) --- _docs/redmine/README.md | 4 ++-- mariadb-cluster/README.md | 2 +- mariadb/README.md | 2 +- memcached/README.md | 2 +- mongodb/README.md | 2 +- postgresql/README.md | 2 +- redis/README.md | 2 +- redmine/README.md | 2 +- run-generators.sh | 4 ++-- tomcat/README.md | 2 +- wildfly/README.md | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_docs/redmine/README.md b/_docs/redmine/README.md index cba5a9012a..42c95c91a2 100644 --- a/_docs/redmine/README.md +++ b/_docs/redmine/README.md @@ -140,7 +140,7 @@ Refer to the [MariaDB persistence](#mariadb-persistence) section for setting up Apply the changes. ```bash -$ helmc generate mariadb +$ helmc generate --force mariadb ``` It's time to deploy the MariaDB Chart. @@ -196,7 +196,7 @@ For information on setting up email notifications please read the [Email Deliver Once your done updating the deployment parameters, apply the changes with. ```bash -$ helmc generate redmine +$ helmc generate --force redmine ``` And finally we're ready to deploy the Redmine Chart. diff --git a/mariadb-cluster/README.md b/mariadb-cluster/README.md index dd9d5bfa65..80d9f440da 100644 --- a/mariadb-cluster/README.md +++ b/mariadb-cluster/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate mariadb-cluster +$ helmc generate --force mariadb-cluster ``` ## Cleanup diff --git a/mariadb/README.md b/mariadb/README.md index 4cd7e45896..134ddb041a 100644 --- a/mariadb/README.md +++ b/mariadb/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate mariadb +$ helmc generate --force mariadb ``` ## Cleanup diff --git a/memcached/README.md b/memcached/README.md index a74088a613..986fa947a4 100644 --- a/memcached/README.md +++ b/memcached/README.md @@ -19,7 +19,7 @@ By default authentication is not enabled on the Memcached server. Edit the value Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate memcached +$ helmc generate --force memcached ``` ## Cleanup diff --git a/mongodb/README.md b/mongodb/README.md index 84707a6be9..316e426a93 100644 --- a/mongodb/README.md +++ b/mongodb/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate mongodb +$ helmc generate --force mongodb ``` ## Cleanup diff --git a/postgresql/README.md b/postgresql/README.md index ab24e2bb66..9b69f5e69b 100644 --- a/postgresql/README.md +++ b/postgresql/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate postgresql +$ helmc generate --force postgresql ``` ## Cleanup diff --git a/redis/README.md b/redis/README.md index 35f9f84691..f63c1a0b0c 100644 --- a/redis/README.md +++ b/redis/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate redis +$ helmc generate --force redis ``` ## Cleanup diff --git a/redmine/README.md b/redmine/README.md index 7dcc8f124a..66795c2901 100644 --- a/redmine/README.md +++ b/redmine/README.md @@ -39,7 +39,7 @@ The values of `redmineUser` and `redminePassword` are the login credentials when Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate redmine +$ helmc generate --force redmine ``` ## Access your Redmine application diff --git a/run-generators.sh b/run-generators.sh index 4f5c34ebc0..162504f936 100755 --- a/run-generators.sh +++ b/run-generators.sh @@ -8,11 +8,11 @@ SCRIPT_DIR=$(dirname $0) cd $SCRIPT_DIR BASE_DIR=$PWD -for file in $(grep -r "^#helm:generate" . --exclude-dir=manifests | cut -d':' -f1) +for file in $(grep -r "^#helm:generate" . --exclude-dir=manifests --exclude-dir=_docs --exclude-dir=_tests | cut -d':' -f1) do CHART_DIR=$(echo $file | cut -d'/' -f2) TEMPLATE_FILE=$(echo "$file" | cut -d'/' -f3-) - COMMAND=$(cat $file | grep ^#helm:generate | cut -d' ' -f2- | sed "s|\$HELM_GENERATE_FILE|$TEMPLATE_FILE|") + COMMAND=$(cat $file | grep ^#helm:generate | cut -d' ' -f2- | sed "s|\$HELM_GENERATE_FILE|--force $TEMPLATE_FILE|") cd $CHART_DIR echo "Running generator: $COMMAND" $COMMAND diff --git a/tomcat/README.md b/tomcat/README.md index 3d9c50e264..ef7363f5b1 100644 --- a/tomcat/README.md +++ b/tomcat/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate tomcat +$ helmc generate --force tomcat ``` ## Cleanup diff --git a/wildfly/README.md b/wildfly/README.md index 6763257df4..8fdec8ce4b 100644 --- a/wildfly/README.md +++ b/wildfly/README.md @@ -25,7 +25,7 @@ Configurable parameters can be specified in `tpl/values.toml`. If not specified Finally, generate the chart to apply your changes to the configuration. ```bash -$ helmc generate wildfly +$ helmc generate --force wildfly ``` ## Cleanup