feat(DATAGO-59809): Upgrade vault to 1.12.1

SolaceDev · Aug 9, 2023 · 58fdc83 · 58fdc83
2 parents 1ba6bd8 + ba08a0d
commit 58fdc83
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/.github/workflows/setup-test-tools/action.yaml b/.github/workflows/setup-test-tools/action.yaml
@@ -6,7 +6,6 @@ runs:
   steps:
     - uses: actions/setup-node@v2
       with:
-<<<<<<< HEAD
         node-version: '16'
     - run: npm install -g bats@${BATS_VERSION}
       shell: bash
@@ -17,15 +16,5 @@ runs:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.10'
-=======
-        node-version: '14'
-    - run: npm install -g bats@${BATS_VERSION}
-      shell: bash
-      env:
-        BATS_VERSION: '1.5.0'
-    - run: bats -v
-      shell: bash
-    - uses: actions/setup-python@v2
->>>>>>> 7f26aa5 (Datago 30304/upgrading vault to 1.9.2 (#14))
     - run: pip install yq
       shell: bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -165,7 +165,6 @@ Improvements:
 * Add `server.route.activeService` to configure if the route should use the active service [GH-570](https://github.com/hashicorp/vault-helm/pull/570)
 * Support configuring `global.imagePullSecrets` from a string array [GH-576](https://github.com/hashicorp/vault-helm/pull/576)
 
-
 ## 0.13.0 (June 17th, 2021)
 
 Improvements:

diff --git a/templates/server-clusterrolebinding.yaml b/templates/server-clusterrolebinding.yaml
@@ -21,4 +21,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ template "vault.serviceAccount.name" . }}
   namespace: {{ .Release.Namespace }}
-{{ end }}
+{{ end }}