test(chart): update chart values for CI tests

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>

Makefile

@@ -480,7 +480,7 @@ chart_test_autoscaling_job_hostname:
 	./tests/charts/make/chart_test.sh JobAutoscaling
 
 chart_test_autoscaling_job:
-	CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true RELEASE_NAME=selenium \
+	CHART_ENABLE_TRACING=true CHART_FULL_DISTRIBUTED_MODE=true CHART_ENABLE_INGRESS_HOSTNAME=true SELENIUM_GRID_HOST=selenium-grid.local RELEASE_NAME=selenium \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh JobAutoscaling
 

charts/selenium-grid/certs/cert.sh

@@ -17,7 +17,7 @@ keytool -genkeypair \
     -keyalg RSA \
     -v \
     -dname "CN=SeleniumHQ,OU=Software Freedom Conservancy,O=SeleniumHQ,L=Unknown,ST=Unknown,C=Unknown" \
-    -ext "SAN:c=DNS:localhost,DNS:selenium-grid.local" \
+    -ext "SAN:c=DNS:localhost,DNS:selenium-grid.local,DNS:selenium-grid.prod,DNS:selenium.dev" \
     -validity 3650 \
     -storepass ${STOREPASS} \
     -keypass ${KEYPASS} \

charts/selenium-grid/certs/selenium.pem

