Merge remote-tracking branch 'upstream/main'

Author: moulalis

Makefile

@@ -297,6 +297,7 @@ XKS_RELEASE_NAME ?= rhai-on-xks
 XKS_NAMESPACE ?= rhai-on-xks
 XKS_CLOUD_PROVIDER ?= azure
 XKS_PULL_SECRET ?=
+XKS_VALUES_FILE ?=
 
 .PHONY: helm-verify-xks
 helm-verify-xks: ## Verify rhai-on-xks-chart installation and lifecycle. Use XKS_TEST=<num> for specific test
@@ -305,7 +306,7 @@ helm-verify-xks: ## Verify rhai-on-xks-chart installation and lifecycle. Use XKS
 .PHONY: helm-install-verify-xks
 helm-install-verify-xks: ## Install and verify rhai-on-xks-chart
 	# TODO(RHOAIENG-63729): remove -f values-e2e.yaml once a runner with sufficient resources is available
-	VALUES_FILE=$(XKS_CHART_PATH)/test/values-e2e.yaml $(MAKE) helm-verify-xks
+	VALUES_FILE=$(or $(XKS_VALUES_FILE),$(XKS_CHART_PATH)/test/values-e2e.yaml) $(MAKE) helm-verify-xks
 
 .PHONY: helm-uninstall
 helm-uninstall: ## Uninstall helm chart and all dependencies

charts/rhai-on-xks-chart/templates/hooks/pre-delete-crs-job.yaml

@@ -2,7 +2,8 @@
 {{- if .Values.hooks.postInstallCrs.enabled }}
 {{- $componentCRs := include "rhai-on-xks-chart.enabledComponentCRs" . | fromJson }}
 {{- $providerKECR := include "rhai-on-xks-chart.enabledProviderKECR" . }}
-{{- $depNamespaces := (include "rhai-on-xks-chart.kubernetesEngineDependencyNamespaces" (dict "root" . "managedOnly" true) | fromJson).items }}
+{{- $managedDepNamespaces := (include "rhai-on-xks-chart.kubernetesEngineDependencyNamespaces" (dict "root" . "managedOnly" true) | fromJson).items }}
+{{- $depNamespaces := concat (.Values.imagePullSecret.dependencyNamespaces | default list) $managedDepNamespaces | uniq }}
 {{- if or $componentCRs $providerKECR }}
 apiVersion: batch/v1
 kind: Job
@@ -50,6 +51,9 @@ spec:
 
               {{- if $.Values.uninstall.cleanupNamespaces }}
               {{- range $ns := $depNamespaces }}
+              {{- if not (regexMatch "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$" $ns) }}
+              {{- fail (printf "invalid namespace name %q: must be a valid DNS-1123 label" $ns) }}
+              {{- end }}
               echo "Deleting namespace '{{ $ns }}'..."
               kubectl delete namespace '{{ $ns }}' --ignore-not-found --timeout=60s
               {{- end }}

charts/rhai-on-xks-chart/templates/hooks/pre-delete-crs-rbac.yaml

@@ -10,7 +10,8 @@
 {{ include "rhai-on-xks-chart.imagePullSecretResource" (dict "root" . "namespace" .Release.Namespace "annotations" $hookAnnotations) }}
 ---
 {{- end }}
-{{- $depNamespaces := (include "rhai-on-xks-chart.kubernetesEngineDependencyNamespaces" (dict "root" . "managedOnly" true) | fromJson).items }}
+{{- $managedDepNamespaces := (include "rhai-on-xks-chart.kubernetesEngineDependencyNamespaces" (dict "root" . "managedOnly" true) | fromJson).items }}
+{{- $depNamespaces := concat (.Values.imagePullSecret.dependencyNamespaces | default list) $managedDepNamespaces | uniq }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -70,6 +71,7 @@ rules:
       - {{ $keResource }}
     verbs:
       - get
+      - list
       - watch
       - delete
   {{- end }}

charts/rhai-on-xks-chart/templates/hooks/pre-install-namespaces-job.yaml

@@ -8,15 +8,20 @@
 {{- end }}
 {{- $dependencyNamespaces := .Values.imagePullSecret.dependencyNamespaces | default list | uniq }}
 {{- $managedDepNamespaces := (include "rhai-on-xks-chart.kubernetesEngineDependencyNamespaces" (dict "root" . "managedOnly" true) | fromJson).items }}
-{{- $allNamespaces := concat $namespaces $dependencyNamespaces $managedDepNamespaces | uniq }}
-{{- range $i, $ns := $dependencyNamespaces }}
+{{- $allDepNamespaces := concat $dependencyNamespaces $managedDepNamespaces | uniq }}
+{{- $allNamespaces := concat $namespaces $allDepNamespaces | uniq }}
+{{- range $i, $ns := $allDepNamespaces }}
 {{- if $i }}
 ---
 {{- end }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ $ns }}
+  labels:
+    {{- include "rhai-on-xks-chart.labels" $ | nindent 4 }}
+  annotations:
+    helm.sh/resource-policy: keep
 {{- end }}
 {{- range $ns := $allNamespaces }}
 ---