Skip to content

Commit

Permalink
Fix env from (#515)
Browse files Browse the repository at this point in the history
Signed-off-by: Flaviu Vadan <[email protected]>
  • Loading branch information
flaviuvadan authored Mar 27, 2023
1 parent da80909 commit b8e2201
Show file tree
Hide file tree
Showing 7 changed files with 219 additions and 3 deletions.
78 changes: 78 additions & 0 deletions docs/examples/workflows/env.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Env





## Hera

```python
from hera.workflows import (
ConfigMapEnv,
ConfigMapEnvFrom,
Container,
Env,
ResourceEnv,
SecretEnv,
SecretEnvFrom,
Workflow,
)

with Workflow(generate_name="secret-env-from-", entrypoint="whalesay") as w:
whalesay = Container(
image="docker/whalesay:latest",
command=["cowsay"],
env_from=[
SecretEnvFrom(prefix="abc", name="secret", optional=False),
ConfigMapEnvFrom(prefix="abc", name="configmap", optional=False),
],
env=[
Env(name="test", value="1"),
SecretEnv(name="s1", secret_key="s1", secret_name="abc"),
ResourceEnv(name="r1", resource="abc"),
ConfigMapEnv(name="c1", config_map_key="c1", config_map_name="abc"),
],
)
```

## YAML

```yaml
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: secret-env-from-
spec:
entrypoint: whalesay
templates:
- container:
command:
- cowsay
env:
- name: test
value: '1'
- name: s1
valueFrom:
secretKeyRef:
key: s1
name: abc
- name: r1
valueFrom:
resourceFieldRef:
resource: abc
- name: c1
valueFrom:
configMapKeyRef:
key: c1
name: abc
envFrom:
- prefix: abc
secretRef:
name: secret
optional: false
- configMapRef:
name: configmap
optional: false
prefix: abc
image: docker/whalesay:latest
```
46 changes: 46 additions & 0 deletions docs/examples/workflows/env_from.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Env From





## Hera

```python
from hera.workflows import ConfigMapEnvFrom, Container, SecretEnvFrom, Workflow

with Workflow(generate_name="secret-env-from-", entrypoint="whalesay") as w:
whalesay = Container(
image="docker/whalesay:latest",
command=["cowsay"],
env_from=[
SecretEnvFrom(prefix="abc", name="secret", optional=False),
ConfigMapEnvFrom(prefix="abc", name="configmap", optional=False),
],
)
```

## YAML

```yaml
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: secret-env-from-
spec:
entrypoint: whalesay
templates:
- container:
command:
- cowsay
envFrom:
- prefix: abc
secretRef:
name: secret
optional: false
- configMapRef:
name: configmap
optional: false
prefix: abc
image: docker/whalesay:latest
```
20 changes: 20 additions & 0 deletions examples/workflows/env-from.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: secret-env-from-
spec:
entrypoint: whalesay
templates:
- container:
command:
- cowsay
envFrom:
- prefix: abc
secretRef:
name: secret
optional: false
- configMapRef:
name: configmap
optional: false
prefix: abc
image: docker/whalesay:latest
26 changes: 26 additions & 0 deletions examples/workflows/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from hera.workflows import (
ConfigMapEnv,
ConfigMapEnvFrom,
Container,
Env,
ResourceEnv,
SecretEnv,
SecretEnvFrom,
Workflow,
)

with Workflow(generate_name="secret-env-from-", entrypoint="whalesay") as w:
whalesay = Container(
image="docker/whalesay:latest",
command=["cowsay"],
env_from=[
SecretEnvFrom(prefix="abc", name="secret", optional=False),
ConfigMapEnvFrom(prefix="abc", name="configmap", optional=False),
],
env=[
Env(name="test", value="1"),
SecretEnv(name="s1", secret_key="s1", secret_name="abc"),
ResourceEnv(name="r1", resource="abc"),
ConfigMapEnv(name="c1", config_map_key="c1", config_map_name="abc"),
],
)
37 changes: 37 additions & 0 deletions examples/workflows/env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: secret-env-from-
spec:
entrypoint: whalesay
templates:
- container:
command:
- cowsay
env:
- name: test
value: '1'
- name: s1
valueFrom:
secretKeyRef:
key: s1
name: abc
- name: r1
valueFrom:
resourceFieldRef:
resource: abc
- name: c1
valueFrom:
configMapKeyRef:
key: c1
name: abc
envFrom:
- prefix: abc
secretRef:
name: secret
optional: false
- configMapRef:
name: configmap
optional: false
prefix: abc
image: docker/whalesay:latest
11 changes: 11 additions & 0 deletions examples/workflows/env_from.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from hera.workflows import ConfigMapEnvFrom, Container, SecretEnvFrom, Workflow

with Workflow(generate_name="secret-env-from-", entrypoint="whalesay") as w:
whalesay = Container(
image="docker/whalesay:latest",
command=["cowsay"],
env_from=[
SecretEnvFrom(prefix="abc", name="secret", optional=False),
ConfigMapEnvFrom(prefix="abc", name="configmap", optional=False),
],
)
4 changes: 1 addition & 3 deletions src/hera/workflows/env_from.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@


class _BaseEnvFrom(_BaseModel):
def __init__(self, prefix: Optional[str] = None) -> None:
self.prefix = prefix
super().__init__()
prefix: Optional[str] = None

def build(self) -> _ModelEnvFromSource:
"""Constructs and returns the Argo EnvFrom specification"""
Expand Down

0 comments on commit b8e2201

Please sign in to comment.