@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID4jCCAsqgAwIBAgIJAJcK6V/XPo7CMA0GCSqGSIb3DQEBCwUAMIGHMRAwDgYD
-VQQGEwdVbmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3du
-MRMwEQYDVQQKEwpTZWxlbml1bUhRMSUwIwYDVQQLExxTb2Z0d2FyZSBGcmVlZG9t
-IENvbnNlcnZhbmN5MRMwEQYDVQQDEwpTZWxlbml1bUhRMB4XDTI0MDEwNDA2MzMx
-MloXDTM0MDEwMTA2MzMxMlowgYcxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgT
-B1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEzARBgNVBAoTClNlbGVuaXVtSFEx
-JTAjBgNVBAsTHFNvZnR3YXJlIEZyZWVkb20gQ29uc2VydmFuY3kxEzARBgNVBAMT
-ClNlbGVuaXVtSFEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCekj09
-xvrD4+nkKmZf10h3TntIFqKI75x35Z2GxwHE2Kqt3eNwbqUrni2zRbYIalddnawW
-bOqc2pgEnLtM7VRoCgxlYzARaevfI2uY+EBI4QjgzSTZstuWksPqSmHrLOo4q75w
-OSYFUtfaa+6l7ijnVQLKWo4wCnGssk9UBJWvNU9ZMdTzEqLvIMr2Hi0LmKXs9k/F
-bIM+XIAAynf8aG4awq0s/eZTirmEqbhmi2udwMNMV60IaC8ZNo53k4VJ+lQWOOwB
-/Q1CHRWotjvD4WFt2XI9cCAjbDMpkZONaaCIA70XjTG+5DiGDOUAlap6LFlBrUh4
-3YHQHvXEIKZe2tVDAgMBAAGjTzBNMB0GA1UdDgQWBBRpoVLPxMaU/3QI5x3KUl0x
-wL4bVjAsBgNVHREBAf8EIjAggglsb2NhbGhvc3SCE3NlbGVuaXVtLWdyaWQubG9j
-YWwwDQYJKoZIhvcNAQELBQADggEBAByNMqeuoiSG1BxnoUGKYiPEurKl8wdsJH8+
-doL5loA7PUnUFY8Vpd4IRHf/RMgTCkSGyLDI/y9lLNLkwkyzt+Wlnfh6sPVXT6DL
-cHMrPYavBXZFNStvawS4BztSpcOPOGq6Y2W0gkcVUun8dpS2Dx/w5CW56HzmbPVu
-iL9ZW3D6rSm/Qz4cay3rN9MA7WPzTLA3g1YizQLhkvk9JIwNphO16X28qEMIoD2Q
-vCGFDdS3xtxmRBj3x/4nGU19WTqECG7eOS4+1Xp5faYietKZVkfhl5rue53wv6lu
-v+QNozSyg5nW3YcydA3SeRuf2/kwkvyP61zey4HMHThR+vPKz9U=
+MIID/zCCAuegAwIBAgIEbybT1DANBgkqhkiG9w0BAQsFADCBhzEQMA4GA1UEBhMH
+VW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjETMBEG
+A1UEChMKU2VsZW5pdW1IUTElMCMGA1UECxMcU29mdHdhcmUgRnJlZWRvbSBDb25z
+ZXJ2YW5jeTETMBEGA1UEAxMKU2VsZW5pdW1IUTAeFw0yNDAzMDExMDQwMTVaFw0z
+NDAyMjcxMDQwMTVaMIGHMRAwDgYDVQQGEwdVbmtub3duMRAwDgYDVQQIEwdVbmtu
+b3duMRAwDgYDVQQHEwdVbmtub3duMRMwEQYDVQQKEwpTZWxlbml1bUhRMSUwIwYD
+VQQLExxTb2Z0d2FyZSBGcmVlZG9tIENvbnNlcnZhbmN5MRMwEQYDVQQDEwpTZWxl
+bml1bUhRMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhrHCWD8ZApZ
+JbFGBcf5Gu/WdH0v+PUWvW4ZHoVclFktnYF4Je3DXCDrvDOf5AtBqS7YzCr1uZML
+fYLRvMJBxpHtYS+W7XiIUGOXavw3DN2DBysp2uMgMmumD3C9PWk7O+BJ3Ej/CQev
+WuMLK/3F6PRhNEYdB6kqAbP3fqN40fu+3w+yUHwprHmo8Uo37QhJejGfFnhdxhTq
+vElvrGlSpIidLs7wPOFVqQyTXAR+K7/vhWy1asZE0bZ5fQhDnFPsNFdkoA/dDPga
+dGM5U7A4WYQdmVtJ5RSZHUb9jfUQ1LQyuR1FQ5DudstXKtNONqA3yqUPusQpIaYW
+PbIimVI4lQIDAQABo3EwbzAdBgNVHQ4EFgQU/S73OMhN3yV4ustP37TY9upJQFYw
+TgYDVR0RAQH/BEQwQoIJbG9jYWxob3N0ghNzZWxlbml1bS1ncmlkLmxvY2FsghJz
+ZWxlbml1bS1ncmlkLnByb2SCDHNlbGVuaXVtLmRldjANBgkqhkiG9w0BAQsFAAOC
+AQEAs8CCz5kQnuWjcFQojkjbMk9L92HBWV89ME+YL4o/TJk56EYW3UurEALgO6MJ
+h14vdXOAYO6TERUMNKaSO5CydfbuKp5JpJhpY/qbHKPE/wJYIfMEO2hicYefjEKi
+wxy4TE1FrfbmHV+MKmS21u7JTTyoqpqD+dWoURikdwBwm6cvyPx9Hntc2uHMc53D
+BQtveBxkr4fMT+dcAommWfY+LHWg2bvEWzTJxELK7D5b63z/AI3MAL5XEznbqoV7
+ibZpC2D8wZ4N2E3tOT7iruMVuGVI98N40ytSuSwrUNjn7CT+htnpn1zVWZx3FpiT
+pez6yj8ecncxrGOgp2Ty6r5Quw==
 -----END CERTIFICATE-----

charts/selenium-grid/certs/selenium.pkcs8.base64

