Skip to content

pass missing variables to environment provider job #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 21, 2025
Merged

pass missing variables to environment provider job #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98952f1
pass ETOS_WAIT_FOR_* variables to environment provider job
andmat900 Feb 19, 2025
7ee3566
rebase, passing more variables to environment provider job
andmat900 Feb 19, 2025
aed7127
EventDataTimeout references removed
andmat900 Feb 19, 2025
4ad687d
autogenerated code update
andmat900 Feb 19, 2025
10e376c
removed DEV envvar, added ENVIRONMENT_PROVIDER_WAIT* envvars
andmat900 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion api/v1alpha1/environmentrequest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ type EnvironmentProviderJobConfig struct {
EncryptionKey Var `json:"encryptionKeySecretRef"`
EtcdHost string `json:"etcdHost"`
EtcdPort string `json:"etcdPort"`
EventDataTimeout string `json:"eventDataTimeout"`
GraphQlServer string `json:"graphQlServer"`
RoutingKeyTag string `json:"routingKeyTag"`
WaitForTimeout string `json:"waitForTimeout"`
Expand Down
3 changes: 0 additions & 3 deletions config/crd/bases/etos.eiffel-community.github.io_environmentrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,6 @@ spec:
default: /
type: string
type: object
eventDataTimeout:
type: string
graphQlServer:
type: string
routingKeyTag:
Expand All @@ -339,7 +337,6 @@ spec:
- etcdPort
- etosApi
- etosMessageBus
- eventDataTimeout
- graphQlServer
- routingKeyTag
- testRunnerVersion
Expand Down
42 changes: 41 additions & 1 deletion internal/controller/environmentrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ func (r EnvironmentRequestReconciler) envVarListFrom(ctx context.Context, enviro
if err != nil {
return nil, err
}

envList := []corev1.EnvVar{
{
Name: "REQUEST",
Expand All @@ -281,6 +280,39 @@ func (r EnvironmentRequestReconciler) envVarListFrom(ctx context.Context, enviro
Name: "ETOS_ETCD_PORT",
Value: environmentrequest.Spec.Config.EtcdPort,
},
{
Name: "ETOS_EVENT_DATA_TIMEOUT",
Value: environmentrequest.Spec.Config.EnvironmentProviderEventDataTimeout,
},
// Duplicate wait timeout variables will be possible to remove when this issue is solved: https://github.com/eiffel-community/etos/issues/304
{
Name: "ETOS_WAIT_FOR_IUT_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "ENVIRONMENT_PROVIDER_WAIT_FOR_IUT_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "ETOS_WAIT_FOR_EXECUTION_SPACE_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "ENVIRONMENT_PROVIDER_WAIT_FOR_EXECUTION_SPACE_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "ETOS_WAIT_FOR_LOG_AREA_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "ENVIRONMENT_PROVIDER_WAIT_FOR_LOG_AREA_TIMEOUT",
Value: environmentrequest.Spec.Config.WaitForTimeout,
},
{
Name: "TEST_SUITE_TIMEOUT",
Value: environmentrequest.Spec.Config.EnvironmentProviderTestSuiteTimeout,
},
{
// Optional when environmentrequest is not issued by testrun, i. e. created separately.
// When the environment request is issued by a testrun, this variable is propagated
Expand Down Expand Up @@ -318,6 +350,10 @@ func (r EnvironmentRequestReconciler) envVarListFrom(ctx context.Context, enviro
Name: "RABBITMQ_PASSWORD",
Value: string(eiffelRabbitMQPassword),
},
{
Name: "RABBITMQ_ROUTING_KEY",
Value: environmentrequest.Spec.Config.RoutingKeyTag,
},

// ETOS Message Bus variables
{
Expand Down Expand Up @@ -348,6 +384,10 @@ func (r EnvironmentRequestReconciler) envVarListFrom(ctx context.Context, enviro
Name: "ETOS_RABBITMQ_PASSWORD",
Value: string(etosRabbitMQPassword),
},
{
Name: "ETOS_ROUTING_KEY_TAG",
Value: environmentrequest.Spec.Config.RoutingKeyTag,
},
}
return envList, nil
}
Expand Down
1 change: 0 additions & 1 deletion internal/controller/testrun_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,6 @@ func (r TestRunReconciler) environmentRequest(cluster *etosv1alpha1.Cluster, tes
GraphQlServer: eventRepository,
EtcdHost: databaseHost,
EtcdPort: databasePort,
EventDataTimeout: cluster.Spec.ETOS.Config.EventDataTimeout,
WaitForTimeout: cluster.Spec.ETOS.Config.EnvironmentTimeout,
EnvironmentProviderEventDataTimeout: cluster.Spec.ETOS.Config.EventDataTimeout,
EnvironmentProviderImage: cluster.Spec.ETOS.EnvironmentProvider.Image.Image,
Expand Down