Merge pull request #240 from web-seven/238-bugfunctions-crossplane-fu…

…nction-load-pulls-from-overlock-namespace-even-when-default-registry-configured-in-another-namespace

fixed registy domain composing regarding namespace

internal/policy/kyverno.go

@@ -157,7 +157,7 @@ func deleteKyvernoRegistryPolicies(ctx context.Context, config *rest.Config, reg
 		Version:  "v1",
 		Resource: "clusterpolicies",
 	}
-	scplcName := "overlock-local-reg-" + registry.Name
+	scplcName := "overlock." + registry.Name
 	err = dynamicClient.Resource(gvr).Delete(ctx, scplcName, metav1.DeleteOptions{})
 	if err != nil {
 		return err

internal/registry/registry.go

@@ -28,7 +28,7 @@ var (
 	RegistryServerLabel = "overlock-registry-server-url"
 	DefaultRemoteDomain = "xpkg.upbound.io"
 	LocalServiceName    = "registry"
-	DefaultLocalDomain  = LocalServiceName + "." + namespace.Namespace + ".svc.cluster.local"
+	defaultLocalDomain  = LocalServiceName + ".%s.svc.cluster.local"
 	AuthConfigLabel     = "overlock-registry-auth-config"
 )
 
@@ -98,9 +98,9 @@ func NewLocal() Registry {
 	registry := Registry{
 		Default: false,
 		Local:   true,
-		Server:  DefaultLocalDomain,
 		Name:    "registry.local",
 	}
+	registry.Server = registry.LocalDomain()
 	return registry
 }
 
@@ -348,7 +348,7 @@ func (r *Registry) WithContext(c string) {
 // Domain of primary registry
 func (r *Registry) Domain() string {
 	if r.Local {
-		return DefaultLocalDomain
+		return r.LocalDomain()
 	}
 	url, err := url.Parse(r.Server)
 	if err != nil {
@@ -357,6 +357,11 @@ func (r *Registry) Domain() string {
 	return url.Hostname()
 }
 
+// Local domain composed with parameters
+func (r *Registry) LocalDomain() string {
+	return fmt.Sprintf(defaultLocalDomain, namespace.Namespace)
+}
+
 // Creates specs of Secret base on Registry data
 func (r *Registry) SecretSpec() corev1.Secret {
 	regConf, _ := json.Marshal(r.Config)