@@ -1 +1 @@
-LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2VrajA5eHZyRDQrbmsKS21aZjEwaDNUbnRJRnFLSTc1eDM1WjJHeHdIRTJLcXQzZU53YnFVcm5pMnpSYllJYWxkZG5hd1diT3FjMnBnRQpuTHRNN1ZSb0NneGxZekFSYWV2ZkkydVkrRUJJNFFqZ3pTVFpzdHVXa3NQcVNtSHJMT280cTc1d09TWUZVdGZhCmErNmw3aWpuVlFMS1dvNHdDbkdzc2s5VUJKV3ZOVTlaTWRUekVxTHZJTXIySGkwTG1LWHM5ay9GYklNK1hJQUEKeW5mOGFHNGF3cTBzL2VaVGlybUVxYmhtaTJ1ZHdNTk1WNjBJYUM4Wk5vNTNrNFZKK2xRV09Pd0IvUTFDSFJXbwp0anZENFdGdDJYSTljQ0FqYkRNcGtaT05hYUNJQTcwWGpURys1RGlHRE9VQWxhcDZMRmxCclVoNDNZSFFIdlhFCklLWmUydFZEQWdNQkFBRUNnZ0VBSmpSNXlONmVJSUJUSkFRTE1tQStOM0NUUjJVY3QvMXpKM2dOSWlIa2pUYmUKdUpGVGNRMVhnbERVRmZOZnpsdEF2Vzkxdk5sMUZXR2RhczhRV1pKODJheENIRk52aTJLSHovVkt3VXBld3JCbApZVFJNQXArVFJJNEw0ZkVWOG9HWjFSbWNBcEhpVlRvR2c3dXBmaFVKaWVMemp5bU9SSWpmcG9vM2pyaWtEOWhZCnMzTTJXaHNHdDBwZ1FwZVEreHNTeXRxNjFhT21xdnpLZUE5OUVxZE9keUJ2QkxSMDZyN0FDdlpmeTJvUVpHYXAKUEJ3ZHZIWmNQdXZlUGxVNUpDQWhEcWhlbFIyTHd2dzVhN3FLbjBvTkRFTG5zVnFWblJ3Q0ErUUhjYVBTbG40Nwp0SzI2YUxVdUZLSFg0QW5idDZaNWNMTWdNUzR2bGV3R0h0OG9JUXVCa1FLQmdRQzE1N2NWRkhPc3poUkh6LzBBCkhIVGNqcXB4ditzSUFNVnNCWUlJTVozKzI3MjlVeGFoMllPN1crZjEzVTJlakVsMk1qaW5jTnF1QWVpSmEveWYKTklqcFJtbFJVaWRScUpUUHNQdVJJcEZOWmNCNjh0MnpudFNMa0NkUDJDVTBZaFRpdklVY1RYOEJDRWZ6VDdwSwpjTyt3cTArc0FpRFhoS3pRSUJGaW9sNVZsd0tCZ1FEZktWM0w4V2ZLemFvODFhYndJQkd4M0dnK3BNNElnaTNWCldwMW40TVRuY05mRUJwZ251bVhDa00zSEMvT0VaUnRoYTU0QXdFOWwxUy9vN2RUWEZNNXRWQVQwNXpjNDZuL04KdkFCNUhuYnplS1hDTk5lakI4S1JZNjlvR0U2Ulptb0kxczhvd3ZQUHpCeGE4anN5V3p6M0VoZXY2Z2xHUXBGTwpyVmhWN0h0ck5RS0JnRmpjZEJ5UkhCMExvdTZkMVJzTHk2Nis1dGFnaVdFa2Qwell0L2ZtdlNiMkU0OThHbTlBClFkRHlDYk9hdzBNemh1TjlqeDJFek43NlFhMTRHalZ2eFg0bmptVlNlN0N4YU5pNHZYdmQ1aHRvSElvelFFaHgKeTZUTjY5WmVZWFpnZjVGdnhKclo1TFFOWnBDZW53T2tmZ0xRL1IrcS9uNHA2djNVM0lsUmhrSExBb0dCQU11SgpzVEVYNXpERDBHZFgvc0M0bnlyMyttUlljRXEyWVJOZGFIK2NORHRiWXBBNTY0RWdzenQ0VXhjZXdXYVp5UlZiCjBHcWkvRWZHMzhHMVdoRXB1dlZnVW4wRWZndDlaai9CSHpWWklla0N1enljY2FrU3BOVnlkRU9mRjlucDdRQk8KMi9jemlLaVlZNnhYanNKcEVQdlFGcWF0OFBPU04zSHBETTZodUJlWkFvR0FSZE9IRzlVWXA3M25DQ3d4VHJjKwpnNk91eXI5aXFacVBsalFDK1V4MmtySC9HMTkrSE96RHJLWWFSRElqQk4wTHRyeXJpcVZFQWJWZjZQNHNnNVpCCitjVS9pbDZLb1k2ditQa2tydnZJRVUyVUZHRnpmcnNVZklFQURrdHR5OEdIcTFja0tobjAxWGlNNDJnaGZaSEsKK0lYRExZYzRCMDZ5dFY1bmFZYU9US1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
+LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQzZHc2NKWVB4a0Nsa2wKc1VZRngva2E3OVowZlMvNDlSYTliaGtlaFZ5VVdTMmRnWGdsN2NOY0lPdThNNS9rQzBHcEx0ak1Ldlc1a3d0OQpndEc4d2tIR2tlMWhMNWJ0ZUloUVk1ZHEvRGNNM1lNSEt5bmE0eUF5YTZZUGNMMDlhVHM3NEVuY1NQOEpCNjlhCjR3c3IvY1hvOUdFMFJoMEhxU29Ccy9kK28zalIrNzdmRDdKUWZDbXNlYWp4U2pmdENFbDZNWjhXZUYzR0ZPcTgKU1crc2FWS2tpSjB1enZBODRWV3BESk5jQkg0cnYrK0ZiTFZxeGtUUnRubDlDRU9jVSt3MFYyU2dEOTBNK0JwMApZemxUc0RoWmhCMlpXMG5sRkprZFJ2Mk45UkRVdERLNUhVVkRrTzUyeTFjcTAwNDJvRGZLcFErNnhDa2hwaFk5CnNpS1pVamlWQWdNQkFBRUNnZ0VBU1ZGaFZvMlNBV3VlUVY0OG91eHNkRE5HdnEvUEpYcVJFZUg5SFd3VzFBN3EKREtKRURsVkVZTmhMWnVMRHZCaS9Mb0xaUUY0d1hvTFN4UWl6em5TTmEwaDBSNVJ6Rm0wazd0NjllWldScm96YQpJUW5kUEhHOGJvREFkRmJMQnhXZEUzTENSbm12bUFRaURtRmlObHVOQzhDelJ0L1VjZjh3SUdtaE9JLzRlbWpSCm5Uekw2aVR6WEJ4QUQ1VVJ4NWdSWnpETHE4S2JpaVc5c0NsUkEvSDhITGNrQmxqbUtVQVpZdnNIbjZ5Qit5WDEKN2dIQ0lqaE9yeTVtSS9vTlpWWDhVOXJOOFhMWU1OTHdvZmxSdUNuZHBwbnN5NHpRVUtSOWlKdUpCNGNubVZWZAprcVFmSTQ1V0Z4dkE2bzNIbGE0TDh6WVRvUmF0T2I3OCtOcFFhdmhkd1FLQmdRRHg3L1h2ZTJwSHVqUWVqY1NOCnlsSXZKV2FIRmhKUHM3WmYvek92cUswOTNabHc5bkpUanI0eHl0U3NGVWdxUVdVY0dTa1VRUVlYWFpjWDZuWGUKNHVKdzRSWVBPc3R2c002NkZ5amx0bFl0a3N5LzhPTUN3T0hRam13RFllWkNxU0o4YXdWTjRzUEpCNGJ5TVQxRAozM2NoOXlFc2RRbmZiMXdCaEl3R0lDR0JVUUtCZ1FERTdBWFprWUpZY1N1QzlEdWRUSHhKbUNVcUpBMEdDdnJPCmlpRjg1V29BczZxa1A1eEt6SmdYM3JDdkk3YkUwQ1pJMlVQTDlRd1J2RitvZGx4N0huSUh5UVEzNmswbGJiMXMKNDAwbUR6M1lYT0xIemliQnNzcGRiRzNmekE2bnhoWnlrd3Y3SmlzT2I5cU10a0ZRVmtxbTNPZVRtaTZoSk9XVgpYODl1RjZNU0JRS0JnRTNJUmh0ZVpFYjNPSFp5UWJVTVRPdlhiR1VWMVlGR1YrWDVHRmJyTmZkajNVY1NGS09FCml1VmJQcENzcnV6VzVYanBKZW5iRmVoQk1LaUJ1cStUNWhWQWFHVXhFK0t1eDJmUXRsZFVEZFRORTRMS0lWSHIKVFM1Tis3QUNzNUxPNmNWeWF0d2xnYWlLQVBxd2xlL1NVbXpiRlJGRDk0NmNNTXBVSU9oL1FBWmhBb0dBSlNwcQpuRHFEUUUvenAxNlRGY2dHdVJrWEFwSVZSeXV4VkdQcm1CZndYcnVLSEQvSkxyRFlqOEMrMWY5R2tuUzZsUXMwCmFYMFJUeE9mZGpzSWoxQWFzMjl6OVYycU84TXZlaXFZTi9PdWQzUm9kTTlxcnlvZ1dXdUtmUytWSUlNWlgzeHoKU1c1VnQvN1NYN1pTTTJobDVJSlN6cC9ONXlvQWpxV3JqNXEwYzBVQ2dZRUFvbDdaMW1UYXhoWng2cWpScis1MAo5T1NnMElBK3YvSHZoM1pPRkRTUE5xdHlESTl1eGo3K0dDb3JTYjExRmJzaU1obXkxT0tGMlRiSnN6YkNPTFhUCjNzelFpVjVWenNyWUVsR3V1d2NqNkpwU3ZCb2VFTmF2NzhVRVlncTNoQW9MSXNmMGlHN3ozME5OYXAwQ25JZ2QKSnFRRGt3K3pNT0JXY3p2S04rbVQ0NDA9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K

