Skip to content

Commit d1d2678

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into improve-record
2 parents 613a1e9 + 55240ca commit d1d2678

File tree

17 files changed

+236
-176
lines changed

17 files changed

+236
-176
lines changed

.ffmpeg/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ ARG GO_VERSION="latest"
55
ARG GO_CRYPTO_VERSION="v0.35.0"
66
ARG GO_OAUTH2_VERSION="v0.27.0"
77
ARG GO_NET_VERSION="v0.36.0"
8+
ARG GOLANG_JWT_V4_VERSION="v4.5.2"
9+
ARG GOLANG_JWT_V5_VERSION="v5.2.2"
810

911
USER root
1012

@@ -38,6 +40,8 @@ RUN cd /usr/local/src \
3840
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
3941
&& sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
4042
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
43+
&& sed -i "s|github.com/golang-jwt/jwt/v5 v.*|github.com/golang-jwt/jwt/v5 v5.2.2|g" go.mod \
44+
&& sed -i "s|github.com/golang-jwt/jwt/v4 v.*|github.com/golang-jwt/jwt/v4 v4.5.2|g" go.mod \
4145
&& go mod tidy \
4246
# Build rclone
4347
&& make \

.keda/scalers/selenium-grid-scaler.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ triggers:
2323
browserName: '' # Optional. Required to be matched with the request in queue and Node stereotypes (Similarly for `browserVersion` and `platformName`).
2424
browserVersion: '' # Optional.
2525
platformName: '' # Optional.
26-
unsafeSsl: 'false' # Optional.
26+
unsafeSsl: false # Optional.
2727
activationThreshold: 0 # Optional.
2828
nodeMaxSessions: 1 # Optional.
29+
enableManagedDownloads: true # Optional.
2930
capabilities: '' # Optional.
3031
```
3132
@@ -39,7 +40,7 @@ triggers:
3940
- `activationThreshold` - Target value for activating the scaler. Learn more about activation [here](./../concepts/scaling-deployments.md#activating-and-scaling-thresholds). (Default: `0`, Optional)
4041
- `platformName` - Name of the browser platform. Refer to the [Selenium Grid's](https://www.selenium.dev/documentation/en/getting_started_with_webdriver/browsers/) and [WebdriverIO's](https://webdriver.io/docs/options/#capabilities) documentation for more info. (Optional)
4142
- `nodeMaxSessions` - Number of maximum sessions that can run in parallel on a Node. Update this parameter align with node config `--max-sessions` (`SE_NODE_MAX_SESSIONS`) to have the correct scaling behavior. (Default: `1`, Optional).
42-
- `enableManagedDownloads`- Set this for Node enabled to auto manage files downloaded for a given session on the Node. When the client requests enabling this feature, it can only be assigned to the Node that also enabled it. Otherwise, the request will wait until it timed out. (Default: `false`, Optional).
43+
- `enableManagedDownloads`- Set this for Node enabled to auto manage files downloaded for a given session on the Node. When the client requests enabling this feature, it can only be assigned to the Node that also enabled it. Otherwise, the request will wait until it timed out. (Default: `true`, Optional).
4344
- `capabilities` - Add more custom capabilities for matching specific Nodes. It should be in JSON string, see [example](https://www.selenium.dev/documentation/grid/configuration/toml_options/#setting-custom-capabilities-for-matching-specific-nodes) (Optional)
4445

4546
**Trigger Authentication**

.keda/scalers/selenium_grid_scaler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type seleniumGridScalerMetadata struct {
4040
ActivationThreshold int64 `keda:"name=activationThreshold, order=triggerMetadata, optional"`
4141
UnsafeSsl bool `keda:"name=unsafeSsl, order=triggerMetadata, default=false"`
4242
NodeMaxSessions int64 `keda:"name=nodeMaxSessions, order=triggerMetadata, default=1"`
43-
EnableManagedDownloads bool `keda:"name=enableManagedDownloads, order=triggerMetadata, optional"`
43+
EnableManagedDownloads bool `keda:"name=enableManagedDownloads, order=triggerMetadata, default=true"`
4444
Capabilities string `keda:"name=capabilities, order=triggerMetadata, optional"`
4545

4646
TargetValue int64

0 commit comments

Comments
 (0)