Merge pull request #221 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for kubernetes-csi-addons
red-hat-storage · Oct 21, 2024 · 17ddb59 · 17ddb59
2 parents fedb5ce + 568dcb4
commit 17ddb59
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/test-golang.yaml b/.github/workflows/test-golang.yaml
@@ -20,12 +20,6 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Install Protoc
-        # action @v1.3.0 can install protoc 3.19, @v2 installs protoc v21.0+
-        uses: arduino/[email protected]
-        with:
-          version: "3.20.2"
-
       - name: Run "make test"
         run: make test
 

diff --git a/Makefile b/Makefile
@@ -151,7 +151,7 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 .PHONY: test
-test: manifests generate generate-protobuf fmt vet envtest ## Run tests.
+test: manifests generate docker-generate-protobuf fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
 .PHONY: check-all-committed

diff --git a/internal/proto/encryptionkeyrotation.pb.go b/internal/proto/encryptionkeyrotation.pb.go
diff --git a/internal/proto/encryptionkeyrotation_grpc.pb.go b/internal/proto/encryptionkeyrotation_grpc.pb.go
diff --git a/internal/proto/networkfence.pb.go b/internal/proto/networkfence.pb.go
diff --git a/internal/proto/networkfence_grpc.pb.go b/internal/proto/networkfence_grpc.pb.go
diff --git a/internal/proto/reclaimspace.pb.go b/internal/proto/reclaimspace.pb.go
diff --git a/internal/proto/reclaimspace_grpc.pb.go b/internal/proto/reclaimspace_grpc.pb.go
diff --git a/internal/proto/replication.pb.go b/internal/proto/replication.pb.go
diff --git a/internal/proto/replication_grpc.pb.go b/internal/proto/replication_grpc.pb.go
diff --git a/internal/proto/volumegroup.pb.go b/internal/proto/volumegroup.pb.go
diff --git a/internal/proto/volumegroup_grpc.pb.go b/internal/proto/volumegroup_grpc.pb.go