charts/selenium-grid/templates/_helpers.tpl

@@ -138,7 +138,8 @@ Common autoscaling spec template
   {{- with .node.scaledObjectOptions -}}
     {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}
   {{- end -}}
-  {{- $spec = mergeOverwrite ($spec | fromYaml) (dict "scaleTargetRef" (dict "name" .name) "advanced" (dict "horizontalPodAutoscalerConfig" (dict "name" .name))) | toYaml -}}
+  {{- $advanced := (dict "scaleTargetRef" (dict "name" .name) "advanced" (dict "horizontalPodAutoscalerConfig" (dict "name" .name) "restoreToOriginalReplicaCount" true)) -}}
+  {{- $spec = mergeOverwrite ($spec | fromYaml) $advanced | toYaml -}}
 {{- else if eq .Values.autoscaling.scalingType "job" -}}
   {{- with .Values.autoscaling.scaledJobOptions -}}
     {{- $spec = mergeOverwrite ($spec | fromYaml) . | toYaml -}}

charts/selenium-grid/values.yaml

@@ -519,6 +519,9 @@ tracing:
         path: &jaegerBasePath "/jaeger"
         pathType: Prefix
 
+monitoring:
+  enabled: false
+
 # Keda scaled object configuration
 autoscaling:
   # Enable autoscaling. Implies installing KEDA
