Update deps (#189)

hashicorp · Nov 21, 2022 · 2a47fd2 · 2a47fd2
1 parent 93246af
commit 2a47fd2
Show file tree

Hide file tree

Showing 12 changed files with 185 additions and 792 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: build
 
 on:
   push:
-    branches: ["*"]
   workflow_dispatch:
     inputs:
       version:
@@ -20,41 +19,41 @@ jobs:
     outputs:
       go-version: ${{ steps.get-go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Determine Go version
         id: get-go-version
         run: |
           echo "Building with Go $(cat .go-version)"
-          echo "::set-output name=go-version::$(cat .go-version)"
+          echo "go-version=$(cat .go-version)" >> $GITHUB_OUTPUT
 
   get-product-version:
     runs-on: ubuntu-latest
     outputs:
       product-version: ${{ steps.get-product-version.outputs.product-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: get product version
         id: get-product-version
         run: |
           VERSION="${{ github.event.inputs.version || format('0.0.0-dev+{0}', github.sha) }}"
           echo "Using version ${VERSION}"
-          echo "::set-output name=product-version::${VERSION}"
+          echo "product-version=${VERSION}" >> $GITHUB_OUTPUT
   generate-metadata-file:
     needs: get-product-version
     runs-on: ubuntu-latest
     outputs:
       filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
     steps:
       - name: 'Checkout directory'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Generate metadata file
         id: generate-metadata-file
         uses: hashicorp/actions-generate-metadata@v1
         with:
           version: ${{ needs.get-product-version.outputs.product-version }}
           product: ${{ env.PKG_NAME }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: metadata.json
           path: ${{ steps.generate-metadata-file.outputs.filepath }}
@@ -72,10 +71,10 @@ jobs:
     name: Go linux ${{ matrix.arch }} build
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ needs.get-go-version.outputs.go-version }}
 
@@ -87,7 +86,7 @@ jobs:
           mkdir dist out
           make build
           zip -r -j out/${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip dist/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
           path: out/${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_linux_${{ matrix.arch }}.zip
@@ -106,7 +105,7 @@ jobs:
       version: ${{needs.get-product-version.outputs.product-version}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Docker Build (Action)
         uses: hashicorp/actions-docker-build@v1
         with:

diff --git a/.github/workflows/jira.yaml b/.github/workflows/jira.yaml
@@ -25,9 +25,9 @@ jobs:
       id: preprocess
       run: |
         if [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
-          echo "::set-output name=type::PR"
+          echo "type=PR" >> $GITHUB_OUTPUT
         else
-          echo "::set-output name=type::ISS"
+          echo "type=ISS" >> $GITHUB_OUTPUT
         fi
 
     - name: Create ticket

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -3,11 +3,9 @@ name: Tests
 on: [push, workflow_dispatch]
 
 env:
-  GOLANGCI_LINT_VERSION: "v1.47.3"
-  HELM_VERSION: "v3.9.2"
-  KIND_VERSION: "v0.14.0"
-  BATS_VERSION: "1.5.0"
-  NODE_VERSION: "14"
+  KIND_VERSION: "v0.16.0"
+  BATS_VERSION: "1.8.2"
+  NODE_VERSION: "16"
   TARBALL_FILE: vault-csi-provider.docker.tar
 
 jobs:
@@ -22,7 +20,7 @@ jobs:
         id: get-go-version
         run: |
           echo "Building with Go $(cat .go-version)"
-          echo "::set-output name=go-version::$(cat .go-version)"
+          echo "go-version=$(cat .go-version)" >> $GITHUB_OUTPUT
 
   lint:
     needs:
@@ -91,7 +89,7 @@ jobs:
 
       - name: Build
         run: |
-          make e2e-container
+          make e2e-image
           docker save --output "${TARBALL_FILE}" e2e/vault-csi-provider:latest
 
       - name: Test
@@ -109,11 +107,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kind-k8s-version: [1.19.16, 1.20.15, 1.21.12, 1.22.9, 1.23.6, 1.24.2]
+        kind-k8s-version: [1.21.14, 1.22.15, 1.23.13, 1.24.7, 1.25.3]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm install -g bats@${{ env.BATS_VERSION }}
@@ -122,7 +120,7 @@ jobs:
         shell: bash
 
       - name: Create Kind Cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.4.0
         with:
           cluster_name: kind
           config: test/bats/configs/kind/config.yaml

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.18.5
+1.19.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,22 @@
 ## Unreleased
 
+## 1.2.1 (November 21st, 2022)
+
 CHANGES:
 
 * Updated dependencies:
-  * github.com/hashicorp/go-hclog v1.0.0 -> v1.2.2
-  * github.com/hashicorp/vault/api v1.2.0 -> v1.7.2
-  * github.com/stretchr/testify v1.7.2 -> v1.8.0
-  * google.golang.org/grpc v1.41.0 -> v1.49.0
-  * k8s.io/api v0.22.2 -> v0.25.0
-  * k8s.io/apimachinery v0.22.2 -> v0.25.0
-  * k8s.io/client-go v0.22.2 -> v0.25.0
-  * sigs.k8s.io/secrets-store-csi-driver v1.0.0 -> v1.2.3
+  * github.com/hashicorp/go-hclog v1.0.0 -> v1.3.1
+  * github.com/hashicorp/vault/api v1.2.0 -> v1.8.2
+  * github.com/stretchr/testify v1.7.2 -> v1.8.1
+  * google.golang.org/grpc v1.41.0 -> v1.50.1
+  * k8s.io/api v0.22.2 -> v0.25.4
+  * k8s.io/apimachinery v0.22.2 -> v0.25.4
+  * k8s.io/client-go v0.22.2 -> v0.25.4
+  * sigs.k8s.io/secrets-store-csi-driver v1.0.0 -> v1.2.4
   * golang.org/x/net v0.0.0-20220722155237-a158d28d115b -> v0.0.0-20221012135044-0b7e1fb9d458
   * golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f -> v0.0.0-20220728004956-3c1f35247d10
   * golang.org/x/text v0.3.7 -> v0.3.8
-
-* Updated Docker base image from alpine 3.15.0 -> 3.16.2
+* Updated Docker base image from alpine 3.15.0 -> 3.16.3
 
 ## 1.2.0 (August 8th, 2022)
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile contains multiple targets.
 # Use 'docker build --target=<name> .' to build one.
 
-ARG ALPINE_VERSION=3.16.2
+ARG ALPINE_VERSION=3.16.3
 ARG GO_VERSION=latest
 
 # devbuild compiles the binary

diff --git a/Makefile b/Makefile
@@ -15,12 +15,11 @@ PKG=github.com/hashicorp/vault-csi-provider/internal/version
 LDFLAGS?="-X '$(PKG).BuildVersion=$(VERSION)' \
 	-X '$(PKG).BuildDate=$(BUILD_DATE)' \
 	-X '$(PKG).GoVersion=$(shell go version)'"
-K8S_VERSION?=v1.22.2
-CSI_DRIVER_VERSION=1.0.0
-VAULT_HELM_VERSION=0.16.1
+CSI_DRIVER_VERSION=1.2.4
+VAULT_HELM_VERSION=0.22.1
 GOLANGCI_LINT_FORMAT?=colored-line-number
 
-.PHONY: default build test bootstrap fmt lint image e2e-container e2e-setup e2e-teardown e2e-test mod setup-kind promote-staging-manifest
+.PHONY: default build test bootstrap fmt lint image e2e-image e2e-setup e2e-teardown e2e-test mod setup-kind promote-staging-manifest
 
 GO111MODULE?=on
 export GO111MODULE
@@ -63,23 +62,25 @@ image:
 		--tag $(IMAGE_TAG) \
 		.
 
-e2e-container:
+e2e-image:
 	REGISTRY_NAME="e2e" VERSION="latest" make image
 
 setup-kind:
-	kind create cluster --image kindest/node:${K8S_VERSION}
+	kind create cluster
 
 e2e-setup:
 	kind load docker-image e2e/vault-csi-provider:latest
 	kubectl create namespace csi
-	helm install secrets-store-csi-driver https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts/secrets-store-csi-driver-$(CSI_DRIVER_VERSION).tgz?raw=true \
+	helm install secrets-store-csi-driver secrets-store-csi-driver \
+		--repo https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts --version=$(CSI_DRIVER_VERSION) \
 		--wait --timeout=5m \
 		--namespace=csi \
 		--set linux.image.pullPolicy="IfNotPresent" \
 		--set syncSecret.enabled=true
 	helm install vault-bootstrap test/bats/configs/vault \
 		--namespace=csi
-	helm install vault https://github.com/hashicorp/vault-helm/archive/v$(VAULT_HELM_VERSION).tar.gz \
+	helm install vault vault \
+		--repo https://helm.releases.hashicorp.com --version=$(VAULT_HELM_VERSION) \
 		--wait --timeout=5m \
 		--namespace=csi \
 		--values=test/bats/configs/vault/vault.values.yaml

diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ the following additional dependencies installed:
 You can then run:
 
 ```bash
-make setup-kind e2e-container e2e-setup e2e-test
+make setup-kind e2e-image e2e-setup e2e-test
 ```
 
 Finally tidy up the resources created in the kind cluster with:

diff --git a/go.mod b/go.mod
@@ -1,17 +1,17 @@
 module github.com/hashicorp/vault-csi-provider
 
-go 1.18
+go 1.19
 
 require (
-	github.com/hashicorp/go-hclog v1.2.2
-	github.com/hashicorp/vault/api v1.7.2
-	github.com/stretchr/testify v1.8.0
-	google.golang.org/grpc v1.49.0
+	github.com/hashicorp/go-hclog v1.3.1
+	github.com/hashicorp/vault/api v1.8.2
+	github.com/stretchr/testify v1.8.1
+	google.golang.org/grpc v1.50.1
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.25.0
-	k8s.io/apimachinery v0.25.0
-	k8s.io/client-go v0.25.0
-	sigs.k8s.io/secrets-store-csi-driver v1.2.3
+	k8s.io/api v0.25.4
+	k8s.io/apimachinery v0.25.4
+	k8s.io/client-go v0.25.4
+	sigs.k8s.io/secrets-store-csi-driver v1.2.4
 )
 
 require (
@@ -37,7 +37,7 @@ require (
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.3 // indirect
+	github.com/hashicorp/go-plugin v1.4.5 // indirect
 	github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
@@ -48,7 +48,7 @@ require (
 	github.com/hashicorp/go-version v1.2.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/vault/sdk v0.5.1 // indirect
+	github.com/hashicorp/vault/sdk v0.6.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect