From e4184a48b40e01d32db6bd6753879d8a0b256613 Mon Sep 17 00:00:00 2001 From: yxxhero <11087727+yxxhero@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:17:07 +0800 Subject: [PATCH] update keyring docs (#986) * update docs about keyring Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 2 +- docs/index.md | 4 ++++ test/integration/lib/ensure.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9053b2d4..980b46f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -137,7 +137,7 @@ jobs: KUSTOMIZE_VERSION: ${{ matrix.kustomize-version }} run: make -C .github/workflows helm vault sops kustomize - name: Start minikube - uses: medyagh/setup-minikube@master + uses: medyagh/setup-minikube@latest - name: Execute integration tests env: HELM_SECRETS_VERSION: ${{ matrix.plugin-secrets-version }} diff --git a/docs/index.md b/docs/index.md index f6314246..0d9f51e9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -155,6 +155,8 @@ repositories: password: optional_password oci: true passCredentials: true + verify: true + keyring: path/to/keyring.gpg # Advanced configuration: You can use a ca bundle to use an https repo # with a self-signed certificate - name: insecure @@ -185,6 +187,7 @@ helmDefaults: - "--set k=v" # verify the chart before upgrading (only works with packaged charts not directories) (default false) verify: true + keyring: path/to/keyring.gpg # wait for k8s resources via --wait. (default false) wait: true # if set and --wait enabled, will wait until all Jobs have been completed before marking the release as successful. It will wait for as long as --timeout (default false, Implemented in Helm3.5) @@ -277,6 +280,7 @@ releases: - vault_secret.yaml # Override helmDefaults options for verify, wait, waitForJobs, timeout, recreatePods and force. verify: true + keyring: path/to/keyring.gpg wait: true waitForJobs: true timeout: 60 diff --git a/test/integration/lib/ensure.sh b/test/integration/lib/ensure.sh index bf3e1798..c2942b3f 100644 --- a/test/integration/lib/ensure.sh +++ b/test/integration/lib/ensure.sh @@ -11,7 +11,7 @@ fi if [ ! $(minikube status --format '{{.ClusterStatus}}') == "Running" ]; then fail "Minikube Cluster is not running." fi -if ! kubectl version --short 1> /dev/null; then +if ! kubectl version 1> /dev/null; then fail "Could not connect to minikube apiserver" fi if ! hash curl 1>/dev/null; then