Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/dashboard/react-tool…
Browse files Browse the repository at this point in the history
…tip-5.27.1
  • Loading branch information
beni0888 committed Jul 15, 2024
2 parents a9bc24a + 8b7251c commit 9b4047d
Show file tree
Hide file tree
Showing 10 changed files with 198 additions and 140 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/kubeapps-general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
63 changes: 43 additions & 20 deletions cmd/oci-catalog/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/oci-catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clap = { version = "4.5", features = ["derive", "env"] }
env_logger = "0.11"
futures-core = "0.3"
log = "0.4"
prost = "0.12"
prost = "0.13"
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions cmd/pinniped-proxy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -58,7 +58,7 @@
"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.27.1",
"react-transition-group": "^4.4.5",
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 9b4047d

Please sign in to comment.