Skip to content
This repository was archived by the owner on Jan 13, 2026. It is now read-only.

Commit 994820c

Browse files
antgamdiaantgamdia
authored
Merge branch 'main' into sync-chart-changes-14.5.1
2 parents 2471d90 + 2e76bf1 commit 994820c

6 files changed

Lines changed: 67 additions & 67 deletions

File tree

‎cmd/oci-catalog/Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/pinniped-proxy/Cargo.lock‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@
5959
"react-minimal-pie-chart": "^8.4.0",
6060
"react-monaco-editor": "^0.55.0",
6161
"react-redux": "^7.2.9",
62-
"react-router-dom": "^6.22.0",
62+
"react-router-dom": "^6.22.1",
6363
"react-router-hash-link": "^2.4.3",
64-
"react-tooltip": "^5.26.2",
64+
"react-tooltip": "^5.26.3",
6565
"react-transition-group": "^4.4.5",
6666
"redux": "^4.2.1",
6767
"redux-thunk": "^2.4.2",
6868
"remark-breaks": "^3.0.3",
6969
"remark-gfm": "^3.0.1",
7070
"rxjs": "^7.8.1",
71-
"swagger-ui-react": "^5.11.6",
71+
"swagger-ui-react": "^5.11.7",
7272
"typesafe-actions": "^5.1.0",
7373
"yaml": "^2.3.4"
7474
},
@@ -119,15 +119,15 @@
119119
"react-test-renderer": "^17.0.2",
120120
"redux-mock-store": "^1.5.4",
121121
"resize-observer-polyfill": "^1.5.1",
122-
"sass": "^1.71.0",
122+
"sass": "^1.71.1",
123123
"shx": "^0.3.4",
124124
"stylelint": "^16.2.1",
125125
"stylelint-config-idiomatic-order": "^10.0.0",
126126
"stylelint-config-prettier": "^9.0.5",
127127
"stylelint-config-standard-scss": "^13.0.0",
128128
"stylelint-scss": "^6.1.0",
129129
"ts-jest": "^29.1.2",
130-
"ts-proto": "^1.167.5",
130+
"ts-proto": "^1.167.8",
131131
"typescript": "^5.3.3"
132132
},
133133
"resolutions": {

‎dashboard/yarn.lock‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,10 +2152,10 @@
21522152
redux-thunk "^2.4.2"
21532153
reselect "^4.1.8"
21542154

2155-
"@remix-run/router@1.15.0":
2156-
version "1.15.0"
2157-
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.15.0.tgz#461a952c2872dd82c8b2e9b74c4dfaff569123e2"
2158-
integrity sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==
2155+
"@remix-run/router@1.15.1":
2156+
version "1.15.1"
2157+
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.15.1.tgz#221fd31a65186b9bc027b74573485fb3226dff7f"
2158+
integrity sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==
21592159

21602160
"@rollup/plugin-babel@^5.2.0":
21612161
version "5.3.1"
@@ -12183,13 +12183,13 @@ react-refresh@^0.11.0:
1218312183
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
1218412184
integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
1218512185

12186-
react-router-dom@^6.22.0:
12187-
version "6.22.0"
12188-
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.22.0.tgz#177c8bd27146decbb991eafb5df159f7a9f70035"
12189-
integrity sha512-z2w+M4tH5wlcLmH3BMMOMdrtrJ9T3oJJNsAlBJbwk+8Syxd5WFJ7J5dxMEW0/GEXD1BBis4uXRrNIz3mORr0ag==
12186+
react-router-dom@^6.22.1:
12187+
version "6.22.1"
12188+
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.22.1.tgz#cfa109d4b6b0a4d00bac179bc0ad2a6469455282"
12189+
integrity sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==
1219012190
dependencies:
12191-
"@remix-run/router" "1.15.0"
12192-
react-router "6.22.0"
12191+
"@remix-run/router" "1.15.1"
12192+
react-router "6.22.1"
1219312193

1219412194
react-router-hash-link@^2.4.3:
1219512195
version "2.4.3"
@@ -12198,12 +12198,12 @@ react-router-hash-link@^2.4.3:
1219812198
dependencies:
1219912199
prop-types "^15.7.2"
1220012200

12201-
react-router@6.22.0:
12202-
version "6.22.0"
12203-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.22.0.tgz#a22b44851a79dafc6b944cb418db3e80622b9be1"
12204-
integrity sha512-q2yemJeg6gw/YixRlRnVx6IRJWZD6fonnfZhN1JIOhV2iJCPeRNSH3V1ISwHf+JWcESzLC3BOLD1T07tmO5dmg==
12201+
react-router@6.22.1:
12202+
version "6.22.1"
12203+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.22.1.tgz#a5ff849bfe709438f7e139421bb28138209662c7"
12204+
integrity sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==
1220512205
dependencies:
12206-
"@remix-run/router" "1.15.0"
12206+
"@remix-run/router" "1.15.1"
1220712207

1220812208
react-scripts@^5.0.1:
1220912209
version "5.0.1"
@@ -12294,10 +12294,10 @@ react-test-renderer@^17.0.0, react-test-renderer@^17.0.2:
1229412294
react-shallow-renderer "^16.13.1"
1229512295
scheduler "^0.20.2"
1229612296

12297-
react-tooltip@^5.26.2:
12298-
version "5.26.2"
12299-
resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-5.26.2.tgz#9af7fac3dcf423a3d6cc811980dc3f24016f0fe1"
12300-
integrity sha512-C1qHiqWYn6l5c98kL/NKFyJSw5G11vUVJkgOPcKgn306c5iL5317LxMNn5Qg1GSSM7Qvtsd6KA5MvwfgxFF7Dg==
12297+
react-tooltip@^5.26.3:
12298+
version "5.26.3"
12299+
resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-5.26.3.tgz#bcb9a53e15bdbf9ae007ddf8bf413a317a637054"
12300+
integrity sha512-MpYAws8CEHUd/RC4GaDCdoceph/T4KHM5vS5Dbk8FOmLMvvIht2ymP2htWdrke7K6lqPO8rz8+bnwWUIXeDlzg==
1230112301
dependencies:
1230212302
"@floating-ui/dom" "^1.6.1"
1230312303
classnames "^2.3.0"
@@ -12952,10 +12952,10 @@ sass-loader@^12.3.0:
1295212952
klona "^2.0.4"
1295312953
neo-async "^2.6.2"
1295412954

12955-
sass@^1.71.0:
12956-
version "1.71.0"
12957-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.0.tgz#b3085759b9b2ab503a977aecb7e91153bf941117"
12958-
integrity sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==
12955+
sass@^1.71.1:
12956+
version "1.71.1"
12957+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
12958+
integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
1295912959
dependencies:
1296012960
chokidar ">=3.0.0 <4.0.0"
1296112961
immutable "^4.0.0"
@@ -13987,10 +13987,10 @@ swagger-client@^3.25.0:
1398713987
traverse "~0.6.6"
1398813988
undici "^5.24.0"
1398913989

13990-
swagger-ui-react@^5.11.6:
13991-
version "5.11.6"
13992-
resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.11.6.tgz#4e47a635127e66797548e8ce651cb4ab3893f395"
13993-
integrity sha512-OhmvOQ+k1ndl4fC7at0d1dS4Wr9XnmhE05ViwsYNt5+j2OgqTDNLIOi/5SDm6QMgxwjFiLjchXw5lQPXGF4k7g==
13990+
swagger-ui-react@^5.11.7:
13991+
version "5.11.7"
13992+
resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.11.7.tgz#c96776a693423032c31657e1c566d3ae2a891496"
13993+
integrity sha512-zhk3WpYq4fcauQ93Tbn3KmNS3vbBsi/zMqG7iHrMpNdSjEOeSJBWSdPMpCcQY48uTJxB/uD1g6wFE68liYK9+Q==
1399413994
dependencies:
1399513995
"@babel/runtime-corejs3" "^7.23.9"
1399613996
"@braintree/sanitize-url" "=7.0.0"
@@ -14400,10 +14400,10 @@ ts-proto-descriptors@1.15.0:
1440014400
long "^5.2.3"
1440114401
protobufjs "^7.2.4"
1440214402

14403-
ts-proto@^1.167.5:
14404-
version "1.167.5"
14405-
resolved "https://registry.yarnpkg.com/ts-proto/-/ts-proto-1.167.5.tgz#98f1a26c211b2c167ce05b4a1a2b9c998ee23d80"
14406-
integrity sha512-46ci2eWiLk+rA9rwYya98eUivYP3VRi+978yzt15I34BvPlQlfplMxW2bWJa3yJgdGtNWdT1WLkGn53uhSpjCw==
14403+
ts-proto@^1.167.8:
14404+
version "1.167.8"
14405+
resolved "https://registry.yarnpkg.com/ts-proto/-/ts-proto-1.167.8.tgz#32a9f39d667b6b9789a4889c1abb86497be23120"
14406+
integrity sha512-HHfwCN7MZgnQ7BhFfeLbg6mZIheqOZ3kGy6/BmBNVVzrk19bCoO6Wkzb5Gb5O7+NmiSd/CBrFh/MnZIoNXEvUw==
1440714407
dependencies:
1440814408
case-anything "^2.1.13"
1440914409
protobufjs "^7.2.4"

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
golang.org/x/net v0.21.0
4747
golang.org/x/sync v0.6.0
4848
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe
49-
google.golang.org/grpc v1.61.1
49+
google.golang.org/grpc v1.62.0
5050
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
5151
google.golang.org/protobuf v1.32.0
5252
gopkg.in/yaml.v3 v3.0.1
@@ -137,7 +137,7 @@ require (
137137
github.com/google/gnostic-models v0.6.8 // indirect
138138
github.com/google/gofuzz v1.2.0 // indirect
139139
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
140-
github.com/google/uuid v1.5.0 // indirect
140+
github.com/google/uuid v1.6.0 // indirect
141141
github.com/gorilla/mux v1.8.1 // indirect
142142
github.com/gorilla/websocket v1.5.0 // indirect
143143
github.com/gosuri/uitable v0.0.4 // indirect
@@ -223,7 +223,7 @@ require (
223223
golang.org/x/time v0.5.0 // indirect
224224
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
225225
google.golang.org/appengine v1.6.8 // indirect
226-
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
226+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
227227
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
228228
gopkg.in/inf.v0 v0.9.1 // indirect
229229
gopkg.in/ini.v1 v1.67.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
418418
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
419419
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
420420
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
421-
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
422-
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
421+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
422+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
423423
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
424424
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
425425
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -1298,8 +1298,8 @@ google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ6
12981298
google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
12991299
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
13001300
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
1301-
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg=
1302-
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k=
1301+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
1302+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
13031303
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8=
13041304
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
13051305
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o=
@@ -1332,8 +1332,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
13321332
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
13331333
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
13341334
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1335-
google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY=
1336-
google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
1335+
google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
1336+
google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
13371337
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
13381338
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA=
13391339
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y=

0 commit comments

Comments
 (0)