Add optional field for the secret/configmap as env vars

Signed-off-by: ddalvi <[email protected]>

Author: rimolive

kubernetes_platform/go/kubernetesplatform/kubernetes_executor_config.pb.go

@@ -73,6 +73,8 @@ message SecretAsEnv {
     }
 
     repeated SecretKeyToEnvMap key_to_env = 2;
+    // An optional boolean value indicating whether the Secret must be defined.
+    optional bool optional = 3;
 
     // Name of the Secret.
     ml_pipelines.TaskInputsSpec.InputParameterSpec secret_name_parameter = 4;
@@ -173,9 +175,11 @@ message ConfigMapAsEnv {
     }
 
     repeated ConfigMapKeyToEnvMap key_to_env = 2;
+    // An optional boolean value indicating whether the ConfigMap must be defined.
+    optional bool optional = 3;
 
     // Name of the ConfigMap.
-    ml_pipelines.TaskInputsSpec.InputParameterSpec config_map_name_parameter = 3;
+    ml_pipelines.TaskInputsSpec.InputParameterSpec config_map_name_parameter = 4;
 }
 
 message GenericEphemeralVolume {

kubernetes_platform/proto/kubernetes_executor_config.proto

@@ -24,6 +24,7 @@ def use_config_map_as_env(
     task: PipelineTask,
     config_map_name: Union[pipeline_channel.PipelineParameterChannel, str],
     config_map_key_to_env: Dict[str, str],
+    optional: bool = False,
 ) -> PipelineTask:
     """Use a Kubernetes ConfigMap as an environment variable as described by the `Kubernetes documentation
     https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#define-container-environment-variables-using-configmap-data` _.
@@ -32,6 +33,7 @@ def use_config_map_as_env(
         task: Pipeline task.
         config_map_name: Name of the ConfigMap.
         config_map_key_to_env: Dictionary of ConfigMap key to environment variable name. For example, ``{'foo': 'FOO'}`` sets the value of the ConfigMap's foo field to the environment variable ``FOO``.
+        optional: Optional field specifying whether the ConfigMap must be defined.
 
     Returns:
         Task object with updated ConfigMap configuration.
@@ -45,7 +47,7 @@ def use_config_map_as_env(
             env_var=env_var,
         ) for config_map_key, env_var in config_map_key_to_env.items()
     ]
-    config_map_as_env = pb.ConfigMapAsEnv(key_to_env=key_to_env)
+    config_map_as_env = pb.ConfigMapAsEnv(key_to_env=key_to_env, optional=optional)
 
     config_map_name_parameter = common.parse_k8s_parameter_input(config_map_name, task)
     config_map_as_env.config_map_name_parameter.CopyFrom(config_map_name_parameter)

kubernetes_platform/python/kfp/kubernetes/config_map.py

@@ -26,6 +26,7 @@ def use_secret_as_env(
     task: PipelineTask,
     secret_name: Union[pipeline_channel.PipelineParameterChannel, str],
     secret_key_to_env: Dict[str, str],
+    optional: bool = False,
 ) -> PipelineTask:
     """Use a Kubernetes Secret as an environment variable as described by the `Kubernetes documentation
     https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables `_.
@@ -34,6 +35,7 @@ def use_secret_as_env(
         task: Pipeline task.
         secret_name: Name of the Secret.
         secret_key_to_env: Dictionary of Secret data key to environment variable name. For example, ``{'password': 'PASSWORD'}`` sets the data of the Secret's password field to the environment variable ``PASSWORD``.
+        optional: Optional field specifying whether the Secret must be defined.
 
     Returns:
         Task object with updated secret configuration.
@@ -47,7 +49,7 @@ def use_secret_as_env(
             env_var=env_var,
         ) for secret_key, env_var in secret_key_to_env.items()
     ]
-    secret_as_env = pb.SecretAsEnv(key_to_env=key_to_env)
+    secret_as_env = pb.SecretAsEnv(key_to_env=key_to_env, optional=optional)
 
     secret_name_parameter = common.parse_k8s_parameter_input(secret_name, task)
     secret_as_env.secret_name_parameter.CopyFrom(secret_name_parameter)