Merge branch 'main' into dependabot/npm_and_yarn/dashboard/swagger-ui…

…-react-5.17.14
vmware-tanzu · Jul 16, 2024 · f1e57a2 · f1e57a2
2 parents 6589953 + 7ec2f52
commit f1e57a2
Show file tree

Hide file tree

Showing 19 changed files with 298 additions and 247 deletions.
diff --git a/.github/workflows/kubeapps-general.yaml b/.github/workflows/kubeapps-general.yaml
@@ -479,8 +479,8 @@ jobs:
       - name: "Export cluster variables"
         run: |
           set -eu
-          DEX_IP=`docker network inspect kind | jq '.[0].IPAM.Config[0].Gateway' | sed  's/"//g' | awk -F. '{ print $1"."$2"."$3"."$4+1 }'`
-          ADDITIONAL_CLUSTER_IP=`docker network inspect kind | jq '.[0].IPAM.Config[0].Gateway' | sed  's/"//g' | awk -F. '{ print $1"."$2"."$3"."$4+2 }'`
+          DEX_IP=`docker network inspect kind | jq -r '.[0].IPAM.Config[] | select(.Gateway) | .Gateway' | awk -F. '{ print $1"."$2"."$3"."$4+1 }'`
+          ADDITIONAL_CLUSTER_IP=`docker network inspect kind | jq -r '.[0].IPAM.Config[] | select(.Gateway) | .Gateway' | awk -F. '{ print $1"."$2"."$3"."$4+2 }'`
 
           echo DEFAULT_DEX_IP=$DEFAULT_DEX_IP
           echo DEX_IP=$DEX_IP
@@ -522,6 +522,11 @@ jobs:
       - name: "Install multicluster deps"
         run: |
           ./script/install-multicluster-deps.sh
+#      - name: Setup upterm session
+#        uses: lhotari/action-upterm@v1
+#        with:
+#          limit-access-to-actor: true
+#          limit-access-to-users: beni0888
       - name: "Run e2e tests script"
         run: ./script/run_e2e_tests.sh
       - name: "Print k8s KubeappsAPIs logs if the tests fail"

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/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/Cargo.lock b/cmd/pinniped-proxy/Cargo.lock
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
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.4",
-    "@bufbuild/protobuf": "^1.8.0",
+    "@bufbuild/protobuf": "^1.10.0",
     "@cds/city": "^1.1.0",
     "@cds/core": "^6.10.0",
     "@cds/react": "^6.10.0",
@@ -37,15 +37,15 @@
     "@redux-devtools/extension": "^3.3.0",
     "@tanstack/match-sorter-utils": "^8.15.1",
     "@tanstack/react-table": "^8.16.0",
-    "ajv": "^8.12.0",
+    "ajv": "^8.17.1",
     "axios": "^1.6.8",
     "fast-json-patch": "^3.1.1",
     "google-protobuf": "^3.21.2",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "modern-normalize": "^2.0.0",
-    "monaco-editor": "^0.47.0",
+    "monaco-editor": "^0.50.0",
     "prop-types": "^15.8.1",
     "protobufjs": "^7.2.6",
     "qs": "^6.12.1",
@@ -58,9 +58,9 @@
     "react-minimal-pie-chart": "^8.4.0",
     "react-monaco-editor": "^0.55.0",
     "react-redux": "^7.2.9",
-    "react-router-dom": "^6.22.3",
+    "react-router-dom": "^6.24.1",
     "react-router-hash-link": "^2.4.3",
-    "react-tooltip": "^5.26.3",
+    "react-tooltip": "^5.27.1",
     "react-transition-group": "^4.4.5",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
@@ -69,11 +69,11 @@
     "rxjs": "^7.8.1",
     "swagger-ui-react": "^5.17.14",
     "typesafe-actions": "^5.1.0",
-    "yaml": "^2.4.1"
+    "yaml": "^2.4.5"
   },
   "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",
@@ -120,7 +120,7 @@
     "resize-observer-polyfill": "^1.5.1",
     "sass": "^1.75.0",
     "shx": "^0.3.4",
-    "stylelint": "^16.3.1",
+    "stylelint": "^16.7.0",
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-standard-scss": "^13.1.0",