@@ -529,7 +532,7 @@ autoscaling:
   scalingType: job
   # Annotations for KEDA resources: ScaledObject and ScaledJob
   annotations:
-    helm.sh/hook: post-install,post-upgrade
+    "helm.sh/hook": post-install,post-upgrade,post-rollback
   # Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject)
   scaledOptions:
     minReplicaCount: 0
@@ -1162,6 +1165,14 @@ customLabels: {}
 
 # Configuration for dependency chart keda
 keda:
+  additionalAnnotations:
+    "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
+  podAnnotations:
+    keda:
+      "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
+  crds:
+    additionalAnnotations:
+      "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
   http:
     timeout: 60000
   webhooks:
@@ -1193,48 +1204,23 @@ jaeger:
     enabled: false
 
 prometheus-stack:
+  cleanPrometheusOperatorObjectNames: true
   defaultRules:
+    create: true
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback
   alertmanager:
+    enabled: true
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback
-    enabled: true
-    ingress:
-      enabled: true
-      ingressClassName: nginx
-      hosts:
-        - alertmanager.selenium-grid.prod
   grafana:
     enabled: true
     adminPassword: admin
     forceDeployDatasources: true
     forceDeployDashboards: true
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback
-    ingress:
-      enabled: true
-      ingressClassName: nginx
-      hosts:
-        - grafana.selenium-grid.prod
   prometheus:
+    enabled: true
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback
-    enabled: true
-    ingress:
-      enabled: true
-      ingressClassName: nginx
-      hosts:
-        - pts.selenium-grid.prod
-    prometheusSpec:
-      storageSpec:
-        volumeClaimTemplate:
-          spec:
-            storageClassName: "standard"
-            accessModes: ["ReadWriteOnce"]
-            resources:
-              requests:
-                storage: 5Gi
-            selector:
-              matchLabels:
-                app.kubernetes.io/name: "prometheus"

tests/charts/ci/DeploymentAutoscaling-values.yaml

@@ -1,5 +1,5 @@
 autoscaling:
-  enableWithExistingKEDA: true
+  enabled: true
   scalingType: deployment
   scaledOptions:
     minReplicaCount: 0

tests/charts/ci/JobAutoscaling-values.yaml

@@ -1,5 +1,5 @@
 autoscaling:
-  enableWithExistingKEDA: true
+  enabled: true
   scalingType: job
   scaledJobOptions:
     successfulJobsHistoryLimit: 0

tests/charts/ci/base-auth-ingress-values.yaml

@@ -2,9 +2,6 @@ global:
   seleniumGrid:
     logLevel: INFO
 
