Omnibus dependency update (microsoft#2166)

Dependebot PRs: - hcsshim/2140 - hcsshim/2145 - hcsshim/2146 - hcsshim/2149 - hcsshim/2153 - hcsshim/2154 - hcsshim/2159 - hcsshim/2161 - hcsshim/2174 - hcsshim/2175 - hcsshim/2176 Update protobuf files. `google.golang.org/grpc v1.64.0` deprecated `Dial[Context]` and `WithBlock`. Replacing either is non-trivial, and left for a future PR. Update dependabot file to ignore patch updates: they rarely provide bug fixes and increase repo churn. Signed-off-by: Hamza El-Saawy <[email protected]> (cherry picked from commit 75428d1) Signed-off-by: Kirtana Ashok <[email protected]>
kiashok · Aug 16, 2024 · 8fea676 · 8fea676
1 parent c014742
commit 8fea676
Show file tree

Hide file tree

Showing 19 changed files with 287 additions and 245 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,6 +15,9 @@ updates:
       # only do patch updates for containerd and co: don't bump anything else
       - dependency-name: "github.com/containerd/*"
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # ignore patch version increment updates to avoid churn
+      - dependency-name: "*"
+        update-types: ["version-update:semver-patch"]
     # allow more PRs to clear queue faster
     open-pull-requests-limit: 10
 
@@ -30,7 +33,6 @@ updates:
     ignore:
       # keep containerd and related dependencies in sync with the shim/the root repo
       - dependency-name: "github.com/containerd/*"
-      # ignore patch version increment updates in test; they shouldn't be critical
       - dependency-name: "*"
         update-types: ["version-update:semver-patch"]
     open-pull-requests-limit: 5

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
       - name: Install protoc
         shell: powershell
         run: |
-          gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v23.2'
+          gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v26.0'
           if ( $LASTEXITCODE ) {
             Write-Output '::error::Could not download protoc.'
             exit $LASTEXITCODE

diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
diff --git a/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go b/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
diff --git a/cmd/ncproxy/run.go b/cmd/ncproxy/run.go
@@ -237,7 +237,11 @@ func run(clicontext *cli.Context) error {
 		}
 
 		// TODO: use grpc.NewClient here instead
+<<<<<<< HEAD
 		//nolint:staticcheck // SA1019: grpc.DialContext is deprecated
+=======
+		//nolint:staticcheck // SA1019: grpc.DialContext is deprecated, replace with grpc.NewClient
+>>>>>>> 75428d123 (Omnibus dependency update (#2166))
 		client, err := grpc.DialContext(dialCtx, conf.NodeNetSvcAddr, opts...)
 		if err != nil {
 			return fmt.Errorf("failed to connect to NodeNetworkService at address %s", conf.NodeNetSvcAddr)

diff --git a/internal/computeagent/computeagent.pb.go b/internal/computeagent/computeagent.pb.go
diff --git a/internal/extendedtask/extendedtask.pb.go b/internal/extendedtask/extendedtask.pb.go