Support custom envs for the app push command (#2635)

Author: pPrecel

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/google/go-containerregistry v0.20.6
 	github.com/itchyny/gojq v0.12.17
 	github.com/jedib0t/go-pretty/v6 v6.6.8
+	github.com/joho/godotenv v1.5.1
 	github.com/kyma-project/api-gateway v0.0.0-20250814120053-7d617def4106
 	github.com/moby/go-archive v0.1.0
 	github.com/moby/term v0.5.2

go.sum

@@ -277,6 +277,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
 github.com/jedib0t/go-pretty/v6 v6.6.8 h1:JnnzQeRz2bACBobIaa/r+nqjvws4yEhcmaZ4n1QzsEc=
 github.com/jedib0t/go-pretty/v6 v6.6.8/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=

internal/cmd/app/push.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/kyma-project/cli.v3/internal/clierror"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon"
+	"github.com/kyma-project/cli.v3/internal/cmdcommon/env"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
 	"github.com/kyma-project/cli.v3/internal/dockerfile"
 	"github.com/kyma-project/cli.v3/internal/flags"
@@ -31,6 +32,10 @@ type appPushConfig struct {
 	packAppPath          string
 	containerPort        types.NullableInt64
 	istioInject          types.NullableBool
+	envs                 types.Map
+	fileEnvs             types.SourcedEnvArray
+	configmapEnvs        types.SourcedEnvArray
+	secretEnvs           types.SourcedEnvArray
 	expose               bool
 	mountSecrets         []string
 	mountConfigmaps      []string
@@ -40,6 +45,7 @@ type appPushConfig struct {
 func NewAppPushCMD(kymaConfig *cmdcommon.KymaConfig) *cobra.Command {
 	config := appPushConfig{
 		KymaConfig: kymaConfig,
+		envs:       types.Map{Values: map[string]interface{}{}},
 	}
 
 	cmd := &cobra.Command{
@@ -67,6 +73,10 @@ func NewAppPushCMD(kymaConfig *cmdcommon.KymaConfig) *cobra.Command {
 	// common flags
 	cmd.Flags().StringVar(&config.name, "name", "", "Name of the app")
 	cmd.Flags().BoolVarP(&config.quiet, "quiet", "q", false, "Suppresses non-essential output (prints only the URL of the pushed app, if exposed)")
+	cmd.Flags().Var(&config.envs, "env", "Environment variables for the app in format KEY=VALUE")
+	cmd.Flags().Var(&config.fileEnvs, "env-from-file", "Environment variables for the app loaded from a file in format KEY=PATH:KEY for single key or PATH[:PREFIX] to fetch all keys")
+	cmd.Flags().Var(&config.configmapEnvs, "env-from-configmap", "Environment variables for the app loaded from a ConfigMap in format KEY=PATH:KEY for single key or PATH[:PREFIX] to fetch all keys")
+	cmd.Flags().Var(&config.secretEnvs, "env-from-secret", "Environment variables for the app loaded from a Secret in format KEY=PATH:KEY for single key or PATH[:PREFIX] to fetch all keys")
 
 	// image flags
 	cmd.Flags().StringVar(&config.image, "image", "", "Name of the image to deploy")
@@ -163,22 +173,14 @@ func runAppPush(cfg *appPushConfig) clierror.Error {
 
 	fmt.Fprintf(writer, "\nCreating deployment %s/%s\n", cfg.namespace, cfg.name)
 
-	err := resources.CreateDeployment(cfg.Ctx, client, resources.CreateDeploymentOpts{
-		Name:            cfg.name,
-		Namespace:       cfg.namespace,
-		Image:           image,
-		ImagePullSecret: imagePullSecret,
-		InjectIstio:     cfg.istioInject,
-		SecretMounts:    cfg.mountSecrets,
-		ConfigmapMounts: cfg.mountConfigmaps,
-	})
-	if err != nil {
-		return clierror.Wrap(err, clierror.New("failed to create deployment"))
+	clierr = createDeployment(cfg, client, image, imagePullSecret)
+	if clierr != nil {
+		return clierr
 	}
 
 	if cfg.containerPort.Value != nil {
 		fmt.Fprintf(writer, "\nCreating service %s/%s\n", cfg.namespace, cfg.name)
-		err = resources.CreateService(cfg.Ctx, client, cfg.name, cfg.namespace, int32(*cfg.containerPort.Value))
+		err := resources.CreateService(cfg.Ctx, client, cfg.name, cfg.namespace, int32(*cfg.containerPort.Value))
 		if err != nil {
 			return clierror.Wrap(err, clierror.New("failed to create service"))
 		}
@@ -188,7 +190,7 @@ func runAppPush(cfg *appPushConfig) clierror.Error {
 		fmt.Fprintf(writer, "\nCreating API Rule %s/%s\n", cfg.namespace, cfg.name)
 		url := fmt.Sprintf("%s.<CLUSTER_DOMAIN>", cfg.name)
 
-		err = resources.CreateAPIRule(cfg.Ctx, client.RootlessDynamic(), cfg.name, cfg.namespace, cfg.name, uint32(*cfg.containerPort.Value))
+		err := resources.CreateAPIRule(cfg.Ctx, client.RootlessDynamic(), cfg.name, cfg.namespace, cfg.name, uint32(*cfg.containerPort.Value))
 		if err != nil {
 			return clierror.Wrap(err, clierror.New("failed to create API Rule resource", "Make sure API Gateway module is installed", "Make sure APIRule CRD is available in v2 version"))
 		}
@@ -216,6 +218,42 @@ func runAppPush(cfg *appPushConfig) clierror.Error {
 	return nil
 }
 
+func createDeployment(cfg *appPushConfig, client kube.Client, image, imagePullSecret string) clierror.Error {
+	fileEnvs, err := env.BuildEnvsFromFile(cfg.fileEnvs)
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to build envs from file"))
+	}
+
+	secretEnvs, err := env.BuildEnvsFromSecret(cfg.Ctx, client, cfg.namespace, cfg.secretEnvs)
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to build envs from secret"))
+	}
+
+	configmapEnvs, err := env.BuildEnvsFromConfigmap(cfg.Ctx, client, cfg.namespace, cfg.configmapEnvs)
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to build envs from configmap"))
+	}
+
+	envs := append(fileEnvs, secretEnvs...)
+	envs = append(envs, configmapEnvs...)
+
+	err = resources.CreateDeployment(cfg.Ctx, client, resources.CreateDeploymentOpts{
+		Name:            cfg.name,
+		Namespace:       cfg.namespace,
+		Image:           image,
+		ImagePullSecret: imagePullSecret,
+		InjectIstio:     cfg.istioInject,
+		SecretMounts:    cfg.mountSecrets,
+		ConfigmapMounts: cfg.mountConfigmaps,
+		Envs:            envs,
+	})
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to create deployment"))
+	}
+
+	return nil
+}
+
 func buildAndImportImage(client kube.Client, cfg *appPushConfig, registryConfig *registry.InternalRegistryConfig) (string, clierror.Error) {
 	fmt.Print("Building image\n\n")
 	imageName, err := buildImage(cfg)

internal/cmdcommon/env/configmap.go

@@ -0,0 +1,79 @@
+package env
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/kyma-project/cli.v3/internal/cmdcommon/types"
+	"github.com/kyma-project/cli.v3/internal/kube"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func BuildEnvsFromConfigmap(ctx context.Context, client kube.Client, namespace string, envs types.SourcedEnvArray) ([]corev1.EnvVar, error) {
+	var result []corev1.EnvVar
+	for _, e := range envs.Values {
+		if e.Location == "" {
+			return nil, fmt.Errorf("missing configmap name in env: '%s'", e.String())
+		}
+
+		if e.Name != "" {
+			// single env var from configmap
+			if e.LocationKey == "" {
+				return nil, fmt.Errorf("missing configmap key in env: '%s'", e.String())
+			}
+
+			result = append(result, corev1.EnvVar{
+				Name: e.Name,
+				ValueFrom: &corev1.EnvVarSource{
+					ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
+						Key: e.LocationKey,
+						LocalObjectReference: corev1.LocalObjectReference{
+							Name: e.Location,
+						},
+					},
+				},
+			})
+			continue
+		}
+
+		// multi env vars from configmap
+		data, err := getConfigmapData(ctx, client, namespace, e.Location)
+		if err != nil {
+			return nil, fmt.Errorf("while reading configmap '%s': %w", e.Location, err)
+		}
+
+		cmEnvs := buildConfigmapAllKeyEnvs(data, e.Location, e.LocationKeysPrefix)
+		result = append(result, cmEnvs...)
+	}
+
+	return result, nil
+}
+
+func getConfigmapData(ctx context.Context, client kube.Client, namespace, name string) (map[string]string, error) {
+	cm, err := client.Static().CoreV1().ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return cm.Data, nil
+}
+
+func buildConfigmapAllKeyEnvs(data map[string]string, resName string, prefix string) []corev1.EnvVar {
+	var result []corev1.EnvVar
+	for k := range data {
+		result = append(result, corev1.EnvVar{
+			Name: fmt.Sprintf("%s%s", prefix, k),
+			ValueFrom: &corev1.EnvVarSource{
+				ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
+					Key: k,
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: resName,
+					},
+				},
+			},
+		})
+	}
+
+	return result
+}