Fix volumizing platform into functions pod (#1894)

nuclio · Nov 3, 2020 · bd24c3e · bd24c3e
1 parent 5e4a4b1
commit bd24c3e
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 25 deletions.
diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go
@@ -39,6 +39,7 @@ func Run(kubeconfigPath string,
 	namespace string,
 	imagePullSecrets string,
 	platformConfigurationPath string,
+	platformConfigurationName string,
 	functionOperatorNumWorkersStr string,
 	functionOperatorResyncIntervalStr string,
 	cronJobStaleResourcesCleanupIntervalStr string,
@@ -50,6 +51,7 @@ func Run(kubeconfigPath string,
 		namespace,
 		imagePullSecrets,
 		platformConfigurationPath,
+		platformConfigurationName,
 		functionOperatorNumWorkersStr,
 		functionOperatorResyncIntervalStr,
 		cronJobStaleResourcesCleanupIntervalStr,
@@ -73,6 +75,7 @@ func createController(kubeconfigPath string,
 	namespace string,
 	imagePullSecrets string,
 	platformConfigurationPath string,
+	platformConfigurationName string,
 	functionOperatorNumWorkersStr string,
 	functionOperatorResyncIntervalStr string,
 	cronJobStaleResourcesCleanupIntervalStr string,
@@ -165,6 +168,7 @@ func createController(kubeconfigPath string,
 		functionOperatorResyncInterval,
 		cronJobStaleResourcesCleanupInterval,
 		platformConfiguration,
+		platformConfigurationName,
 		functionOperatorNumWorkers,
 		functionEventOperatorNumWorkers,
 		projectOperatorNumWorkers,

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -48,6 +48,7 @@ func main() {
 	namespace := flag.String("namespace", "", "Namespace to listen on, or * for all")
 	imagePullSecrets := flag.String("image-pull-secrets", os.Getenv("NUCLIO_CONTROLLER_IMAGE_PULL_SECRETS"), "Optional secret name to use for pull")
 	platformConfigurationPath := flag.String("platform-config", "/etc/nuclio/config/platform/platform.yaml", "Path of platform configuration file")
+	platformConfigurationName := flag.String("platform-config-name", common.GetEnvOrDefaultString("NUCLIO_CONTROLLER_PLATFORM_CONFIGURATION_NAME", "nuclio-platform-config"), "Platform configuration resource name")
 	functionOperatorNumWorkersStr := flag.String("function-operator-num-workers", common.GetEnvOrDefaultString("NUCLIO_CONTROLLER_FUNCTION_OPERATOR_NUM_WORKERS", "4"), "Set number of workers for the function operator (optional)")
 	functionOperatorResyncIntervalStr := flag.String("function-operator-resync-interval", common.GetEnvOrDefaultString("NUCLIO_CONTROLLER_FUNCTION_OPERATOR_RESYNC_INTERVAL", "10m"), "Set resync interval for the function operator (optional)")
 	cronJobStaleResourcesCleanupIntervalStr := flag.String("cron-job-stale-resources-cleanup-interval", common.GetEnvOrDefaultString("NUCLIO_CONTROLLER_CRON_JOB_STALE_RESOURCES_CLEANUP_INTERVAL", "1m"), "Set interval for the cleanup of stale cron job resources (optional)")
@@ -73,6 +74,7 @@ func main() {
 		resolvedNamespace,
 		*imagePullSecrets,
 		*platformConfigurationPath,
+		*platformConfigurationName,
 		*functionOperatorNumWorkersStr,
 		*functionOperatorResyncIntervalStr,
 		*cronJobStaleResourcesCleanupIntervalStr,

diff --git a/hack/k8s/helm/nuclio/templates/deployment/controller.yaml b/hack/k8s/helm/nuclio/templates/deployment/controller.yaml
@@ -50,6 +50,10 @@ spec:
           value: {{ .Values.controller.cronTriggerCronJobImage.repository }}:{{ .Values.controller.cronTriggerCronJobImage.tag }}
         - name: NUCLIO_CONTROLLER_CRON_TRIGGER_CRON_JOB_IMAGE_PULL_POLICY
           value: {{ .Values.controller.cronTriggerCronJobImage.pullPolicy }}
+        {{- if .Values.platform }}
+        - name: NUCLIO_CONTROLLER_PLATFORM_CONFIGURATION_NAME
+          value: {{ template "nuclio.platformConfigName" . }}
+        {{- end}}
         {{- if .Values.controller.namespace }}
         - name: NUCLIO_CONTROLLER_NAMESPACE
           value: {{ .Values.controller.namespace | quote }}

diff --git a/pkg/platform/kube/controller/controller.go b/pkg/platform/kube/controller/controller.go
@@ -31,20 +31,21 @@ import (
 )
 
 type Controller struct {
-	logger                logger.Logger
-	namespace             string
-	kubeClientSet         kubernetes.Interface
-	nuclioClientSet       nuclioioclient.Interface
-	functionresClient     functionres.Client
-	apigatewayresClient   apigatewayres.Client
-	imagePullSecrets      string
-	functionOperator      *functionOperator
-	projectOperator       *projectOperator
-	functionEventOperator *functionEventOperator
-	apiGatewayOperator    *apiGatewayOperator
-	cronJobMonitoring     *CronJobMonitoring
-	platformConfiguration *platformconfig.Config
-	resyncInterval        time.Duration
+	logger                    logger.Logger
+	namespace                 string
+	kubeClientSet             kubernetes.Interface
+	nuclioClientSet           nuclioioclient.Interface
+	functionresClient         functionres.Client
+	apigatewayresClient       apigatewayres.Client
+	imagePullSecrets          string
+	functionOperator          *functionOperator
+	projectOperator           *projectOperator
+	functionEventOperator     *functionEventOperator
+	apiGatewayOperator        *apiGatewayOperator
+	cronJobMonitoring         *CronJobMonitoring
+	platformConfiguration     *platformconfig.Config
+	platformConfigurationName string
+	resyncInterval            time.Duration
 }
 
 func NewController(parentLogger logger.Logger,
@@ -57,6 +58,7 @@ func NewController(parentLogger logger.Logger,
 	resyncInterval time.Duration,
 	cronJobStaleResourcesCleanupInterval time.Duration,
 	platformConfiguration *platformconfig.Config,
+	platformConfigurationName string,
 	functionOperatorNumWorkers int,
 	functionEventOperatorNumWorkers int,
 	projectOperatorNumWorkers int,
@@ -69,15 +71,16 @@ func NewController(parentLogger logger.Logger,
 	}
 
 	newController := &Controller{
-		logger:                parentLogger,
-		namespace:             namespace,
-		imagePullSecrets:      imagePullSecrets,
-		kubeClientSet:         kubeClientSet,
-		nuclioClientSet:       nuclioClientSet,
-		functionresClient:     functionresClient,
-		apigatewayresClient:   apigatewayresClient,
-		platformConfiguration: platformConfiguration,
-		resyncInterval:        resyncInterval,
+		logger:                    parentLogger,
+		namespace:                 namespace,
+		imagePullSecrets:          imagePullSecrets,
+		kubeClientSet:             kubeClientSet,
+		nuclioClientSet:           nuclioClientSet,
+		functionresClient:         functionresClient,
+		apigatewayresClient:       apigatewayresClient,
+		platformConfiguration:     platformConfiguration,
+		platformConfigurationName: platformConfigurationName,
+		resyncInterval:            resyncInterval,
 	}
 
 	newController.logger.DebugWith("Read configuration",
@@ -174,6 +177,10 @@ func (c *Controller) GetPlatformConfiguration() *platformconfig.Config {
 	return c.platformConfiguration
 }
 
+func (c *Controller) GetPlatformConfigurationName() string {
+	return c.platformConfigurationName
+}
+
 func (c *Controller) GetResyncInterval() time.Duration {
 	return c.resyncInterval
 }
diff --git a/pkg/platform/kube/functionres/lazy.go b/pkg/platform/kube/functionres/lazy.go
@@ -1873,7 +1873,7 @@ func (lc *lazyClient) getFunctionVolumeAndMounts(function *nuclioio.NuclioFuncti
 	platformConfigVolume := functionconfig.Volume{}
 	platformConfigVolume.Volume.Name = platformConfigVolumeName
 	platformConfigMapVolumeSource := v1.ConfigMapVolumeSource{}
-	platformConfigMapVolumeSource.Name = "platform-config"
+	platformConfigMapVolumeSource.Name = lc.platformConfigurationProvider.GetPlatformConfigurationName()
 	platformConfigMapVolumeSource.Optional = &trueVal
 	platformConfigVolume.Volume.ConfigMap = &platformConfigMapVolumeSource
 	platformConfigVolume.VolumeMount.Name = platformConfigVolumeName

diff --git a/pkg/platform/kube/functionres/lazy_test.go b/pkg/platform/kube/functionres/lazy_test.go
@@ -37,6 +37,10 @@ type mockedPlatformConfigurationProvider struct {
 	platformConfiguration *platformconfig.Config
 }
 
+func (c *mockedPlatformConfigurationProvider) GetPlatformConfigurationName() string {
+	return "mocked-platform-configuration"
+}
+
 func (c *mockedPlatformConfigurationProvider) GetPlatformConfiguration() *platformconfig.Config {
 	return c.platformConfiguration
 }

diff --git a/pkg/platform/kube/functionres/types.go b/pkg/platform/kube/functionres/types.go
@@ -17,6 +17,9 @@ type PlatformConfigurationProvider interface {
 
 	// GetPlatformConfiguration returns a platform configuration
 	GetPlatformConfiguration() *platformconfig.Config
+
+	// GetPlatformConfigurationName returns platform configuration resource name
+	GetPlatformConfigurationName() string
 }
 
 type Client interface {

diff --git a/pkg/platform/kube/test/suite.go b/pkg/platform/kube/test/suite.go
@@ -278,6 +278,7 @@ func (suite *KubeTestSuite) createController() *controller.Controller {
 		time.Second*5,
 		time.Second*30,
 		suite.PlatformConfiguration,
+		"nuclio-platform-config",
 		4,
 		4,
 		4,

diff --git a/test/_functions/common/file-streamer/golang/filestream.go b/test/_functions/common/file-streamer/golang/filestream.go
@@ -25,7 +25,7 @@ func FileStreamer(context *nuclio.Context, event nuclio.Event) (interface{}, err
 
 	headers := map[string]interface{}{
 		"X-nuclio-filestream-path": event.GetPath(),
-		"X-request-body": string(event.GetBody()),
+		"X-request-body":           string(event.GetBody()),
 	}
 
 	if event.GetFieldString("delete_after_send") == "true" {