From bb01140b8fce70d4c32cc3a89b1796ae292b7e0b Mon Sep 17 00:00:00 2001 From: Daniil Muidinov Date: Wed, 1 Jun 2022 10:36:42 +0300 Subject: [PATCH 1/4] [helm] add support of loadBalancerIP for hub and router services --- charts/selenium-grid/README.md | 2 ++ charts/selenium-grid/templates/hub-service.yaml | 3 +++ charts/selenium-grid/templates/router-service.yaml | 3 +++ charts/selenium-grid/values.yaml | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/charts/selenium-grid/README.md b/charts/selenium-grid/README.md index 765c4b138..e75a7d6d2 100644 --- a/charts/selenium-grid/README.md +++ b/charts/selenium-grid/README.md @@ -166,6 +166,7 @@ You can configure the Selenium Hub with this values: | `hub.extraEnvFrom` | `nil` | Custom environment variables for selenium taken from `configMap` or `secret`-hub | | `hub.resources` | `{}` | Resources for selenium-hub container | | `hub.serviceType` | `NodePort` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) | +| `hub.loadBalancerIP` | `nil` | Set specific loadBalancerIP when serviceType is LoadBalancer (see https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer) | | `hub.serviceAnnotations` | `{}` | Custom annotations for Selenium Hub service | @@ -185,6 +186,7 @@ If you implement selenium-grid with separate components (`isolateComponents: tru | `components.router.readinessProbe` | `See values.yaml` | Readiness probe settings | | `components.router.resources` | `{}` | Resources for router container | | `components.router.serviceType` | `NodePort` | Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) | +| `components.router.loadBalancerIP` | `nil` | Set specific loadBalancerIP when serviceType is LoadBalancer (see https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer) | | `components.router.serviceAnnotations` | `{}` | Custom annotations for router service | | `components.router.tolerations` | `[]` | Tolerations for router pods | | `components.router.nodeSelector` | `{}` | Node Selector for router pods | diff --git a/charts/selenium-grid/templates/hub-service.yaml b/charts/selenium-grid/templates/hub-service.yaml index 316d8d540..7a9474b3e 100644 --- a/charts/selenium-grid/templates/hub-service.yaml +++ b/charts/selenium-grid/templates/hub-service.yaml @@ -17,6 +17,9 @@ spec: selector: app: selenium-hub type: {{ .Values.hub.serviceType }} + {{- if and (eq .Values.hub.serviceType "LoadBalancer") ( .Values.hub.loadBalancerIP ) }} + loadBalancerIP: {{ .Values.hub.loadBalancerIP }} + {{- end }} ports: - name: http-hub protocol: TCP diff --git a/charts/selenium-grid/templates/router-service.yaml b/charts/selenium-grid/templates/router-service.yaml index 45b910bd2..9b2c87d43 100644 --- a/charts/selenium-grid/templates/router-service.yaml +++ b/charts/selenium-grid/templates/router-service.yaml @@ -17,6 +17,9 @@ spec: selector: app: selenium-router type: {{ .Values.components.router.serviceType }} + {{- if and (eq .Values.components.router.serviceType "LoadBalancer") (.Values.components.router.loadBalancerIP) }} + loadBalancerIP: {{ .Values.components.router.loadBalancerIP }} + {{- end }} ports: - name: tcp-router protocol: TCP diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml index f20f0471b..35aeefb69 100644 --- a/charts/selenium-grid/values.yaml +++ b/charts/selenium-grid/values.yaml @@ -71,6 +71,8 @@ components: resources: {} # Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) serviceType: ClusterIP + # Set specific loadBalancerIP when serviceType is LoadBalancer (see https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer) + loadBalancerIP: "" # Custom annotations for router service serviceAnnotations: {} # Tolerations for router pods @@ -273,6 +275,8 @@ hub: resources: {} # Kubernetes service type (see https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) serviceType: ClusterIP + # Set specific loadBalancerIP when serviceType is LoadBalancer (see https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer) + loadBalancerIP: "" # Custom annotations for Selenium Hub service serviceAnnotations: {} # Tolerations for selenium-hub pods From 52766d02cf7b5a340461cc7d431d53eedc3604d8 Mon Sep 17 00:00:00 2001 From: Daniil Muidinov Date: Fri, 8 Jul 2022 09:29:50 +0300 Subject: [PATCH 2/4] update CHANGELOG.md and bump chart version --- charts/selenium-grid/CHANGELOG.md | 5 +++++ charts/selenium-grid/Chart.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/selenium-grid/CHANGELOG.md b/charts/selenium-grid/CHANGELOG.md index 03361a8f9..d98b2faf6 100644 --- a/charts/selenium-grid/CHANGELOG.md +++ b/charts/selenium-grid/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this helm chart will be documented in this file. +## :heavy_check_mark: 0.7.1 + +### Added +- Added support of loadBalancerIP for hub and router services + ## :heavy_check_mark: 0.7.0 ### Added diff --git a/charts/selenium-grid/Chart.yaml b/charts/selenium-grid/Chart.yaml index 3e9d0ad63..ecc579509 100644 --- a/charts/selenium-grid/Chart.yaml +++ b/charts/selenium-grid/Chart.yaml @@ -2,6 +2,6 @@ apiVersion: v2 name: selenium-grid description: A Helm chart for creating a Selenium Grid Server in Kubernetes type: application -version: 0.7.0 +version: 0.7.1 appVersion: 4.3.0-20220706 icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png From 2317c15c0ebc02c049b9130e00a26b1e2b5bd94c Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 12 Jul 2022 19:15:50 +0200 Subject: [PATCH 3/4] Update charts/selenium-grid/CHANGELOG.md --- charts/selenium-grid/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/selenium-grid/CHANGELOG.md b/charts/selenium-grid/CHANGELOG.md index d98b2faf6..fa36a61e0 100644 --- a/charts/selenium-grid/CHANGELOG.md +++ b/charts/selenium-grid/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this helm chart will be documented in this file. -## :heavy_check_mark: 0.7.1 +## :heavy_check_mark: 0.8.0 ### Added - Added support of loadBalancerIP for hub and router services From 1eb82561c0c30c3977c327555c82eb774c2addfb Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 12 Jul 2022 19:15:55 +0200 Subject: [PATCH 4/4] Update charts/selenium-grid/Chart.yaml --- charts/selenium-grid/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/selenium-grid/Chart.yaml b/charts/selenium-grid/Chart.yaml index ecc579509..bde4091ca 100644 --- a/charts/selenium-grid/Chart.yaml +++ b/charts/selenium-grid/Chart.yaml @@ -2,6 +2,6 @@ apiVersion: v2 name: selenium-grid description: A Helm chart for creating a Selenium Grid Server in Kubernetes type: application -version: 0.7.1 +version: 0.8.0 appVersion: 4.3.0-20220706 icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png