Merge pull request #1084 from gianlucam76/registry

Add registry option

Author: gianlucam76

cmd/main.go

@@ -93,6 +93,7 @@ var (
 	disableCaching          bool
 	disableTelemetry        bool
 	autoDeployDependencies  bool
+	registry                string
 )
 
 const (
@@ -179,6 +180,7 @@ func main() {
 	controllers.SetDriftdetectionConfigMap(driftDetectionConfigMap)
 	controllers.SetLuaConfigMap(luaConfigMap)
 	controllers.SetCAPIOnboardAnnotation(capiOnboardAnnotation)
+	controllers.SetDriftDetectionRegistry(registry)
 	// Start dependency manager
 	dependencymanager.InitializeManagerInstance(ctx, mgr.GetClient(), autoDeployDependencies, ctrl.Log.WithName("dependency_manager"))
 
@@ -258,6 +260,9 @@ func initFlags(fs *pflag.FlagSet) {
 		"The name of the ConfigMap in the projectsveltos namespace containing lua utilities to be loaded."+
 			"Changing the content of the ConfigMap does not cause Sveltos to redeploy.")
 
+	fs.StringVar(&registry, "registry", "",
+		"Container registry for drift-detection images. Defaults to docker.io/ if empty.")
+
 	const defautlRestConfigQPS = 20
 	fs.Float32Var(&restConfigQPS, "kube-api-qps", defautlRestConfigQPS,
 		fmt.Sprintf("Maximum queries per second from the controller client to the Kubernetes API server. Defaults to %d",

controllers/management_cluster.go

@@ -31,6 +31,7 @@ var (
 	driftdetectionConfigMap string
 	luaConfigMap            string
 	capiOnboardAnnotation   string
+	driftDetectionRegistry  string
 )
 
 func SetManagementClusterAccess(c client.Client, config *rest.Config) {
@@ -70,6 +71,10 @@ func getCAPIOnboardAnnotation() string {
 	return capiOnboardAnnotation
 }
 
+func SetDriftDetectionRegistry(reg string) {
+	driftDetectionRegistry = reg
+}
+
 func collectDriftDetectionConfigMap(ctx context.Context) (*corev1.ConfigMap, error) {
 	c := getManagementClusterClient()
 	configMap := &corev1.ConfigMap{}
@@ -95,3 +100,7 @@ func collectLuaConfigMap(ctx context.Context) (*corev1.ConfigMap, error) {
 
 	return configMap, nil
 }
+
+func getDriftDetectionRegistry() string {
+	return driftDetectionRegistry
+}

controllers/resourcesummary.go

@@ -219,9 +219,19 @@ func prepareDriftDetectionManagerYAML(driftDetectionManagerYAML, clusterNamespac
 	driftDetectionManagerYAML =
 		strings.ReplaceAll(driftDetectionManagerYAML, "v=5", "v=0")
 
+	registry := getDriftDetectionRegistry()
+	if registry != "" {
+		driftDetectionManagerYAML = replaceRegistry(driftDetectionManagerYAML, registry)
+	}
+
 	return driftDetectionManagerYAML
 }
 
+func replaceRegistry(agentYAML, registry string) string {
+	oldRegistry := "docker.io"
+	return strings.Replace(agentYAML, oldRegistry, registry, 1)
+}
+
 // deployDriftDetectionManager deploys drift-detection-manager in the managed cluster
 func deployDriftDetectionManager(ctx context.Context, remoteRestConfig *rest.Config,
 	clusterNamespace, clusterName, mode string, clusterType libsveltosv1beta1.ClusterType,