-monitoring:
-    enabled: true
-
 ingress:
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"

tests/charts/ci/base-tls-values.yaml

@@ -4,3 +4,38 @@ tls:
   registrationSecret:
     enabled: true
     value: "HappyTestOps"
+
+monitoring:
+  enabled: false
+
+prometheus-stack:
+  alertmanager:
+    ingress:
+      enabled: true
+      ingressClassName: nginx
+      hosts:
+        - alertmanager.selenium-grid.prod
+  grafana:
+    ingress:
+      enabled: true
+      ingressClassName: nginx
+      hosts:
+        - grafana.selenium-grid.prod
+  prometheus:
+    ingress:
+      enabled: true
+      ingressClassName: nginx
+      hosts:
+        - pts.selenium-grid.prod
+    prometheusSpec:
+      storageSpec:
+        volumeClaimTemplate:
+          spec:
+            storageClassName: "standard"
+            accessModes: ["ReadWriteOnce"]
+            resources:
+              requests:
+                storage: 5Gi
+            selector:
+              matchLabels:
+                app.kubernetes.io/name: "prometheus"

tests/charts/make/chart_cluster_setup.sh

@@ -60,16 +60,10 @@ elif [ "${CLUSTER}" = "minikube" ]; then
   sudo chown -R $USER $HOME/.kube $HOME/.minikube
 fi
 
-echo "Install KEDA core on kind kubernetes cluster"
-helm upgrade -i ${KEDA_NAMESPACE} -n ${KEDA_NAMESPACE} --create-namespace --set webhooks.enabled=false kedacore/keda
-
 if [ "${CLUSTER}" = "kind" ]; then
   echo "Load built local Docker Images into Kind Cluster"
   image_list=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep ${NAMESPACE} | grep ${BUILD_DATE:-$VERSION})
   for image in $image_list; do
       kind load docker-image --name ${CLUSTER_NAME} "$image"
   done
 fi
-
-echo "Wait for KEDA core to be ready"
-kubectl -n ${KEDA_NAMESPACE} wait --for=condition=ready pod -l app.kubernetes.io/instance=${KEDA_NAMESPACE} --timeout 180s

tests/charts/make/chart_setup_env.sh

@@ -14,6 +14,21 @@ on_failure() {
 trap 'on_failure' ERR
 
 if [ "$(uname -m)" = "x86_64" ]; then
+    echo "Installing Docker for AMD64 / x86_64"
+    # Add Docker's official GPG key:
+    sudo apt-get update
+    sudo apt-get install ca-certificates curl
+    sudo install -m 0755 -d /etc/apt/keyrings
+    sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+    sudo chmod a+r /etc/apt/keyrings/docker.asc
+    # Add the repository to Apt sources:
+    echo \
+        "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+       $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+    sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+    sudo apt-get update
+    sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+    echo "==============================="
     if [ "${CLUSTER}" = "kind" ]; then
         echo "Installing kind for AMD64 / x86_64"
         curl -fsSL -o ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
@@ -40,8 +55,7 @@ if [ "$(uname -m)" = "x86_64" ]; then
         curl -sLO https://go.dev/dl/go$GO_VERSION.linux-amd64.tar.gz
         sudo tar -xf go$GO_VERSION.linux-amd64.tar.gz -C /usr/local
         rm -rf go$GO_VERSION.linux-amd64.tar.gz*
-        echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.bashrc
-        source ~/.bashrc || true
+        sudo ln -sf /usr/local/go/bin/go /usr/bin/go
         go version
         echo "==============================="
         echo "Installing CRI-CTL (CLI for CRI-compatible container runtimes)"

tests/charts/make/chart_test.sh

@@ -45,8 +45,9 @@ cleanup() {
   done
   if [ "${SKIP_CLEANUP}" = "false" ]; then
     echo "Clean up chart release and namespace"
-    helm delete ${RELEASE_NAME} --namespace ${SELENIUM_NAMESPACE}
-    kubectl delete namespace ${SELENIUM_NAMESPACE}
+    helm delete ${RELEASE_NAME} --namespace ${SELENIUM_NAMESPACE} --wait
+    kubectl patch ns ${SELENIUM_NAMESPACE} -p '{"metadata":{"finalizers":null}}'
+    kubectl delete namespace ${SELENIUM_NAMESPACE} --wait=false
   fi
 }