From f637e57000406cd3a2c50458106d53763455fb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Miguel=20Benito=20Calzada?= Date: Mon, 15 Jul 2024 12:48:18 +0200 Subject: [PATCH 1/8] Fix `FromAsCasing` warning in Dockerfiles (#7895) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Description of the change Make casing of `FROM` and `AS` keywords in dockerfiles consistent. ### Benefits This change will remove the warning being shown when docker images are built. ### Possible drawbacks ### Applicable issues ### Additional information ``` 1 warning found (use --debug to expand): - FromAsCasing: 'as' and 'FROM' keywords' casing do not match (line 6) ``` Sample job: https://github.com/vmware-tanzu/kubeapps/actions/runs/9937352647/job/27449161644#step:6:978 Signed-off-by: Jesús Benito Calzada Co-authored-by: Jesús Benito Calzada --- cmd/apprepository-controller/Dockerfile | 2 +- cmd/asset-syncer/Dockerfile | 2 +- cmd/kubeapps-apis/Dockerfile | 2 +- cmd/oci-catalog/Dockerfile | 2 +- cmd/pinniped-proxy/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/apprepository-controller/Dockerfile b/cmd/apprepository-controller/Dockerfile index 4c3df8f548c..3244fb5e1e6 100644 --- a/cmd/apprepository-controller/Dockerfile +++ b/cmd/apprepository-controller/Dockerfile @@ -3,7 +3,7 @@ # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.22.2 as builder +FROM bitnami/golang:1.22.2 AS builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg diff --git a/cmd/asset-syncer/Dockerfile b/cmd/asset-syncer/Dockerfile index 4bb1469afb6..e4d92d55210 100644 --- a/cmd/asset-syncer/Dockerfile +++ b/cmd/asset-syncer/Dockerfile @@ -3,7 +3,7 @@ # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.22.2 as builder +FROM bitnami/golang:1.22.2 AS builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg diff --git a/cmd/kubeapps-apis/Dockerfile b/cmd/kubeapps-apis/Dockerfile index 5b8fe779f43..cbb8d5ce9cf 100644 --- a/cmd/kubeapps-apis/Dockerfile +++ b/cmd/kubeapps-apis/Dockerfile @@ -3,7 +3,7 @@ # syntax = docker/dockerfile:1 -FROM bitnami/golang:1.22.2 as builder +FROM bitnami/golang:1.22.2 AS builder WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ ARG VERSION="devel" diff --git a/cmd/oci-catalog/Dockerfile b/cmd/oci-catalog/Dockerfile index 564789dfaae..43812a15dca 100644 --- a/cmd/oci-catalog/Dockerfile +++ b/cmd/oci-catalog/Dockerfile @@ -3,7 +3,7 @@ # syntax = docker/dockerfile:1 -FROM rust:1.77.1 as builder +FROM rust:1.77.1 AS builder WORKDIR /oci-catalog ARG VERSION="devel" diff --git a/cmd/pinniped-proxy/Dockerfile b/cmd/pinniped-proxy/Dockerfile index c2df349ac8b..542c029c9c7 100644 --- a/cmd/pinniped-proxy/Dockerfile +++ b/cmd/pinniped-proxy/Dockerfile @@ -3,7 +3,7 @@ # syntax = docker/dockerfile:1 -FROM rust:1.77.1 as builder +FROM rust:1.77.1 AS builder WORKDIR /pinniped-proxy ARG VERSION From ef034c62a2601f0ce20aa8a61caf120f042d3348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Miguel=20Benito=20Calzada?= Date: Mon, 15 Jul 2024 17:45:47 +0200 Subject: [PATCH 2/8] Revert prost update (#7896) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert prost 0.13.1 -> 0.12.4 and generate code from protos ### Description of the change #7888 Introduced a breaking change that broke the compilation of `oci-catalog` module. At this moment, we cannot invest time in fixing the issue so we are reverting that change. ### Benefits `oci-catalog` module compiles again. ### Possible drawbacks We are downgrading a dependency with all its consequences. ### Applicable issues - fixes # ### Additional information --------- Signed-off-by: Jesús Benito Calzada --- cmd/oci-catalog/Cargo.lock | 43 +++++-------------- cmd/oci-catalog/Cargo.toml | 2 +- .../gen/catalog/v1alpha1/ocicatalog.pb.go | 14 +++--- .../catalog/v1alpha1/ocicatalog_grpc.pb.go | 26 +++++++---- 4 files changed, 35 insertions(+), 50 deletions(-) diff --git a/cmd/oci-catalog/Cargo.lock b/cmd/oci-catalog/Cargo.lock index 8f25eef90b6..cb18584660e 100644 --- a/cmd/oci-catalog/Cargo.lock +++ b/cmd/oci-catalog/Cargo.lock @@ -836,7 +836,7 @@ dependencies = [ "env_logger", "futures-core", "log", - "prost 0.13.1", + "prost", "reqwest", "rstest", "serde", @@ -930,22 +930,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" -dependencies = [ - "bytes", - "prost-derive 0.13.1", + "prost-derive", ] [[package]] @@ -962,7 +952,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.6", + "prost", "prost-types", "regex", "syn", @@ -972,22 +962,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-derive" -version = "0.13.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", "itertools", @@ -1002,7 +979,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] @@ -1473,7 +1450,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.6", + "prost", "tokio", "tokio-stream", "tower", @@ -1502,7 +1479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cef6e24bc96871001a7e48e820ab240b3de2201e59b517cf52835df2f1d2350" dependencies = [ "async-stream", - "prost 0.12.6", + "prost", "tokio", "tokio-stream", "tonic", diff --git a/cmd/oci-catalog/Cargo.toml b/cmd/oci-catalog/Cargo.toml index 10d19775619..4e376e68dbb 100644 --- a/cmd/oci-catalog/Cargo.toml +++ b/cmd/oci-catalog/Cargo.toml @@ -14,7 +14,7 @@ clap = { version = "4.5", features = ["derive", "env"] } env_logger = "0.11" futures-core = "0.3" log = "0.4" -prost = "0.13" +prost = "0.12" reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go index 3a4de040ff3..e7ba8731dfe 100644 --- a/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go +++ b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go @@ -1,9 +1,9 @@ -// Copyright 2023-2024 the Kubeapps contributors. +// Copyright 2023 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: ocicatalog/v1alpha1/ocicatalog.proto @@ -427,7 +427,7 @@ func file_ocicatalog_v1alpha1_ocicatalog_proto_rawDescGZIP() []byte { var file_ocicatalog_v1alpha1_ocicatalog_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_ocicatalog_v1alpha1_ocicatalog_proto_goTypes = []interface{}{ +var file_ocicatalog_v1alpha1_ocicatalog_proto_goTypes = []any{ (RegistryProvider)(0), // 0: ocicatalog.v1alpha1.RegistryProvider (*ListRepositoriesForRegistryRequest)(nil), // 1: ocicatalog.v1alpha1.ListRepositoriesForRegistryRequest (*Repository)(nil), // 2: ocicatalog.v1alpha1.Repository @@ -455,7 +455,7 @@ func file_ocicatalog_v1alpha1_ocicatalog_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ListRepositoriesForRegistryRequest); i { case 0: return &v.state @@ -467,7 +467,7 @@ func file_ocicatalog_v1alpha1_ocicatalog_proto_init() { return nil } } - file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Repository); i { case 0: return &v.state @@ -479,7 +479,7 @@ func file_ocicatalog_v1alpha1_ocicatalog_proto_init() { return nil } } - file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ListTagsForRepositoryRequest); i { case 0: return &v.state @@ -491,7 +491,7 @@ func file_ocicatalog_v1alpha1_ocicatalog_proto_init() { return nil } } - file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_ocicatalog_v1alpha1_ocicatalog_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Tag); i { case 0: return &v.state diff --git a/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go index 7383edd50ab..f99382ac1d4 100644 --- a/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go +++ b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.4.0 // - protoc (unknown) // source: ocicatalog/v1alpha1/ocicatalog.proto @@ -18,8 +18,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( OCICatalogService_ListRepositoriesForRegistry_FullMethodName = "/ocicatalog.v1alpha1.OCICatalogService/ListRepositoriesForRegistry" @@ -29,6 +29,9 @@ const ( // OCICatalogServiceClient is the client API for OCICatalogService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// The OCICatalogService defines the two RPCs for listing repositories and listing tags +// for a repository. type OCICatalogServiceClient interface { ListRepositoriesForRegistry(ctx context.Context, in *ListRepositoriesForRegistryRequest, opts ...grpc.CallOption) (OCICatalogService_ListRepositoriesForRegistryClient, error) ListTagsForRepository(ctx context.Context, in *ListTagsForRepositoryRequest, opts ...grpc.CallOption) (OCICatalogService_ListTagsForRepositoryClient, error) @@ -43,11 +46,12 @@ func NewOCICatalogServiceClient(cc grpc.ClientConnInterface) OCICatalogServiceCl } func (c *oCICatalogServiceClient) ListRepositoriesForRegistry(ctx context.Context, in *ListRepositoriesForRegistryRequest, opts ...grpc.CallOption) (OCICatalogService_ListRepositoriesForRegistryClient, error) { - stream, err := c.cc.NewStream(ctx, &OCICatalogService_ServiceDesc.Streams[0], OCICatalogService_ListRepositoriesForRegistry_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &OCICatalogService_ServiceDesc.Streams[0], OCICatalogService_ListRepositoriesForRegistry_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &oCICatalogServiceListRepositoriesForRegistryClient{stream} + x := &oCICatalogServiceListRepositoriesForRegistryClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -75,11 +79,12 @@ func (x *oCICatalogServiceListRepositoriesForRegistryClient) Recv() (*Repository } func (c *oCICatalogServiceClient) ListTagsForRepository(ctx context.Context, in *ListTagsForRepositoryRequest, opts ...grpc.CallOption) (OCICatalogService_ListTagsForRepositoryClient, error) { - stream, err := c.cc.NewStream(ctx, &OCICatalogService_ServiceDesc.Streams[1], OCICatalogService_ListTagsForRepository_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &OCICatalogService_ServiceDesc.Streams[1], OCICatalogService_ListTagsForRepository_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &oCICatalogServiceListTagsForRepositoryClient{stream} + x := &oCICatalogServiceListTagsForRepositoryClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -109,6 +114,9 @@ func (x *oCICatalogServiceListTagsForRepositoryClient) Recv() (*Tag, error) { // OCICatalogServiceServer is the server API for OCICatalogService service. // All implementations must embed UnimplementedOCICatalogServiceServer // for forward compatibility +// +// The OCICatalogService defines the two RPCs for listing repositories and listing tags +// for a repository. type OCICatalogServiceServer interface { ListRepositoriesForRegistry(*ListRepositoriesForRegistryRequest, OCICatalogService_ListRepositoriesForRegistryServer) error ListTagsForRepository(*ListTagsForRepositoryRequest, OCICatalogService_ListTagsForRepositoryServer) error @@ -143,7 +151,7 @@ func _OCICatalogService_ListRepositoriesForRegistry_Handler(srv interface{}, str if err := stream.RecvMsg(m); err != nil { return err } - return srv.(OCICatalogServiceServer).ListRepositoriesForRegistry(m, &oCICatalogServiceListRepositoriesForRegistryServer{stream}) + return srv.(OCICatalogServiceServer).ListRepositoriesForRegistry(m, &oCICatalogServiceListRepositoriesForRegistryServer{ServerStream: stream}) } type OCICatalogService_ListRepositoriesForRegistryServer interface { @@ -164,7 +172,7 @@ func _OCICatalogService_ListTagsForRepository_Handler(srv interface{}, stream gr if err := stream.RecvMsg(m); err != nil { return err } - return srv.(OCICatalogServiceServer).ListTagsForRepository(m, &oCICatalogServiceListTagsForRepositoryServer{stream}) + return srv.(OCICatalogServiceServer).ListTagsForRepository(m, &oCICatalogServiceListTagsForRepositoryServer{ServerStream: stream}) } type OCICatalogService_ListTagsForRepositoryServer interface { From 44d4cbb1624eb33e327656392134d6fbd9764623 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:51:58 +0200 Subject: [PATCH 3/8] Bump github.com/containerd/containerd from 1.7.15 to 1.7.19 (#7877) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.15 to 1.7.19.
Release notes

Sourced from github.com/containerd/containerd's releases.

containerd API 1.7.19

Welcome to the api/v1.7.19 release of containerd!

The first dedicated release for the containerd 1.7 API. This release is separately tagged from the main 1.7.x releases after the v1.7.18 release but follows the versioning.

Highlights

Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues.

Contributors

  • Derek McGowan
  • Akhil Mohan
  • Phil Estes
  • Sebastiaan van Stijn

Changes

  • Prepare release notes for api v1.7.19 (#10386)
  • : api: update github.com/containerd/ttrpc v1.2.5 to align with containerd 1.7 module (#10364)
    • 2a6aa6ddf [release/1.7] api: update github.com/containerd/ttrpc v1.2.5
  • Add API go module (#10189)

Dependency Changes

  • github.com/containerd/ttrpc v1.2.4 -> v1.2.5
  • github.com/golang/protobuf v1.5.4 -> v1.5.3
  • google.golang.org/genproto/googleapis/rpc d307bd883b97 -> b8732ec3820d

Previous release can be found at v1.7.18

containerd 1.7.19

Welcome to the v1.7.19 release of containerd!

The nineteenth patch release for containerd 1.7 contains various updates and splits the main module from the api module in preparation for the same change in containerd 2.0. Splitting the modules will allow 1.7 and 2.x to both exist

... (truncated)

Commits
  • 2bf793e Merge pull request #10391 from dmcgowan/prepare-v1.7.19
  • 74a3d29 Prepare release notes for v1.7.19
  • 043c712 Merge pull request #10406 from samuelkarp/nri-panic-1.7
  • 5a587e8 Merge pull request #10403 from thaJeztah/1.7_backport_hcsshim_version
  • 7f5d3c5 cri: ensure NRI API never has nil CRI
  • aea977f Merge pull request #10397 from thaJeztah/1.7_backport_deprecate_reference_Spl...
  • 6efc5bb update runhcs binary to v0.11.7
  • 945ae09 Windows: Supply windows shim version via file
  • bb84d90 Merge pull request #10396 from yyatmsft/updatehcsshim-release17
  • dba5357 pkg/reference: deprecate SplitObject
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/containerd/containerd&package-manager=go_modules&previous-version=1.7.15&new-version=1.7.19)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesús Miguel Benito Calzada --- go.mod | 5 +++-- go.sum | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 14e4a2e1d59..2abdfea83ab 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/ahmetb/go-linq/v3 v3.2.0 github.com/bufbuild/connect-go v1.10.0 github.com/bufbuild/connect-grpchealth-go v1.1.1 - github.com/containerd/containerd v1.7.15 + github.com/containerd/containerd v1.7.19 github.com/cppforlife/go-cli-ui v0.0.0-20220622150351-995494831c6c github.com/disintegration/imaging v1.6.2 github.com/distribution/reference v0.6.0 @@ -78,7 +78,6 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/Masterminds/squirrel v1.5.4 // indirect - github.com/Microsoft/hcsshim v0.11.4 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/config v1.27.10 // indirect @@ -98,7 +97,9 @@ require ( github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect + github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/log v0.1.0 // indirect + github.com/containerd/platforms v0.2.1 // indirect github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef // indirect github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect github.com/cppforlife/go-patch v0.2.0 // indirect diff --git a/go.sum b/go.sum index affd66bffec..903d13a6882 100644 --- a/go.sum +++ b/go.sum @@ -78,10 +78,10 @@ github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= -github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZNZQ= +github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/adhocore/gronx v1.8.1 h1:F2mLTG5sB11z7vplwD4iydz3YCEjstSfYmCrdSm3t6A= github.com/adhocore/gronx v1.8.1/go.mod h1:7oUY1WAU8rEJWmAxXR2DN0JaO4gi9khSgKjiRypqteg= @@ -172,12 +172,16 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= -github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes= -github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= +github.com/containerd/containerd v1.7.19 h1:/xQ4XRJ0tamDkdzrrBAUy/LE5nCcxFKdBm4EcPrSMEE= +github.com/containerd/containerd v1.7.19/go.mod h1:h4FtNYUUMB4Phr6v+xG89RYKj9XccvbNSCKjdufCrkc= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM= +github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= +github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= @@ -929,8 +933,6 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 1a547935fbf0c5c2a6a119e5f15fad7d8c9eb57a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:53:06 +0200 Subject: [PATCH 4/8] Bump github.com/docker/cli from 26.0.2+incompatible to 27.0.3+incompatible (#7874) Bumps [github.com/docker/cli](https://github.com/docker/cli) from 26.0.2+incompatible to 27.0.3+incompatible.
Commits
  • 7d4bcd8 Merge pull request #5206 from thaJeztah/27.0_backport_docker_27.0.2
  • 3134d55 vendor: github.com/docker/docker v27.0.2
  • 912c1dd Merge pull request #5202 from vvoland/vendor-docker
  • c97e809 vendor: github.com/docker/docker v27.0.2-dev (e953d76450b6)
  • 82bd815 Merge pull request #5201 from vvoland/vendor-docker
  • 8945848 vendor: github.com/docker/docker v27.0.2-dev (861fde8cc974)
  • b54897b Merge pull request #5199 from vvoland/v27.0-5191
  • cd56091 gha/e2e: Update latest version to 27.0
  • 9a101a9 Merge pull request #5198 from thaJeztah/27.0_backport_carry_fix_custom_ports
  • 50fae20 cli/config/credentials: ConvertToHostname: handle IP-addresses
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/docker/cli&package-manager=go_modules&previous-version=26.0.2+incompatible&new-version=27.0.3+incompatible)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2abdfea83ab..eb9c87d7944 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cppforlife/go-cli-ui v0.0.0-20220622150351-995494831c6c github.com/disintegration/imaging v1.6.2 github.com/distribution/reference v0.6.0 - github.com/docker/cli v26.0.2+incompatible + github.com/docker/cli v27.0.3+incompatible github.com/fluxcd/helm-controller/api v0.37.4 github.com/fluxcd/pkg/apis/meta v1.4.0 github.com/fluxcd/pkg/oci v0.36.0 diff --git a/go.sum b/go.sum index 903d13a6882..7a7cf263cec 100644 --- a/go.sum +++ b/go.sum @@ -216,8 +216,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v26.0.2+incompatible h1:4C4U8ZqrlNDe/R1U1zFFX+YsCFiVUicJqo4WVdInJas= -github.com/docker/cli v26.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= +github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= From a80a68fb1eb497de6ac97b18a24a47f24faa9a4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:56:01 +0200 Subject: [PATCH 5/8] Bump @bufbuild/buf from 1.30.1 to 1.34.0 in /dashboard (#7859) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@bufbuild/buf](https://github.com/bufbuild/buf) from 1.30.1 to 1.34.0.
Release notes

Sourced from @​bufbuild/buf's releases.

v1.34.0

  • Add buf config ls-modules command to list configured modules.
  • Fix issue where buf generate would succeed on missing insertion points and panic on empty insertion point files.
  • Update buf generate to allow the use of Editions syntax when doing local code generation by proxying to a protoc binary (for languages where code gen is implemented inside of protoc instead of in a plugin: Java, C++, Python, etc).
  • Allow use of an array of strings for the protoc_path property of for buf.gen.yaml, where the first array element is the actual path and other array elements are extra arguments that are passed to protoc each time it is invoked.

v1.33.0

  • Allow user to override --source-control-url and --create-default-label when using --git-metadata with buf push.
  • Fix buf push --git-metadata when local tags point to different objects than the remote tags.
  • Fix issue where comment ignores were not respected for PROTOVALIDATE lint rule violations.
  • Add buf beta registry label {create,get,list} to replace buf beta registry {draft, tag} commands.
  • Update buf beta commit {get,list} command outputs to display create time and stop displaying associated tags.
  • Change the behavior of buf beta commit list <buf.build/owner/repository> when the reference is empty. It now lists commits in the repository instead of listing commits of the default label.
  • Update output of buf format to canonicalize the punctuation used in message literals in option values. The output now always uses { and } instead of < and >; it adds : separators between field names and message values if the source omitted them, and it removes unnecessary separators between fields (, and ; are allowed, but neither is needed).
  • Update buf format -w so that it does not touch files whose contents don't actually change. This eliminates noisy notifications to file-system-watcher tools that are watching the directory that contains proto sources.
  • Update buf generate to work with plugins provided by protoc for versions v24.0 to v25.3. Editions support was experimental in these releases, and the plugins advertise incomplete support for editions, which triggers buf to report an error. With this fix, these plugins can be used again as long as none of the input files use editions syntax.
  • Add buf push --exclude-unnamed flag to exclude unnamed modules when pushing to the BSR.

v1.32.2

  • Update buf generate to warn instead of error when proto3 optional is required but not supported by a plugin.

v1.32.1

  • Fix archive and git inputs so that --path and --exclude-path paths are relative to the #subdir rather than the root of the input. This fixes an unintended behavior change that was introduced in v1.32.0.
  • Add module input for protoc-gen-buf-lint and protoc-gen-buf-breaking to allow users to specify the module for v2 configuration files.

v1.32.0

This release contains the (completely backwards-compatible) next generation of the Buf CLI. The Buf CLI and its associated configuration have been completely overhauled to support monorepos as first-class citizens. We'd call it a v2 of buf, but it's not. Buf is enterprise-grade software, and we want you to be minimally impacted. The v1.32.0 release of buf introduces v2 config formats for both buf.yaml and buf.gen.yaml. All your current commands and v1 configuration continue to work, so you can upgrade to v2 configuration when appropriate.

To read more about what's new, check out our blog and our docs:

  • Add version v2 for buf.yaml and buf.gen.yaml configuration files.
  • Add buf config migrate to migrate configuration files to the latest version (now v2).
  • Move buf mod init to buf config init. buf mod init is now deprecated.
  • Move buf mod ls-lint-rules to buf config ls-lint-rules. buf mod ls-lint-rules is now deprecated.
  • Move buf mod ls-breaking-rules to buf config ls-breaking-rules. buf mod ls-breaking-rules is now deprecated.
  • Move buf mod prune to buf dep prune. buf mod prune is now deprecated.
  • Move buf mod update to buf dep update. buf mod update is now deprecated.
  • Move buf mod {clear-cache,cc} to buf registry cc. buf mod {clear-cache,cc} is now deprecated.
  • Move buf beta graph to stable as buf dep graph.

... (truncated)

Changelog

Sourced from @​bufbuild/buf's changelog.

[v1.34.0] - 2024-06-21

  • Add buf config ls-modules command to list configured modules.
  • Fix issue where buf generate would succeed on missing insertion points and panic on empty insertion point files.
  • Update buf generate to allow the use of Editions syntax when doing local code generation by proxying to a protoc binary (for languages where code gen is implemented inside of protoc instead of in a plugin: Java, C++, Python, etc).
  • Allow use of an array of strings for the protoc_path property of for buf.gen.yaml, where the first array element is the actual path and other array elements are extra arguments that are passed to protoc each time it is invoked.

[v1.33.0] - 2024-06-13

  • Allow user to override --source-control-url and --create-default-label when using --git-metadata with buf push.
  • Fix buf push --git-metadata when local tags point to different objects than the remote tags.
  • Fix issue where comment ignores were not respected for PROTOVALIDATE lint rule violations.
  • Add buf beta registry label {create,get,list} to replace buf beta registry {draft, tag} commands.
  • Update buf beta commit {get,list} command outputs to display create time and stop displaying associated tags.
  • Change the behavior of buf beta commit list <buf.build/owner/repository> when the reference is empty. It now lists commits in the repository instead of listing commits of the default label.
  • Update output of buf format to canonicalize the punctuation used in message literals in option values. The output now always uses { and } instead of < and >; it adds : separators between field names and message values if the source omitted them, and it removes unnecessary separators between fields (, and ; are allowed, but neither is needed).
  • Update buf format -w so that it does not touch files whose contents don't actually change. This eliminates noisy notifications to file-system-watcher tools that are watching the directory that contains proto sources.
  • Update buf generate to work with plugins provided by protoc for versions v24.0 to v25.3. Editions support was experimental in these releases, and the plugins advertise incomplete support for editions, which triggers buf to report an error. With this fix, these plugins can be used again as long as none of the input files use editions syntax.
  • Add buf push --exclude-unnamed flag to exclude unnamed modules when pushing to the BSR.

[v1.32.2] - 2024-05-28

  • Update buf generate to warn instead of error when proto3 optional is required but not supported by a plugin.

[v1.32.1] - 2024-05-21

  • Fix archive and git inputs so that --path and --exclude-path paths are relative to the #subdir rather than the root of the input. This fixes an unintended behavior change

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@bufbuild/buf&package-manager=npm_and_yarn&previous-version=1.30.1&new-version=1.34.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesús Miguel Benito Calzada --- dashboard/package.json | 2 +- dashboard/yarn.lock | 80 +++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dashboard/package.json b/dashboard/package.json index fc069358db0..b5f7439b328 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -73,7 +73,7 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@bufbuild/buf": "^1.30.1", + "@bufbuild/buf": "^1.34.0", "@bufbuild/protoc-gen-es": "^1.8.0", "@connectrpc/protoc-gen-connect-es": "^1.4.0", "@craco/craco": "^7.1.0", diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock index 1d977f7a8d0..91c7d0bf001 100644 --- a/dashboard/yarn.lock +++ b/dashboard/yarn.lock @@ -1190,47 +1190,47 @@ resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-7.0.1.tgz#457233b0a18741b7711855044102b82bae7a070b" integrity sha512-URg8UM6lfC9ZYqFipItRSxYJdgpU5d2Z4KnjsJ+rj6tgAmGme7E+PQNCiud8g0HDaZKMovu2qjfa0f5Ge0Vlsg== -"@bufbuild/buf-darwin-arm64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.30.1.tgz#294b45cbdf7ef67f042580c212729d8b3da21102" - integrity sha512-FRgf+x4V4s9Z1wH2xHdP8+1AYtil1GCmMjzKf/4AQ+eaUpoLfipSIsVYiBrnpcRxEPe9UMVzwNjKtPak/szwPw== - -"@bufbuild/buf-darwin-x64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.30.1.tgz#9518def718a7e555f8fc5c2c810c92cf1902efb3" - integrity sha512-kE0ne45zE7lSdv9WxPVhapwu627WMbWmWCzqSxzYr8sWDLqiAuw+XvO9/mHGdPWcMhV4lMX6tutitd9PPVxK8A== - -"@bufbuild/buf-linux-aarch64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.30.1.tgz#f0bf5e93d80e614dc0c46edd0c9c66ed4db508e9" - integrity sha512-kVV9Sl0GwZiQkMOXJiuwuU+gIHe6AWcYBMRMmuW55sY0ePZNXBmRGt4k5W4ijy98O6pnY3ao+n9ne0KwiD9MVA== - -"@bufbuild/buf-linux-x64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.30.1.tgz#5ba1618d317d9658f10bc0e0a0265ab0de73b3db" - integrity sha512-RacDbQJYNwqRlMESa/rLHprfUVa8Wu1/cmcqS29Fyt/cGzs0G8sNcQzQ87HYFIS9cSlSPl6vWL0x8JqQRp68lQ== - -"@bufbuild/buf-win32-arm64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.30.1.tgz#ac4dc7fc1181d93bfa8794a7c72171f3134e55e5" - integrity sha512-ndp/qb5M6yrSzcnMI0j4jjAuDKa7zHBFc187FwyDb3v63rvyQeYqncHb0leT5ZWqfNggJT4vXIH6QnH82PfDQw== - -"@bufbuild/buf-win32-x64@1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.30.1.tgz#49cb5b1ddaf011dcefb0b1a774c42fd16bb63fb9" - integrity sha512-1kmIY6oKLKZ4zIQVNG60GRDp+vKSZdaim7wRejOtgEDuWXhIuErlnGbpstypU8FO+OV3SeFUJNOJ8tLOYd3PvQ== - -"@bufbuild/buf@^1.30.1": - version "1.30.1" - resolved "https://registry.yarnpkg.com/@bufbuild/buf/-/buf-1.30.1.tgz#d658e17fa1533ecc7fa5b9590118a0b0b7e386d1" - integrity sha512-9VVvrXBCWUiH8ToccqDfPRuTiPXSbHmSkL8XPlMpUhpJIlm01m4/Vzbc5FJL1yuk3e1rdBGCF6I9Obs9NsILzg== +"@bufbuild/buf-darwin-arm64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-darwin-arm64/-/buf-darwin-arm64-1.34.0.tgz#190d7b475ce73b92e2b87b0d8958bd058daef8fc" + integrity sha512-3+h/jSAr7H+KT8MWWRMbN/gQ87KlGLkTGwm4/mpry1ap9Thw/UdOrk5MfmbK3CRM/rlw4mAn1Egu/Q7R5eO98g== + +"@bufbuild/buf-darwin-x64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-darwin-x64/-/buf-darwin-x64-1.34.0.tgz#2ee372da39701c3f88aa857ec23ca4bd9f8c8444" + integrity sha512-Jdm0COuA2CMKoef2H8rBsRnc16mJUmCQ2KvJH5otvFrMhzPmr1MUyicCybY26HXFD/6DcnbWZvf6W8LfDMMyGQ== + +"@bufbuild/buf-linux-aarch64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-linux-aarch64/-/buf-linux-aarch64-1.34.0.tgz#4fe2c1a4692eae0069bc084afb51a0a96edb7c3d" + integrity sha512-utSspJlPmVPh4Ugvn9k7MEEMHDZMI13jvwHkBE6wNSkYxxYTRR5zLHtmysaYQo51Fx+3ar6mL4HnhTqLrgO5GA== + +"@bufbuild/buf-linux-x64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-linux-x64/-/buf-linux-x64-1.34.0.tgz#20103a5fd553c08cb5b55ad5eb074d82bb2b0a25" + integrity sha512-INCGsPLBL4aK2jHBMdZzEJUPv7f6f8skIUMMip7YdJl1nsIh27C/Dl7Q6A6/sv9IhYibWKAoxP7SuiOv2iTdEw== + +"@bufbuild/buf-win32-arm64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-win32-arm64/-/buf-win32-arm64-1.34.0.tgz#3e4153481787fba8e63406593161af996aef9aad" + integrity sha512-g1EogebjJ93bzmyn/fEi47tTz57M+7WYZ7/vX+DFXgLLYIxTWHDK4YN+3Hs+K7Sbx7KaVdsdEqof8xZ4WoVFnQ== + +"@bufbuild/buf-win32-x64@1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf-win32-x64/-/buf-win32-x64-1.34.0.tgz#4782f36dd1d311c66b6e18862705aaaaa960622d" + integrity sha512-0rPXP7pV7+2twhcpN8hDdgV68UCiazLRcMBjWKubwcSJhAP8jRLqSJv3VGnXmpdYPbYGDQ0htfcgLNUvzllRhQ== + +"@bufbuild/buf@^1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@bufbuild/buf/-/buf-1.34.0.tgz#8e616ccbfe19d048c5c7ccaeb054b612624454af" + integrity sha512-DR0P746bYiY7ziQTui0bKAvPa7ihCNxONWLtW54HQXvTkGnTc6C1keVaSz4UhNdSsBu/Xsj69GO9SizodfjUtQ== optionalDependencies: - "@bufbuild/buf-darwin-arm64" "1.30.1" - "@bufbuild/buf-darwin-x64" "1.30.1" - "@bufbuild/buf-linux-aarch64" "1.30.1" - "@bufbuild/buf-linux-x64" "1.30.1" - "@bufbuild/buf-win32-arm64" "1.30.1" - "@bufbuild/buf-win32-x64" "1.30.1" + "@bufbuild/buf-darwin-arm64" "1.34.0" + "@bufbuild/buf-darwin-x64" "1.34.0" + "@bufbuild/buf-linux-aarch64" "1.34.0" + "@bufbuild/buf-linux-x64" "1.34.0" + "@bufbuild/buf-win32-arm64" "1.34.0" + "@bufbuild/buf-win32-x64" "1.34.0" "@bufbuild/protobuf@1.8.0", "@bufbuild/protobuf@^1.7.2", "@bufbuild/protobuf@^1.8.0": version "1.8.0" From db3e369c3a8bef24993bb330e50b06b5cd32cc34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:57:50 +0200 Subject: [PATCH 6/8] Bump golangci/golangci-lint-action from 4 to 6 (#7773) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 6.
Release notes

Sourced from golangci/golangci-lint-action's releases.

v6.0.0

What's Changed

This version removes annotations option (because it was useless), and removes the default output format (github-actions). The annotations are still produced but with another approach.

Changes

Dependencies

Full Changelog: https://github.com/golangci/golangci-lint-action/compare/v5.3.0...v6.0.0

v5.3.0

What's Changed

Changes

Full Changelog: https://github.com/golangci/golangci-lint-action/compare/v5.2.0...v5.3.0

v5.2.0

What's Changed

Changes

Full Changelog: https://github.com/golangci/golangci-lint-action/compare/v5.1.0...v5.2.0

v5.1.0

What's Changed

Changes

Dependencies

... (truncated)

Commits
  • 23faadf doc: improve readme
  • b556f25 doc: improve readme
  • 789f114 feat: rewrite format handling (#1038)
  • d36b91c build(deps-dev): bump @​typescript-eslint/parser from 7.7.1 to 7.8.0 (#1035)
  • a9eb115 build(deps): bump @​types/node from 20.12.7 to 20.12.8 (#1036)
  • bd4fa7c build(deps-dev): bump @​typescript-eslint/eslint-plugin from 7.7.1 to 7.8.0 (#...
  • 38e1018 feat: improve log about pwd/cwd (#1033)
  • 21e9e6b feat: use OS and working-directory as cache key (#1032)
  • dbe4fc2 chore: use getBooleanInput
  • dbb7ebc feat: add option to control cache invalidation interval (#1031)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golangci/golangci-lint-action&package-manager=github_actions&previous-version=4&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
> **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesús Miguel Benito Calzada --- .github/workflows/linters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 2387baf3025..7d2b2e9b8d4 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -33,7 +33,7 @@ jobs: with: go-version: ${{ inputs.golang_version }} - uses: actions/checkout@v4 - - uses: golangci/golangci-lint-action@v4 + - uses: golangci/golangci-lint-action@v6 with: version: latest args: --timeout=10m From 3d84ad6aa6165bca8109bc5da37d81f387cfbb7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:58:24 +0200 Subject: [PATCH 7/8] Bump docker/build-push-action from 5 to 6 (#7850) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
Release notes

Sourced from docker/build-push-action's releases.

v6.0.0

[!NOTE] This major release adds support for generating Build summary and exporting build record for your build. You can disable this feature by setting DOCKER_BUILD_NO_SUMMARY: true environment variable in your workflow.

Full Changelog: https://github.com/docker/build-push-action/compare/v5.4.0...v6.0.0

v5.4.0

Full Changelog: https://github.com/docker/build-push-action/compare/v5.3.0...v5.4.0

v5.3.0

Full Changelog: https://github.com/docker/build-push-action/compare/v5.2.0...v5.3.0

v5.2.0

Full Changelog: https://github.com/docker/build-push-action/compare/v5.1.0...v5.2.0

v5.1.0

Full Changelog: https://github.com/docker/build-push-action/compare/v5.0.0...v5.1.0

Commits
  • c382f71 Merge pull request #1120 from crazy-max/build-summary
  • 5a5b70d chore: update generated content
  • dc24cf9 don't generate summary for cloud driver
  • 667cb22 DOCKER_BUILD_NO_SUMMARY env to disable summary
  • d880b19 generate build summary
  • e51051a export build record and upload artifact
  • 86c2bd0 Merge pull request #1137 from docker/dependabot/npm_and_yarn/braces-3.0.3
  • 268d2b1 Merge pull request #1138 from docker/dependabot/npm_and_yarn/docker/actions-t...
  • 2b8dc7f chore: update generated content
  • 840c12b chore(deps): Bump @​docker/actions-toolkit from 0.25.1 to 0.26.0
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=docker/build-push-action&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesús Miguel Benito Calzada --- .github/workflows/kubeapps-general.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml index abae5e5da02..3bb7d0b718b 100644 --- a/.github/workflows/kubeapps-general.yaml +++ b/.github/workflows/kubeapps-general.yaml @@ -286,7 +286,7 @@ jobs: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: file: cmd/${{matrix.image}}/Dockerfile platforms: ${{ env.IMG_PLATFORMS }} @@ -323,7 +323,7 @@ jobs: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: dashboard platforms: ${{ env.IMG_PLATFORMS }} @@ -359,7 +359,7 @@ jobs: tags: ${{needs.setup.outputs.img_dev_tag}} - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: integration # It doesn't make sense investing CI time in making a multiplatform image here From 8d4bd224849013151522784b5bbf61057cd20804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Miguel=20Benito=20Calzada?= Date: Tue, 16 Jul 2024 16:02:44 +0200 Subject: [PATCH 8/8] Revert "Bump docker/build-push-action from 5 to 6 (#7850)" (#7898) This reverts commit 3d84ad6aa6165bca8109bc5da37d81f387cfbb7b. ### Description of the change Reverts the previous bump of GitHub action docker/build-push-action (6 -> 5). ### Benefits The CI works again. ### Possible drawbacks ### Applicable issues - fixes # ### Additional information --- .github/workflows/kubeapps-general.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml index 3bb7d0b718b..abae5e5da02 100644 --- a/.github/workflows/kubeapps-general.yaml +++ b/.github/workflows/kubeapps-general.yaml @@ -286,7 +286,7 @@ jobs: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v5 with: file: cmd/${{matrix.image}}/Dockerfile platforms: ${{ env.IMG_PLATFORMS }} @@ -323,7 +323,7 @@ jobs: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v5 with: context: dashboard platforms: ${{ env.IMG_PLATFORMS }} @@ -359,7 +359,7 @@ jobs: tags: ${{needs.setup.outputs.img_dev_tag}} - uses: docker/setup-buildx-action@v3 - name: Build image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v5 with: context: integration # It doesn't make sense investing CI time in making a multiplatform image here