Unverified Commit d70d9acf authored by Thomas Montfort's avatar Thomas Montfort Committed by GitHub
Browse files

fix(operator): add back injection of DYN_SYSTEM_ENABLED env var (#4282)

parent 3fa8448b
...@@ -137,6 +137,7 @@ The operator automatically injects environment variables based on component type ...@@ -137,6 +137,7 @@ The operator automatically injects environment variables based on component type
- **`DYN_SYSTEM_PORT`**: `9090` (automatically enables the system metrics server) - **`DYN_SYSTEM_PORT`**: `9090` (automatically enables the system metrics server)
- **`DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS`**: `["generate"]` - **`DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS`**: `["generate"]`
- **`DYN_SYSTEM_ENABLED`**: `true` (needed for runtime images 0.6.1 and older)
### Planner Components ### Planner Components
......
...@@ -828,6 +828,7 @@ func TestDynamoComponentDeploymentReconciler_generateLeaderWorkerSet(t *testing. ...@@ -828,6 +828,7 @@ func TestDynamoComponentDeploymentReconciler_generateLeaderWorkerSet(t *testing.
{Name: commonconsts.DynamoNamespaceEnvVar, Value: "default"}, {Name: commonconsts.DynamoNamespaceEnvVar, Value: "default"},
{Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-lws-deploy"}, {Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-lws-deploy"},
{Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"}, {Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"},
{Name: "DYN_SYSTEM_ENABLED", Value: "true"},
{Name: "DYN_SYSTEM_PORT", Value: "9090"}, {Name: "DYN_SYSTEM_PORT", Value: "9090"},
{Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"}, {Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"},
{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ {Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{
...@@ -952,6 +953,7 @@ func TestDynamoComponentDeploymentReconciler_generateLeaderWorkerSet(t *testing. ...@@ -952,6 +953,7 @@ func TestDynamoComponentDeploymentReconciler_generateLeaderWorkerSet(t *testing.
{Name: commonconsts.DynamoNamespaceEnvVar, Value: "default"}, {Name: commonconsts.DynamoNamespaceEnvVar, Value: "default"},
{Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-lws-deploy"}, {Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-lws-deploy"},
{Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"}, {Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"},
{Name: "DYN_SYSTEM_ENABLED", Value: "true"},
{Name: "DYN_SYSTEM_PORT", Value: "9090"}, {Name: "DYN_SYSTEM_PORT", Value: "9090"},
{Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"}, {Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"},
{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ {Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{
......
...@@ -74,6 +74,10 @@ func (w *WorkerDefaults) GetBaseContainer(context ComponentContext) (corev1.Cont ...@@ -74,6 +74,10 @@ func (w *WorkerDefaults) GetBaseContainer(context ComponentContext) (corev1.Cont
} }
container.Env = append(container.Env, []corev1.EnvVar{ container.Env = append(container.Env, []corev1.EnvVar{
{
Name: "DYN_SYSTEM_ENABLED",
Value: "true",
},
{ {
Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS",
Value: "[\"generate\"]", Value: "[\"generate\"]",
......
...@@ -1930,6 +1930,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -1930,6 +1930,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Name: "DYNAMO_POD_GANG_SET_REPLICAS", Name: "DYNAMO_POD_GANG_SET_REPLICAS",
Value: "1", Value: "1",
}, },
{
Name: "DYN_SYSTEM_ENABLED",
Value: "true",
},
{ {
Name: "DYN_SYSTEM_PORT", Name: "DYN_SYSTEM_PORT",
Value: "9090", Value: "9090",
...@@ -2099,6 +2103,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -2099,6 +2103,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Name: "DYNAMO_POD_GANG_SET_REPLICAS", Name: "DYNAMO_POD_GANG_SET_REPLICAS",
Value: "1", Value: "1",
}, },
{
Name: "DYN_SYSTEM_ENABLED",
Value: "true",
},
{ {
Name: "DYN_SYSTEM_PORT", Name: "DYN_SYSTEM_PORT",
Value: "9090", Value: "9090",
...@@ -2811,6 +2819,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -2811,6 +2819,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Name: "DYN_SYSTEM_PORT", Name: "DYN_SYSTEM_PORT",
Value: "9090", Value: "9090",
}, },
{
Name: "DYN_SYSTEM_ENABLED",
Value: "true",
},
{ {
Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS",
Value: "[\"generate\"]", Value: "[\"generate\"]",
...@@ -2967,6 +2979,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) { ...@@ -2967,6 +2979,10 @@ func TestGenerateGrovePodCliqueSet(t *testing.T) {
Name: "DYN_SYSTEM_PORT", Name: "DYN_SYSTEM_PORT",
Value: "9090", Value: "9090",
}, },
{
Name: "DYN_SYSTEM_ENABLED",
Value: "true",
},
{ {
Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS",
Value: "[\"generate\"]", Value: "[\"generate\"]",
...@@ -4937,6 +4953,7 @@ func TestGenerateBasePodSpec_Worker(t *testing.T) { ...@@ -4937,6 +4953,7 @@ func TestGenerateBasePodSpec_Worker(t *testing.T) {
{Name: commonconsts.DynamoNamespaceEnvVar, Value: ""}, {Name: commonconsts.DynamoNamespaceEnvVar, Value: ""},
{Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-deployment"}, {Name: "DYN_PARENT_DGD_K8S_NAME", Value: "test-deployment"},
{Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"}, {Name: "DYN_PARENT_DGD_K8S_NAMESPACE", Value: "default"},
{Name: "DYN_SYSTEM_ENABLED", Value: "true"},
{Name: "DYN_SYSTEM_PORT", Value: "9090"}, {Name: "DYN_SYSTEM_PORT", Value: "9090"},
{Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"}, {Name: "DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS", Value: "[\"generate\"]"},
{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{ {Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{
......
...@@ -113,6 +113,8 @@ spec: ...@@ -113,6 +113,8 @@ spec:
- name: DYN_HTTP_PORT - name: DYN_HTTP_PORT
value: "{{ $.Values.dynamoPort | default 8000 }}" value: "{{ $.Values.dynamoPort | default 8000 }}"
{{- else if $serviceSpec.componentType | eq "worker" }} {{- else if $serviceSpec.componentType | eq "worker" }}
- name: DYN_SYSTEM_ENABLED
value: "true"
- name: DYN_SYSTEM_PORT - name: DYN_SYSTEM_PORT
value: "{{ $.Values.dynamoSystemPort | default 9090 }}" value: "{{ $.Values.dynamoSystemPort | default 9090 }}"
- name: DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS - name: DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS
......
...@@ -105,6 +105,8 @@ spec: ...@@ -105,6 +105,8 @@ spec:
- name: DYN_HTTP_PORT - name: DYN_HTTP_PORT
value: "{{ $.Values.dynamoPort | default 8000 }}" value: "{{ $.Values.dynamoPort | default 8000 }}"
{{- else if $serviceSpec.componentType | eq "worker" }} {{- else if $serviceSpec.componentType | eq "worker" }}
- name: DYN_SYSTEM_ENABLED
value: "true"
- name: DYN_SYSTEM_PORT - name: DYN_SYSTEM_PORT
value: "{{ $.Values.dynamoSystemPort | default 9090 }}" value: "{{ $.Values.dynamoSystemPort | default 9090 }}"
- name: DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS - name: DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS
......
...@@ -732,6 +732,7 @@ The operator automatically injects environment variables based on component type ...@@ -732,6 +732,7 @@ The operator automatically injects environment variables based on component type
- **`DYN_SYSTEM_PORT`**: `9090` (automatically enables the system metrics server) - **`DYN_SYSTEM_PORT`**: `9090` (automatically enables the system metrics server)
- **`DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS`**: `["generate"]` - **`DYN_SYSTEM_USE_ENDPOINT_HEALTH_STATUS`**: `["generate"]`
- **`DYN_SYSTEM_ENABLED`**: `true` (needed for runtime images 0.6.1 and older)
### Planner Components ### Planner Components
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment