Skip to content

Commit 5619164

Browse files
committed
Use alternative suse/kubectl:latest
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 3e9e626 commit 5619164

File tree

5 files changed

+3
-38
lines changed

5 files changed

+3
-38
lines changed

.tools/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ all: hub \
5656
standalone_firefox \
5757
standalone_docker \
5858
standalone_all_browsers \
59-
video \
60-
tools
59+
video
6160

6261
check_dev_env:
6362
./tests/charts/make/chart_check_env.sh
@@ -293,10 +292,6 @@ video: base
293292
ffmpeg:
294293
cd ./.ffmpeg && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg FFMPEG_VERSION=$(FFMPEG_VERSION) $(FROM_IMAGE_ARGS) -t $(NAME)/ffmpeg:$(FFMPEG_VERSION)-$(BUILD_DATE) .
295294

296-
tools:
297-
cd ./.tools && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/tools:$(BUILD_DATE) .
298-
docker tag $(NAME)/tools:$(BUILD_DATE) $(NAME)/tools:latest
299-
300295
all_browsers: node_base
301296
cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-base --build-arg CHROMIUM_VERSION=$(CHROMIUM_VERSION) -t $(NAME)/node-all-browsers:$(TAG_VERSION) . ; \
302297
cd .. ; \
@@ -421,7 +416,6 @@ tag_latest:
421416
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:latest
422417
docker tag $(NAME)/standalone-all-browsers:$(TAG_VERSION) $(NAME)/standalone-all-browsers:latest
423418
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:latest
424-
docker tag $(NAME)/tools:$(BUILD_DATE) $(NAME)/tools:latest
425419
case "$(PLATFORMS)" in *linux/amd64*) \
426420
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:latest && \
427421
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:latest && \
@@ -460,7 +454,6 @@ release_latest: release_grid_scaler_latest
460454
docker push $(NAME)/standalone-docker:latest
461455
docker push $(NAME)/standalone-all-browsers:latest
462456
docker push $(NAME)/video:latest
463-
docker push $(NAME)/tools:latest
464457

465458
generate_latest_sbom:
466459
NAME=$(NAME) FILTER_IMAGE_TAG=latest OUTPUT_FILE=$(SBOM_OUTPUT) ./generate_sbom.sh
@@ -483,7 +476,6 @@ tag_nightly:
483476
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:nightly
484477
docker tag $(NAME)/standalone-all-browsers:$(TAG_VERSION) $(NAME)/standalone-all-browsers:nightly
485478
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:nightly
486-
docker tag $(NAME)/tools:$(BUILD_DATE) $(NAME)/tools:nightly
487479
case "$(PLATFORMS)" in *linux/amd64*) \
488480
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:nightly && \
489481
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:nightly && \
@@ -517,7 +509,6 @@ release_nightly: release_grid_scaler_nightly
517509
docker push $(NAME)/standalone-docker:nightly
518510
docker push $(NAME)/standalone-all-browsers:nightly
519511
docker push $(NAME)/video:nightly
520-
docker push $(NAME)/tools:nightly
521512

522513
generate_nightly_sbom:
523514
NAME=$(NAME) FILTER_IMAGE_TAG=nightly OUTPUT_FILE=$(SBOM_OUTPUT) ./generate_sbom.sh

charts/selenium-grid/CONFIGURATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
3434
| global.seleniumGrid.imageTag | string | `"4.35.0-20250909"` | Image tag for all selenium components |
3535
| global.seleniumGrid.nodesImageTag | string | `"4.35.0-20250909"` | Image tag for browser's nodes |
3636
| global.seleniumGrid.videoImageTag | string | `"ffmpeg-8.0-20250909"` | Image tag for browser's video recorder |
37-
| global.seleniumGrid.kubectlImage | string | `"selenium/tools:latest"` | kubectl image is used to execute kubectl commands in utility jobs |
37+
| global.seleniumGrid.kubectlImage | string | `"registry.suse.com/suse/kubectl:latest"` | kubectl image is used to execute kubectl commands in utility jobs |
3838
| global.seleniumGrid.imagePullSecret | string | `""` | Pull secret for all components, can be overridden individually |
3939
| global.seleniumGrid.logLevel | string | `"INFO"` | Log level for all components. Possible values describe here: https://www.selenium.dev/documentation/grid/configuration/cli_options/#logging |
4040
| global.seleniumGrid.defaultNodeStartupProbe | string | `"exec"` | Set default startup probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |

charts/selenium-grid/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ global:
1313
# -- Image tag for browser's video recorder
1414
videoImageTag: ffmpeg-8.0-20250909
1515
# -- kubectl image is used to execute kubectl commands in utility jobs
16-
kubectlImage: selenium/tools:latest
16+
kubectlImage: registry.suse.com/suse/kubectl:latest
1717
# -- Pull secret for all components, can be overridden individually
1818
imagePullSecret: ""
1919
# -- Log level for all components. Possible values describe here: https://www.selenium.dev/documentation/grid/configuration/cli_options/#logging

tests/charts/make/chart_test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ HELM_COMMAND_SET_IMAGES=" \
180180
--set global.seleniumGrid.imageTag=${VERSION} \
181181
--set global.seleniumGrid.nodesImageTag=${VERSION} \
182182
--set global.seleniumGrid.videoImageTag=${VIDEO_TAG} \
183-
--set global.seleniumGrid.kubectlImage=${NAMESPACE}/tools:latest \
184183
--set autoscaling.scaledOptions.pollingInterval=${AUTOSCALING_POLL_INTERVAL} \
185184
--set tracing.enabled=${CHART_ENABLE_TRACING} \
186185
--set global.seleniumGrid.httpLogs=${CHART_ENABLE_TRACING} \

0 commit comments

Comments
 (0)