feat: Add support for ResourceRequirements in node pools

db/20200704151301_update_cvat_workspace_template.go → db/go/20200704151301_update_cvat_workspace_template.go

@@ -5,7 +5,6 @@ import (
 	v1 "github.com/onepanelio/core/pkg"
 	uid2 "github.com/onepanelio/core/pkg/util/uid"
 	"github.com/pressly/goose"
-	"time"
 )
 
 const cvatWorkspaceTemplate3 = `# Docker containers that are part of the Workspace
@@ -128,14 +127,20 @@ func init() {
 // Up20200704151301 updates the CVAT template to a new version.
 func Up20200704151301(tx *sql.Tx) error {
 	// This code is executed when the migration is applied.
-
-	time.Sleep(2 * time.Second)
-
 	client, err := getClient()
 	if err != nil {
 		return err
 	}
 
+	migrationsRan, err := getRanSQLMigrations(client)
+	if err != nil {
+		return err
+	}
+
+	if _, ok := migrationsRan[20200704151301]; ok {
+		return nil
+	}
+
 	namespaces, err := client.ListOnepanelEnabledNamespaces()
 	if err != nil {
 		return err

pkg/config.go

@@ -2,121 +2,13 @@ package v1
 
 import (
 	"encoding/base64"
-	"fmt"
 	"github.com/onepanelio/core/pkg/util"
-	"github.com/onepanelio/core/pkg/util/ptr"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/yaml"
-	"strings"
 )
 
-// SystemConfig is configuration loaded from kubernetes config and secrets that includes information about the
-// database, server, etc.
-type SystemConfig map[string]string
-
-// NewSystemConfig creates a System config by getting the required data from a ConfigMap and Secret
-func NewSystemConfig(configMap *ConfigMap, secret *Secret) (config SystemConfig, err error) {
-	config = configMap.Data
-
-	databaseUsername, err := base64.StdEncoding.DecodeString(secret.Data["databaseUsername"])
-	if err != nil {
-		return
-	}
-	config["databaseUsername"] = string(databaseUsername)
-
-	databasePassword, err := base64.StdEncoding.DecodeString(secret.Data["databasePassword"])
-	if err != nil {
-		return
-	}
-	config["databasePassword"] = string(databasePassword)
-
-	return
-}
-
-// GetValue returns the value in the underlying map if it exists, otherwise nil is returned
-// If the value does not exist, it is also logged.
-func (s SystemConfig) GetValue(name string) *string {
-	value, ok := s[name]
-	if !ok {
-		log.WithFields(log.Fields{
-			"Method": "SystemConfig.GetValue",
-			"Name":   name,
-			"Error":  "does not exist",
-		})
-
-		return nil
-	}
-
-	return &value
-}
-
-// Domain gets the ONEPANEL_DOMAIN value, or nil.
-func (s SystemConfig) Domain() *string {
-	return s.GetValue("ONEPANEL_DOMAIN")
-}
-
-// APIURL gets the ONEPANEL_API_URL, or nil.
-func (s SystemConfig) APIURL() *string {
-	return s.GetValue("ONEPANEL_API_URL")
-}
-
-// APIProtocol returns either http:// or https:// or nil.
-// It is based on the ONEPANEL_API_URL config value and checks if it has https or http
-func (s SystemConfig) APIProtocol() *string {
-	url := s.APIURL()
-	if url == nil {
-		return nil
-	}
-
-	if strings.HasPrefix(*url, "https://") {
-		return ptr.String("https://")
-	}
-
-	return ptr.String("http://")
-}
-
-// FQDN gets the ONEPANEL_FQDN value or nil.
-func (s SystemConfig) FQDN() *string {
-	return s.GetValue("ONEPANEL_FQDN")
-}
-
-// NodePoolLabel gets the applicationNodePoolLabel from the config or returns nil.
-func (s SystemConfig) NodePoolLabel() (label *string) {
-	return s.GetValue("applicationNodePoolLabel")
-}
-
-// NodePoolOptions loads and parses the applicationNodePoolOptions from the config.
-// If there is no data, an error is returned.
-func (s SystemConfig) NodePoolOptions() (options []*ParameterOption, err error) {
-	data := s.GetValue("applicationNodePoolOptions")
-	if data == nil {
-		return nil, fmt.Errorf("no nodePoolOptions in config")
-	}
-
-	if err = yaml.Unmarshal([]byte(*data), &options); err != nil {
-		return
-	}
-
-	return
-}
-
-// DatabaseDriverName gets the databaseDriverName value, or nil.
-func (s SystemConfig) DatabaseDriverName() *string {
-	return s.GetValue("databaseDriverName")
-}
-
-// DatabaseConnection returns system config information to connect to a database
-func (s SystemConfig) DatabaseConnection() (driverName, dataSourceName string) {
-	dataSourceName = fmt.Sprintf("host=%v user=%v password=%v dbname=%v sslmode=disable",
-		s["databaseHost"], s["databaseUsername"], s["databasePassword"], s["databaseName"])
-
-	driverName = *s.DatabaseDriverName()
-
-	return
-}
-
 func (c *Client) getConfigMap(namespace, name string) (configMap *ConfigMap, err error) {
 	cm, err := c.CoreV1().ConfigMaps(namespace).Get(name, metav1.GetOptions{})
 	if err != nil {

pkg/config_types.go

@@ -1,10 +1,141 @@
 package v1
 
 import (
+	"encoding/base64"
+	"fmt"
+	"github.com/onepanelio/core/pkg/util/ptr"
+	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/yaml"
 	"strings"
 )
 
+// SystemConfig is configuration loaded from kubernetes config and secrets that includes information about the
+// database, server, etc.
+type SystemConfig map[string]string
+
+// NodePoolOption extends ParameterOption to support resourceRequirements
+type NodePoolOption struct {
+	ParameterOption
+	Resources corev1.ResourceRequirements
+}
+
+// NewSystemConfig creates a System config by getting the required data from a ConfigMap and Secret
+func NewSystemConfig(configMap *ConfigMap, secret *Secret) (config SystemConfig, err error) {
+	config = configMap.Data
+
+	databaseUsername, err := base64.StdEncoding.DecodeString(secret.Data["databaseUsername"])
+	if err != nil {
+		return
+	}
+	config["databaseUsername"] = string(databaseUsername)
+
+	databasePassword, err := base64.StdEncoding.DecodeString(secret.Data["databasePassword"])
+	if err != nil {
+		return
+	}
+	config["databasePassword"] = string(databasePassword)
+
+	return
+}
+
+// GetValue returns the value in the underlying map if it exists, otherwise nil is returned
+// If the value does not exist, it is also logged.
+func (s SystemConfig) GetValue(name string) *string {
+	value, ok := s[name]
+	if !ok {
+		log.WithFields(log.Fields{
+			"Method": "SystemConfig.GetValue",
+			"Name":   name,
+			"Error":  "does not exist",
+		})
+
+		return nil
+	}
+
+	return &value
+}
+
+// Domain gets the ONEPANEL_DOMAIN value, or nil.
+func (s SystemConfig) Domain() *string {
+	return s.GetValue("ONEPANEL_DOMAIN")
+}
+
+// APIURL gets the ONEPANEL_API_URL, or nil.
+func (s SystemConfig) APIURL() *string {
+	return s.GetValue("ONEPANEL_API_URL")
+}
+
+// APIProtocol returns either http:// or https:// or nil.
+// It is based on the ONEPANEL_API_URL config value and checks if it has https or http
+func (s SystemConfig) APIProtocol() *string {
+	url := s.APIURL()
+	if url == nil {
+		return nil
+	}
+
+	if strings.HasPrefix(*url, "https://") {
+		return ptr.String("https://")
+	}
+
+	return ptr.String("http://")
+}
+
+// FQDN gets the ONEPANEL_FQDN value or nil.
+func (s SystemConfig) FQDN() *string {
+	return s.GetValue("ONEPANEL_FQDN")
+}
+
+// NodePoolLabel gets the applicationNodePoolLabel from the config or returns nil.
+func (s SystemConfig) NodePoolLabel() (label *string) {
+	return s.GetValue("applicationNodePoolLabel")
+}
+
+// NodePoolOptions loads and parses the applicationNodePoolOptions from the config.
+// If there is no data, an error is returned.
+func (s SystemConfig) NodePoolOptions() (options []*NodePoolOption, err error) {
+	data := s.GetValue("applicationNodePoolOptions")
+	if data == nil {
+		return nil, fmt.Errorf("no nodePoolOptions in config")
+	}
+
+	if err = yaml.Unmarshal([]byte(*data), &options); err != nil {
+		return
+	}
+
+	return
+}
+
+// NodePoolOptionByValue returns the nodePoolOption based on a given value
+func (s SystemConfig) NodePoolOptionByValue(value string) (option *NodePoolOption, err error) {
+	options, err := s.NodePoolOptions()
+	if err != nil {
+		return
+	}
+	for _, opt := range options {
+		if opt.Value == value {
+			option = opt
+			return
+		}
+	}
+	return
+}
+
+// DatabaseDriverName gets the databaseDriverName value, or nil.
+func (s SystemConfig) DatabaseDriverName() *string {
+	return s.GetValue("databaseDriverName")
+}
+
+// DatabaseConnection returns system config information to connect to a database
+func (s SystemConfig) DatabaseConnection() (driverName, dataSourceName string) {
+	dataSourceName = fmt.Sprintf("host=%v user=%v password=%v dbname=%v sslmode=disable",
+		s["databaseHost"], s["databaseUsername"], s["databasePassword"], s["databaseName"])
+
+	driverName = *s.DatabaseDriverName()
+
+	return
+}
+
 type ArtifactRepositoryS3Config struct {
 	KeyFormat       string
 	Bucket          string