fixed conflicts

rahulsoni43 · Oct 29, 2018 · 2c2999c · 2c2999c
2 parents 501d0fa + 72fa948
commit 2c2999c
Show file tree

Hide file tree

Showing 7 changed files with 514 additions and 469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.options
diff --git a/README.md b/README.md
diff --git a/install-binary.sh b/install-binary.sh
@@ -83,18 +83,3 @@ else
     echo -e "${RED}[FAIL]${NOC} Install git command"
     exit 1
 fi
-
-### Helm-secrets wrapper for helm command with auto decryption and cleanup on the fly
-echo ""
-echo -ne "${YELLOW}*${NOC} Helm-secrets wrapper for helm binary: "
-if [ -f "${HELM_PLUGIN_DIR}/wrapper.sh" ];
-then
-    ln -sf "${HELM_PLUGIN_DIR}/wrapper.sh" "${HELM_WRAPPER}"
-fi
-
-if [ -f ${HELM_WRAPPER} ];
-then
-    echo -e "${GREEN}${HELM_WRAPPER}${NOC}"
-else
-    echo -e "${RED}No ${HELM_WRAPPER} installed${NOC}"
-fi
diff --git a/plugin.yaml b/plugin.yaml
@@ -1,9 +1,10 @@
 name: "secrets"
-version: "1.3.1"
+version: "2.0.0"
 usage: "Secrets encryption in Helm for Git storing"
 description: |-
   This plugin provides secrets values encryption for Helm charts secure storing
 command: "$HELM_PLUGIN_DIR/secrets.sh"
+useTunnel: true
 hooks:
   install: "$HELM_PLUGIN_DIR/install-binary.sh"
   update: "$HELM_PLUGIN_DIR/install-binary.sh"