Do not add default registry when policy module is a http URL.

Updates the recommended policies templates to add the default registry only when
the policy module is not a http URL. Thus, the module URL to use is the module
defined in the values file. Otherwise, the policy module URL is  built based on
the `defaultSystemRegistry` and the policy module as it before

Signed-off-by: José Guilherme Vanz <[email protected]>

Author: jvanz

charts/kubewarden-defaults/templates/_helpers.tpl

@@ -68,3 +68,11 @@ namespaceSelector:
 {{- "" -}}
 {{- end -}}
 {{- end -}}
+
+{{- define "policy-module" -}}
+{{- if or (not .registry) (hasPrefix "http" .module) -}}
+{{- printf "%s" .module -}}
+{{- else  -}}
+{{- printf "%s/%s" .registry .module -}}
+{{- end -}}
+{{- end }}

charts/kubewarden-defaults/templates/allow-privileged-escalation-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.allowPrivilegeEscalationPolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.allowPrivilegeEscalationPolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.allowPrivilegeEscalationPolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
     - apiGroups: [""]

charts/kubewarden-defaults/templates/capabilities-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.capabilitiesPolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.capabilitiesPolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.capabilitiesPolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
   - apiGroups: [""]

charts/kubewarden-defaults/templates/host-namespace-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.hostNamespacePolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.hostNamespacePolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.hostNamespacePolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
   - apiGroups: [""]

charts/kubewarden-defaults/templates/host-path-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.hostPathsPolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.hostPathsPolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.hostPathsPolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
   - apiGroups: [""]

charts/kubewarden-defaults/templates/pod-privileged-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.podPrivilegedPolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.podPrivilegedPolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.podPrivilegedPolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
     - apiGroups: [""]

charts/kubewarden-defaults/templates/user-group-policy.yaml

@@ -10,7 +10,8 @@ metadata:
   name: {{ $.Values.recommendedPolicies.userGroupPolicy.name }}
 spec:
   mode: {{ $.Values.recommendedPolicies.defaultPolicyMode }}
-  module: '{{ template "system_default_registry" . }}{{ $.Values.recommendedPolicies.userGroupPolicy.module }}'
+  {{ $scope := dict "module" $.Values.recommendedPolicies.userGroupPolicy.module "registry" $.Values.common.cattle.systemDefaultRegistry  }}
+  module: {{ template "policy-module" $scope }}
 {{ include "policy-namespace-selector" . | indent 2}}
   rules:
     - apiGroups: [""]