Merge branch 'main' into dependabot/npm_and_yarn/dashboard/bufbuild/b…

…uf-1.34.0
vmware-tanzu · Jul 15, 2024 · 8fbd8ed · 8fbd8ed
2 parents 74b62cf + 1a54793
commit 8fbd8ed
Show file tree

Hide file tree

Showing 18 changed files with 229 additions and 183 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/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
@@ -37,7 +37,7 @@
     "@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",
@@ -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",
@@ -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",