wip

Author: roi-codefresh

venonactl/cmd/install-agent.go

@@ -43,6 +43,7 @@ var installAgentCmdOptions struct {
 	kubernetesRunnerType bool
 	tolerations          string
 	envVars              string
+	dockerRegistry       string
 }
 
 var installAgentCmd = &cobra.Command{
@@ -96,6 +97,7 @@ var installAgentCmd = &cobra.Command{
 			s.Image.Tag = version
 			s.Version.Current.Version = version
 		}
+		s.DockerRegistry = installAgentCmdOptions.dockerRegistry
 		if installAgentCmdOptions.envVars != "" {
 			s.AdditionalEnvVars = make(map[string]string)
 			parts := strings.Split(installAgentCmdOptions.envVars, ",")
@@ -138,6 +140,7 @@ func init() {
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.kube.nodeSelector, "kube-node-selector", "", "The kubernetes node selector \"key=value\" to be used by venona resources (default is no node selector)")
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.tolerations, "tolerations", "", "The kubernetes tolerations as JSON string to be used by venona resources (default is no tolerations)")
 	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.envVars, "envVars", "", "More env vars to be declared \"key=value\"")
+	installAgentCmd.Flags().StringVar(&installAgentCmdOptions.dockerRegistry, "docker-registry", "", "The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry=\"docker.io\"")
 
 	installAgentCmd.Flags().BoolVar(&installAgentCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")
 	installAgentCmd.Flags().BoolVar(&installAgentCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")

venonactl/cmd/install-monitor.go

@@ -18,6 +18,7 @@ limitations under the License.
 
 import (
 	"fmt"
+
 	"github.com/codefresh-io/venona/venonactl/pkg/plugins"
 	"github.com/codefresh-io/venona/venonactl/pkg/store"
 	"github.com/spf13/cobra"
@@ -34,6 +35,7 @@ var installMonitorAgentCmdOptions struct {
 	helm3          bool
 	codefreshToken string
 	codefreshHost  string
+	dockerRegistry string
 }
 
 // installK8sAgentCmd represents the install command
@@ -64,6 +66,7 @@ var installMonitorAgentCmd = &cobra.Command{
 
 		s.ClusterId = installMonitorAgentCmdOptions.clusterId
 		s.Helm3 = installMonitorAgentCmdOptions.helm3
+		s.DockerRegistry = installMonitorAgentCmdOptions.dockerRegistry
 
 		if installMonitorAgentCmdOptions.codefreshHost == "" {
 			installMonitorAgentCmdOptions.codefreshHost = "https://g.codefresh.io"
@@ -103,6 +106,7 @@ func init() {
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.kube.context, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which monitor should be installed (default is current-context) [$KUBE_CONTEXT]")
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.clusterId, "clusterId", "", "Cluster Id")
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.codefreshToken, "codefreshToken", "", "Codefresh token")
+	installMonitorAgentCmd.Flags().StringVar(&installAgentCmdOptions.dockerRegistry, "docker-registry", "", "The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry=\"docker.io\"")
 
 	installMonitorAgentCmd.Flags().StringVar(&installMonitorAgentCmdOptions.codefreshHost, "codefreshHost", "", "Override codefresh host if you use your own codefresh installation")
 

venonactl/cmd/install-runtime.go

@@ -35,6 +35,7 @@ var installRuntimeCmdOptions struct {
 		nodeSelector string
 	}
 	storageClass           string
+	dockerRegistry         string
 	runtimeEnvironmentName string
 	kubernetesRunnerType   bool
 	tolerations            string
@@ -82,6 +83,7 @@ var installRuntimeCmd = &cobra.Command{
 		}
 
 		s.KubernetesAPI.NodeSelector = installRuntimeCmdOptions.kube.nodeSelector
+		s.DockerRegistry = installRuntimeCmdOptions.dockerRegistry
 
 		builder := plugins.NewBuilder(lgr)
 		isDefault := isUsingDefaultStorageClass(installRuntimeCmdOptions.storageClass)
@@ -164,6 +166,7 @@ func init() {
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.kube.namespace, "kube-namespace", viper.GetString("kube-namespace"), "Name of the namespace on which venona should be installed [$KUBE_NAMESPACE]")
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.kube.context, "kube-context-name", viper.GetString("kube-context"), "Name of the kubernetes context on which venona should be installed (default is current-context) [$KUBE_CONTEXT]")
 	installRuntimeCmd.Flags().StringVar(&installRuntimeCmdOptions.storageClass, "storage-class", "", "Set a name of your custom storage class, note: this will not install volume provisioning components")
+	installRuntimeCmd.Flags().StringVar(&installAgentCmdOptions.dockerRegistry, "docker-registry", "", "The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry=\"docker.io\"")
 
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")
 	installRuntimeCmd.Flags().BoolVar(&installRuntimeCmdOptions.dryRun, "dry-run", false, "Set to true to simulate installation")

venonactl/pkg/plugins/helper.go

@@ -121,6 +121,7 @@ func ExecuteTemplate(tplStr string, data interface{}) (string, error) {
 
 	buf := bytes.NewBufferString("")
 	err = template.Execute(buf, data)
+	fmt.Println(buf)
 	if err != nil {
 		return "", err
 	}

venonactl/pkg/plugins/plugin.go

@@ -56,6 +56,7 @@ type (
 		RegisterWithAgent     bool
 		MarkAsDefault         bool
 		StorageClass          string
+		DockerRegistry        string
 		IsDefaultStorageClass bool
 		KubeBuilder           interface {
 			BuildClient() (*kubernetes.Clientset, error)

venonactl/pkg/store/store.go

@@ -21,9 +21,10 @@ type (
 	Values struct {
 		AppName string
 
-		Mode       string
-		Image      *Image
-		AgentToken string
+		Mode           string
+		Image          *Image
+		DockerRegistry string
+		AgentToken     string
 
 		ServerCert *certs.ServerCert
 
@@ -113,6 +114,7 @@ func (s *Values) BuildValues() map[string]interface{} {
 		"ConfigPath":        s.KubernetesAPI.ConfigPath,
 		"Context":           s.KubernetesAPI.ContextName,
 		"NodeSelector":      s.KubernetesAPI.NodeSelector,
+		"DockerRegistry":    s.DockerRegistry,
 		"Tolerations":       s.KubernetesAPI.Tolerations,
 		"AgentToken":        s.AgentAPI.Token,
 		"AgentId":           s.AgentAPI.Id,

venonactl/pkg/templates/kubernetes/cron-job.dind-volume-cleanup.vp.yaml

@@ -20,7 +20,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: dind-volume-cleanup
-              image: codefresh/dind-volume-cleanup
+              image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/codefresh/dind-volume-cleanup {{- else }}codefresh/dind-volume-cleanup {{- end}}
               env:
               - name: PROVISIONED_BY
                 value: codefresh.io/dind-volume-provisioner-{{ .AppName }}-{{ .Namespace }}

venonactl/pkg/templates/kubernetes/daemonset.dind-lv-monitor.vp.yaml

@@ -32,7 +32,7 @@ spec:
         {{ .Tolerations | indent 8 }}
       {{ end }}
       containers:
-        - image: codefresh/dind-volume-utils:v5
+        - image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/codefresh/dind-volume-utils:v5 {{- else }}codefresh/dind-volume-utils:v5{{- end}}
           name: lv-cleaner
           imagePullPolicy: Always
           command:

venonactl/pkg/templates/kubernetes/deployment.dind-volume-provisioner.vp.yaml

@@ -31,7 +31,7 @@ spec:
       {{ end }}
       containers:
       - name: dind-volume-provisioner
-        image: {{ .Storage.VolumeProvisioner.Image }}
+        image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/{{ .Storage.VolumeProvisioner.Image.Name }} {{- else }} {{- .Storage.VolumeProvisioner.Image.Name }} {{- end}}
         imagePullPolicy: Always
         resources:
           requests:

venonactl/pkg/templates/kubernetes/deployment.monitor.yaml

@@ -27,7 +27,7 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Monitor.AppName }}
-        image: "{{ .Monitor.Image.Name }}:{{ .Monitor.Image.Tag }}"
+        image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/{{ .Monitor.Image.Name }}:{{ .Monitor.Image.Tag }} {{- else }} {{- .Monitor.Image.Name }}:{{ .Monitor.Image.Tag }} {{- end}}
         imagePullPolicy: Always
         env:
           - name: SERVICE_NAME