Skip to content

chore: Patch infra merge #6274

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 14 commits into from
Jan 13, 2025
Merged

chore: Patch infra merge #6274

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
df53f80
resolved the conflicts
RajeevRanjan27 Jan 13, 2025
85b7ece
defined missing cosntants
RajeevRanjan27 Jan 13, 2025
915427a
resolved calling methods
RajeevRanjan27 Jan 13, 2025
6b09499
remove unused constant
ayu-devtron Jan 13, 2025
42823fe
review comments
ayu-devtron Jan 13, 2025
5c6a7b5
added the support for the update api infra
RajeevRanjan27 Jan 13, 2025
084a0ad
Merge remote-tracking branch 'origin/patch-infra-merge' into patch-in…
RajeevRanjan27 Jan 13, 2025
6865a3a
added the check for payload and driver type
RajeevRanjan27 Jan 13, 2025
e77d70d
added the env.md as previous
RajeevRanjan27 Jan 13, 2025
572f904
modified the load default at startup
RajeevRanjan27 Jan 13, 2025
becbe34
code structure improve
ayu-devtron Jan 13, 2025
1d2642a
removed the repo call of platform list
RajeevRanjan27 Jan 13, 2025
d5d9d3e
Merge branch 'patch-infra-merge' of github.com:devtron-labs/devtron i…
ayu-devtron Jan 13, 2025
d3994a4
code structure improve
ayu-devtron Jan 13, 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/infraConfig/restHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ func (handler *InfraConfigRestHandlerImpl) GetProfile(w http.ResponseWriter, r *
Profile: *profile,
}
resp.ConfigurationUnits = handler.infraProfileService.GetConfigurationUnits()
//TODO: why below line ??
resp.DefaultConfigurations = defaultProfile.Configurations
common.WriteJsonResp(w, nil, resp, http.StatusOK)
}
Expand Down
14 changes: 7 additions & 7 deletions env_gen.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
| INSTALLER_CRD_OBJECT_RESOURCE | installers | |
| INSTALLER_CRD_OBJECT_VERSION | v1alpha1 | |
| IN_APP_LOGGING_ENABLED | false | |
| IS_INTERNAL_USE | false | |
| IS_INTERNAL_USE | true | |
| JwtExpirationTime | 120 | |
| K8s_CLIENT_MAX_IDLE_CONNS_PER_HOST | 25 | |
| K8s_TCP_IDLE_CONN_TIMEOUT | 300 | |
Expand All @@ -180,7 +180,7 @@
| LIMIT_CI_CPU | 0.5 | |
| LIMIT_CI_MEM | 3G | |
| LOGGER_DEV_MODE | false | |
| LOG_LEVEL | 0 | |
| LOG_LEVEL | -1 | |
| MAX_CD_WORKFLOW_RUNNER_RETRIES | 0 | |
| MAX_CI_WORKFLOW_RETRIES | 0 | |
| MAX_SESSION_PER_USER | 5 | |
Expand All @@ -192,7 +192,7 @@
| NATS_MSG_MAX_AGE | 86400 | |
| NATS_MSG_PROCESSING_BATCH_SIZE | 1 | |
| NATS_MSG_REPLICAS | 0 | |
| NATS_SERVER_HOST | nats://devtron-nats.devtroncd:4222 | |
| NATS_SERVER_HOST | localhost:4222 | |
| NOTIFICATION_MEDIUM | rest | |
| ORCH_HOST | http://devtroncd-orchestrator-service-prod.devtroncd/webhook/msg/nats | |
| ORCH_TOKEN | | |
Expand All @@ -203,11 +203,11 @@
| PG_EXPORT_PROM_METRICS | false | |
| PG_LOG_ALL_QUERY | false | |
| PG_LOG_QUERY | true | |
| PG_PASSWORD | | |
| PG_PASSWORD | {password} | |
| PG_PORT | 5432 | |
| PG_QUERY_DUR_THRESHOLD | 5000 | |
| PG_READ_TIMEOUT | 30 | |
| PG_USER | | |
| PG_USER | postgres | |
| PG_WRITE_TIMEOUT | 30 | |
| PIPELINE_DEGRADED_TIME | 10 | |
| PLUGIN_NAME | Pull images from container repository | |
Expand All @@ -222,7 +222,7 @@
| REVISION_HISTORY_LIMIT_DEVTRON_APP | 1 | |
| REVISION_HISTORY_LIMIT_EXTERNAL_HELM_APP | 0 | |
| REVISION_HISTORY_LIMIT_HELM_APP | 1 | |
| RUNTIME_CONFIG_LOCAL_DEV | false | |
| RUNTIME_CONFIG_LOCAL_DEV | true | |
| RUN_HELM_INSTALL_IN_ASYNC_MODE_HELM_APPS | false | |
| SCOPED_VARIABLE_ENABLED | false | |
| SCOPED_VARIABLE_FORMAT | @{{%s}} | |
Expand Down Expand Up @@ -254,7 +254,7 @@
| USE_BLOB_STORAGE_CONFIG_IN_CD_WORKFLOW | true | |
| USE_BLOB_STORAGE_CONFIG_IN_CI_WORKFLOW | true | |
| USE_BUILDX | false | |
| USE_CASBIN_V2 | false | |
| USE_CASBIN_V2 | true | |
| USE_CUSTOM_HTTP_TRANSPORT | false | |
| USE_DEPLOYMENT_CONFIG_DATA | false | |
| USE_DOCKER_API_TO_GET_DIGEST | false | |
Expand Down
Loading
Loading