Merge branch 'main' into dependabot/npm_and_yarn/dashboard/ws-5.2.4

vmware-tanzu · Jul 16, 2024 · e564e6c · e564e6c
2 parents 411348d + 8d4bd22
commit e564e6c
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 110 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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/Cargo.lock b/cmd/oci-catalog/Cargo.lock
diff --git 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/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/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog.pb.go
diff --git a/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go b/cmd/oci-catalog/gen/catalog/v1alpha1/ocicatalog_grpc.pb.go
diff --git 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

diff --git 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",