Cr 4000 incluster (#236)

In cluster runtime support

Author: yuri-denysenko-codefresh

venona/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4

venona/cmd/start.go

@@ -55,6 +55,7 @@ type startOptions struct {
 	serverPort                     string
 	newrelicLicenseKey             string
 	newrelicAppname                string
+	inClusterRuntime               string
 }
 
 var (
@@ -74,6 +75,7 @@ var startCmd = &cobra.Command{
 func init() {
 	dieOnError(viper.BindEnv("codefresh-token", "CODEFRESH_TOKEN"))
 	dieOnError(viper.BindEnv("codefresh-host", "CODEFRESH_HOST"))
+	dieOnError(viper.BindEnv("in-cluster-runtime", "CODEFRESH_IN_CLUSTER_RUNTIME"))
 	dieOnError(viper.BindEnv("agent-id", "AGENT_ID"))
 	dieOnError(viper.BindEnv("config-dir", "VENONA_CONFIG_DIR"))
 	dieOnError(viper.BindEnv("port", "PORT"))
@@ -85,10 +87,12 @@ func init() {
 	viper.SetDefault("codefresh-host", defaultCodefreshHost)
 	viper.SetDefault("port", "8080")
 	viper.SetDefault("NODE_TLS_REJECT_UNAUTHORIZED", "1")
+	viper.SetDefault("in-cluster-runtime", "")
 	viper.SetDefault("newrelic-appname", AppName)
 
 	startCmd.Flags().BoolVar(&startCmdOptions.verbose, "verbose", viper.GetBool("verbose"), "Show more logs")
 	startCmd.Flags().BoolVar(&startCmdOptions.rejectTLSUnauthorized, "tls-reject-unauthorized", viper.GetBool("NODE_TLS_REJECT_UNAUTHORIZED"), "Disable certificate validation for TLS connections")
+	startCmd.Flags().StringVar(&startCmdOptions.inClusterRuntime, "in-cluster-runtime", viper.GetString("in-cluster-runtime"), "Runtime name to run agent in cluster mode ")
 	startCmd.Flags().StringVar(&startCmdOptions.agentID, "agent-id", viper.GetString("agent-id"), "ID of the agent [$AGENT_ID]")
 	startCmd.Flags().StringVar(&startCmdOptions.configDir, "config-dir", viper.GetString("config-dir"), "path to configuration folder [$CONFIG_DIR]")
 	startCmd.Flags().StringVar(&startCmdOptions.codefreshToken, "codefresh-token", viper.GetString("codefresh-token"), "Codefresh API token [$CODEFRESH_TOKEN]")
@@ -122,30 +126,16 @@ func run(options startOptions) {
 		log.Warn("Running in insecure mode", "NODE_TLS_REJECT_UNAUTHORIZED", options.rejectTLSUnauthorized)
 	}
 
-	configs, err := config.Load(options.configDir, ".*.runtime.yaml", log.New("module", "config-loader"))
-	dieOnError(err)
-	runtimes := map[string]runtime.Runtime{}
-	{
-		for name, config := range configs {
-			k, err := kubernetes.New(kubernetes.Options{
-				Token:    config.Token,
-				Type:     config.Type,
-				Host:     config.Host,
-				Cert:     config.Cert,
-				Insecure: !options.rejectTLSUnauthorized,
-			})
-			if err != nil {
-				log.Error("Failed to load kubernetes", "error", err.Error(), "file", name, "name", config.Name)
-				continue
-			}
-			re := runtime.New(runtime.Options{
-				Kubernetes: k,
-			})
-			runtimes[config.Name] = re
-		}
+	var runtimes map[string]runtime.Runtime
+	if options.inClusterRuntime != "" {
+		runtimes = inClusterRuntimeConfiguration(options)
+	} else {
+		runtimes = remoteRuntimeConfiguration(options, log)
 	}
 
 	var monitor monitoring.Monitor = monitoring.NewEmpty()
+	var err error
+
 	if options.newrelicLicenseKey != "" {
 		monitor, err = newrelic.New(
 			nr.ConfigAppName(options.newrelicAppname),
@@ -217,6 +207,41 @@ func run(options startOptions) {
 	<-ctx.Done()
 }
 
+func inClusterRuntimeConfiguration(options startOptions) map[string]runtime.Runtime {
+	k, err := kubernetes.NewInCluster()
+	dieOnError(err)
+	re := runtime.New(runtime.Options{
+		Kubernetes: k,
+	})
+	return map[string]runtime.Runtime{options.inClusterRuntime: re}
+}
+
+func remoteRuntimeConfiguration(options startOptions, log logger.Logger) map[string]runtime.Runtime {
+	configs, err := config.Load(options.configDir, ".*.runtime.yaml", log.New("module", "config-loader"))
+	dieOnError(err)
+	runtimes := map[string]runtime.Runtime{}
+	{
+		for name, config := range configs {
+			k, err := kubernetes.New(kubernetes.Options{
+				Token:    config.Token,
+				Type:     config.Type,
+				Host:     config.Host,
+				Cert:     config.Cert,
+				Insecure: !options.rejectTLSUnauthorized,
+			})
+			if err != nil {
+				log.Error("Failed to load kubernetes", "error", err.Error(), "file", name, "name", config.Name)
+				continue
+			}
+			re := runtime.New(runtime.Options{
+				Kubernetes: k,
+			})
+			runtimes[config.Name] = re
+		}
+	}
+	return runtimes
+}
+
 func withSignals(
 	ctx context.Context,
 	stopServer func(context.Context) error,

venona/pkg/kubernetes/kubernetes.go

@@ -60,6 +60,15 @@ type (
 	}
 )
 
+// NewInCluster build Kubernetes API based on local in cluster runtime
+func NewInCluster() (Kubernetes, error) {
+	client, err := buildKubeInCluster()
+	return &kube{
+		client: client,
+		logger: logger.New(logger.Options{}),
+	}, err
+}
+
 // New build Kubernetes API
 func New(opt Options) (Kubernetes, error) {
 	if opt.Type != "runtime" {
@@ -144,3 +153,11 @@ func buildKubeClient(host string, token string, crt string, insecure bool) (kube
 		TLSClientConfig: tlsconf,
 	})
 }
+
+func buildKubeInCluster() (kubernetes.Interface, error) {
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		return nil, err
+	}
+	return kubernetes.NewForConfig(config)
+}

venonactl/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4